Skip to content

Avoid task WDT invoked when URLStreamBufferedESP32 stream is temporarily stopped #2238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Avoid task WDT invoked when URLStreamBufferedESP32 stream is temporarily stopped #2238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/AudioTools/Communication/HTTP/URLStreamBufferedT.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ class BufferedTaskStream : public AudioStream {
if (*(this->p_stream) && available_to_write > 0) {
size_t to_read = min(available_to_write, (size_t)512);
uint8_t buffer[to_read];
while (this->p_stream->available() == 0)
delay(3); // to avoid task WDT invoked while blocking read
size_t avail_read = this->p_stream->readBytes((uint8_t *)buffer, to_read);
size_t written = this->buffers.writeArray(buffer, avail_read);

Expand Down
8 changes: 5 additions & 3 deletions src/AudioTools/Concurrency/RTOS/SynchronizedNBufferRTOS.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
#include "AudioToolsConfig.h"
#include "QueueRTOS.h"

#define DEFAULT_BUFFER_WAIT 1000

namespace audio_tools {

/**
Expand All @@ -14,7 +16,7 @@ namespace audio_tools {
template <typename T>
class SynchronizedNBufferRTOST : public NBuffer<T> {
public:
SynchronizedNBufferRTOST(int bufferSize, int bufferCount, int writeMaxWait=portMAX_DELAY, int readMaxWait=portMAX_DELAY) {
SynchronizedNBufferRTOST(int bufferSize, int bufferCount, int writeMaxWait=DEFAULT_BUFFER_WAIT, int readMaxWait=DEFAULT_BUFFER_WAIT) {
TRACED();
read_max_wait = readMaxWait;
write_max_wait = writeMaxWait;
Expand Down Expand Up @@ -77,8 +79,8 @@ class SynchronizedNBufferRTOST : public NBuffer<T> {
}

protected:
QueueRTOS<BaseBuffer<T>*> available_buffers{0,portMAX_DELAY,0};
QueueRTOS<BaseBuffer<T>*> filled_buffers{0,portMAX_DELAY,0};
QueueRTOS<BaseBuffer<T>*> available_buffers{0,DEFAULT_BUFFER_WAIT,0};
QueueRTOS<BaseBuffer<T>*> filled_buffers{0,DEFAULT_BUFFER_WAIT,0};
size_t max_size;
size_t read_max_wait, write_max_wait;
int buffer_size = 0, buffer_count = 0;
Expand Down