From a9d4a46be1552a146dd7f81d76530b081d29508b Mon Sep 17 00:00:00 2001 From: Chris Browet Date: Sun, 10 Dec 2023 11:53:37 +0100 Subject: [PATCH 1/3] debug --- src/api/SnapProcessor.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/api/SnapProcessor.h b/src/api/SnapProcessor.h index be37af7..d4c4233 100644 --- a/src/api/SnapProcessor.h +++ b/src/api/SnapProcessor.h @@ -40,7 +40,7 @@ class SnapProcessor { } virtual void end() { - ESP_LOGD(TAG, "start"); + ESP_LOGD(TAG, ">>> end"); audioEnd(); send_receive_buffer.resize(0); base_message_serialized.resize(0); @@ -113,7 +113,7 @@ class SnapProcessor { SnapTime &snap_time = SnapTime::instance(); void processLoop(void *pvParameters = nullptr) { - ESP_LOGI(TAG, "processLoop"); + ESP_LOGI(TAG, ">>> processLoop"); while (true) { ESP_LOGD(TAG, "startig new connection"); @@ -155,16 +155,16 @@ class SnapProcessor { } bool resizeData() { - ESP_LOGD(TAG, "start"); + ESP_LOGD(TAG, ">>> resizeData"); audio.resize(frame_size); send_receive_buffer.resize(CONFIG_SNAPCAST_BUFF_LEN); base_message_serialized.resize(BASE_MESSAGE_SIZE); - ESP_LOGD(TAG, "end!"); + ESP_LOGD(TAG, "<<< resizeData"); return true; } bool processMessageLoop() { - ESP_LOGD(TAG, "start"); + ESP_LOGD(TAG, ">>> processMessageLoop"); if (!readBaseMessage()) return false; @@ -207,7 +207,7 @@ class SnapProcessor { } bool connectClient() { - ESP_LOGD(TAG, "start"); + ESP_LOGD(TAG, ">>> connectClient"); p_client->setTimeout(CONFIG_CLIENT_TIMEOUT_SEC); if (!p_client->connect(server_ip, server_port)) { ESP_LOGE(TAG, "... socket connect failed errno=%d", errno); @@ -218,7 +218,7 @@ class SnapProcessor { } bool writeHallo() { - ESP_LOGD(TAG, "start"); + ESP_LOGD(TAG, ">>> writeHallo"); // setup base_message base_message.type = SNAPCAST_MESSAGE_HELLO; base_message.id = 0x0; @@ -262,7 +262,7 @@ class SnapProcessor { } bool readBaseMessage() { - ESP_LOGD(TAG, "%d", BASE_MESSAGE_SIZE); + ESP_LOGD(TAG, ">>> readBaseMessage: %d", BASE_MESSAGE_SIZE); // Wait for timeout // uint64_t end = millis() + CONFIG_WEBSOCKET_SERVER_TIMEOUT_SEC * 1000; while (p_client->available() < BASE_MESSAGE_SIZE) { @@ -289,7 +289,7 @@ class SnapProcessor { } bool readData() { - ESP_LOGD(TAG, "%d", base_message.size); + ESP_LOGD(TAG, ">>> readData: %d", base_message.size); if (base_message.size > send_receive_buffer.size()) { send_receive_buffer.resize(base_message.size); } @@ -301,7 +301,7 @@ class SnapProcessor { } bool processMessageCodecHeader() { - ESP_LOGD(TAG, "start"); + ESP_LOGD(TAG, ">>> processMessageCodecHeader"); SnapMessageCodecHeader codec_header_message; start = &send_receive_buffer[0]; int result = codec_header_message.deserialize(start, size); @@ -339,7 +339,7 @@ class SnapProcessor { } bool processMessageCodecHeaderOpus(codec_type codecType) { - ESP_LOGD(TAG, "start"); + ESP_LOGD(TAG, ">>> processMessageCodecHeaderOpus"); uint32_t rate; memcpy(&rate, start + 4, sizeof(rate)); uint16_t bits; @@ -354,7 +354,7 @@ class SnapProcessor { } bool processMessageCodecHeaderExt(codec_type codecType) { - ESP_LOGD(TAG, "start"); + ESP_LOGD(TAG, ">>> processMessageCodecHeaderExt"); codec_from_server = codecType; audioBegin(); // send the data to the codec @@ -363,7 +363,7 @@ class SnapProcessor { } bool processMessageWireChunk() { - ESP_LOGD(TAG, "start"); + ESP_LOGD(TAG, ">>> processMessageWireChunk"); start = &send_receive_buffer[0]; SnapMessageWireChunk wire_chunk_message; memset((void*)&wire_chunk_message, 0, sizeof(wire_chunk_message)); @@ -388,7 +388,7 @@ class SnapProcessor { } bool wireChunk(SnapMessageWireChunk &wire_chunk_message) { - ESP_LOGD(TAG, "start"); + ESP_LOGD(TAG, ">>> wireChunk"); SnapAudioHeader header; header.size = wire_chunk_message.size; @@ -407,7 +407,7 @@ class SnapProcessor { } bool processMessageServerSettings() { - ESP_LOGD(TAG, "start"); + ESP_LOGD(TAG, ">>> processMessageServerSettings"); SnapMessageServerSettings server_settings_message; // The first 4 bytes in the buffer are the size of the string. @@ -444,7 +444,7 @@ class SnapProcessor { } bool processMessageTime() { - ESP_LOGD(TAG, "start"); + ESP_LOGD(TAG, ">>> processMessageTime"); int result = time_message.deserialize(start, size); if (result) { ESP_LOGI(TAG, "Failed to deserialize time message"); @@ -473,7 +473,7 @@ class SnapProcessor { } bool writeTimedMessage() { - ESP_LOGD(TAG, "start"); + ESP_LOGD(TAG, ">>> writeTimedMessage"); uint32_t time_ms = millis() - last_time_sync; if (time_ms >= 1000) { last_time_sync = millis(); @@ -485,7 +485,7 @@ class SnapProcessor { } bool writeMessage() { - ESP_LOGD(TAG, "start"); + ESP_LOGD(TAG, ">>> writeMessage"); now = snap_time.time(); From 8b3d89a3d0c1565b334480812aac2940a4a143ce Mon Sep 17 00:00:00 2001 From: Chris Browet Date: Sun, 10 Dec 2023 11:55:51 +0100 Subject: [PATCH 2/3] debug --- src/api/SnapProcessor.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/api/SnapProcessor.h b/src/api/SnapProcessor.h index d4c4233..d4f9f62 100644 --- a/src/api/SnapProcessor.h +++ b/src/api/SnapProcessor.h @@ -457,6 +457,7 @@ class SnapProcessor { ttx.tv_usec = base_message.sent.usec; trx.tv_sec = base_message.received.sec; trx.tv_usec = base_message.received.usec; + ESP_LOGD(TAG, "%ld; %ld -- %ld; %ld", ttx.tv_sec, ttx.tv_usec, trx.tv_sec, trx.tv_usec); // for time management snap_time.updateServerTime(trx); From 295ab299ee2cc91189fbb28f9b1dec8e65219cc7 Mon Sep 17 00:00:00 2001 From: Chris Browet Date: Sun, 10 Dec 2023 12:56:12 +0100 Subject: [PATCH 3/3] debug --- src/api/SnapOutput.h | 9 +++++---- src/api/SnapProcessor.h | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/api/SnapOutput.h b/src/api/SnapOutput.h index cd35d83..69fa218 100644 --- a/src/api/SnapOutput.h +++ b/src/api/SnapOutput.h @@ -39,7 +39,7 @@ friend SnapProcessor; /// Writes audio data to the queue virtual size_t write(const uint8_t *data, size_t size) { - ESP_LOGD(TAG, "%zu", size); + ESP_LOGD(TAG, ">>> write: %zu", size); // only start to proces data after we received codec header if (!is_audio_begin_called){ return 0; @@ -144,6 +144,7 @@ friend SnapProcessor; /// setup of all audio objects bool audioBegin() { + ESP_LOGD(TAG, ">>> audioBegin"); if (out == nullptr) return false; @@ -173,7 +174,7 @@ friend SnapProcessor; // set up timed stream timed_stream.begin(audio_info); - ESP_LOGD(TAG, "end"); + ESP_LOGD(TAG, "<<< audioBegin"); is_audio_begin_called = true; return true; } @@ -192,7 +193,7 @@ friend SnapProcessor; } void audioEnd() { - ESP_LOGD(TAG, "start"); + ESP_LOGD(TAG, ">>> audioEnd"); if (out == nullptr) return; out->end(); @@ -200,7 +201,7 @@ friend SnapProcessor; // writes the audio data to the decoder size_t audioWrite(const void *src, size_t size) { - ESP_LOGD(TAG, "%zu", size); + ESP_LOGD(TAG, ">>> audioWrite: %zu", size); size_t result = decoder_stream.write((const uint8_t *)src, size); return result; diff --git a/src/api/SnapProcessor.h b/src/api/SnapProcessor.h index d4f9f62..c84e730 100644 --- a/src/api/SnapProcessor.h +++ b/src/api/SnapProcessor.h @@ -24,6 +24,7 @@ class SnapProcessor { } virtual bool begin() { + ESP_LOGD(TAG, ">>> begin"); bool result = false; if (output_start) { result = audioBegin();