Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2026-01-31 23:01:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

tweaking statistics

Browse Source
This commit is contained in:
philippe44
2019-06-30 13:21:07 -07:00
parent 1c1d7b09a6
commit e492b57b3b
1 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
components/squeezelite/output_i2s.c
View File

@@ -25,26 +25,10 @@
#include <signal.h> #include <signal.h>
#include "time.h" #include "time.h"
#define LOCK mutex_lock(outputbuf->mutex)
#define UNLOCK mutex_unlock(outputbuf->mutex)
#define DECLARE_ALL_MIN_MAX \ #define FRAME_BLOCK MAX_SILENCE_FRAMES
DECLARE_MIN_MAX(o); \
DECLARE_MIN_MAX(s); \
DECLARE_MIN_MAX(req); \
DECLARE_MIN_MAX(rec); \
DECLARE_MIN_MAX(over); \
DECLARE_MIN_MAX(i2s_time); \
DECLARE_MIN_MAX(buffering);
#define RESET_ALL_MIN_MAX \
RESET_MIN_MAX(o); \
RESET_MIN_MAX(s); \
RESET_MIN_MAX(req); \
RESET_MIN_MAX(rec); \
RESET_MIN_MAX(over); \
RESET_MIN_MAX(i2s_time); \
RESET_MIN_MAX(buffering);
#define STATS_PERIOD_MS 5000
// Prevent compile errors if dac output is // Prevent compile errors if dac output is
// included in the build and not actually activated in menuconfig // included in the build and not actually activated in menuconfig
@@ -61,10 +45,21 @@
#define CONFIG_I2S_NUM -1 #define CONFIG_I2S_NUM -1
#endif #endif
#define LOCK mutex_lock(outputbuf->mutex) #define DECLARE_ALL_MIN_MAX \
#define UNLOCK mutex_unlock(outputbuf->mutex) DECLARE_MIN_MAX(o); \
DECLARE_MIN_MAX(s); \
DECLARE_MIN_MAX(rec); \
DECLARE_MIN_MAX(i2s_time); \
DECLARE_MIN_MAX(buffering);
#define FRAME_BLOCK MAX_SILENCE_FRAMES #define RESET_ALL_MIN_MAX \
RESET_MIN_MAX(o); \
RESET_MIN_MAX(s); \
RESET_MIN_MAX(rec); \
RESET_MIN_MAX(i2s_time); \
RESET_MIN_MAX(buffering);
#define STATS_PERIOD_MS 5000
extern struct outputstate output; extern struct outputstate output;
extern struct buffer *streambuf; extern struct buffer *streambuf;
@@ -253,7 +248,7 @@ static void *output_thread_i2s() {
frames = _output_frames( FRAME_BLOCK ); frames = _output_frames( FRAME_BLOCK );
SET_MIN_MAX(frames,rec); SET_MIN_MAX_SIZED(frames,rec,FRAME_BLOCK);
SET_MIN_MAX_SIZED(_buf_used(outputbuf),o,outputbuf->size); SET_MIN_MAX_SIZED(_buf_used(outputbuf),o,outputbuf->size);
SET_MIN_MAX_SIZED(_buf_used(streambuf),s,streambuf->size); SET_MIN_MAX_SIZED(_buf_used(streambuf),s,streambuf->size);
SET_MIN_MAX( TIME_MEASUREMENT_GET(timer_start),buffering); SET_MIN_MAX( TIME_MEASUREMENT_GET(timer_start),buffering);
@@ -309,9 +304,7 @@ static void *output_thread_i2s_stats() {
LOG_INFO(LINE_MIN_MAX_FORMAT_STREAM, LINE_MIN_MAX_STREAM("stream",s)); LOG_INFO(LINE_MIN_MAX_FORMAT_STREAM, LINE_MIN_MAX_STREAM("stream",s));
LOG_INFO(LINE_MIN_MAX_FORMAT,LINE_MIN_MAX("output",o)); LOG_INFO(LINE_MIN_MAX_FORMAT,LINE_MIN_MAX("output",o));
LOG_INFO(LINE_MIN_MAX_FORMAT_FOOTER); LOG_INFO(LINE_MIN_MAX_FORMAT_FOOTER);
LOG_INFO(LINE_MIN_MAX_FORMAT,LINE_MIN_MAX("requested",req));
LOG_INFO(LINE_MIN_MAX_FORMAT,LINE_MIN_MAX("received",rec)); LOG_INFO(LINE_MIN_MAX_FORMAT,LINE_MIN_MAX("received",rec));
LOG_INFO(LINE_MIN_MAX_FORMAT,LINE_MIN_MAX("overflow",over));
LOG_INFO(LINE_MIN_MAX_FORMAT_FOOTER); LOG_INFO(LINE_MIN_MAX_FORMAT_FOOTER);
LOG_INFO(""); LOG_INFO("");
LOG_INFO(" ----------+----------+-----------+-----------+ "); LOG_INFO(" ----------+----------+-----------+-----------+ ");