diff --git a/_audio_encoded_8h_source.html b/_audio_encoded_8h_source.html
index 812927ea6..8bc959dbf 100644
--- a/_audio_encoded_8h_source.html
+++ b/_audio_encoded_8h_source.html
@@ -546,8 +546,8 @@
-
-
+
+
diff --git a/_audio_i_o_8h_source.html b/_audio_i_o_8h_source.html
index b5576a7d0..0822eb542 100644
--- a/_audio_i_o_8h_source.html
+++ b/_audio_i_o_8h_source.html
@@ -101,167 +101,164 @@
- 44 size_t readBytes(uint8_t *data,
size_t len) {
- 45 LOGD(
"TransformationReader::readBytes: %d", (
int)len);
-
-
-
-
- 50 if (p_stream ==
nullptr) {
- 51 LOGE(
"p_stream is NULL");
-
-
+
+
+
+
+
+ 51 result_queue_buffer.resize(size);
+
+
-
- 56 if (buffer.size() == 0) {
- 57 int size = (0.5f / p_transform->getByteFactor() * len);
-
-
- 60 LOGI(
"read size: %d", size);
-
-
-
-
-
- 66 int rb_size = len * byte_count_factor;
- 67 LOGI(
"buffer size: %d", rb_size);
-
-
-
-
- 72 if (result_queue.available() < len) {
-
-
- 75 while (result_queue.available() < len) {
- 76 int read_eff = p_stream->readBytes(buffer.data(), buffer.size());
-
-
- 79 if (read_eff != buffer.size())
- 80 LOGD(
"readBytes %d -> %d", buffer.size(), read_eff);
- 81 int write_eff = p_transform->write(buffer.data(), read_eff);
- 82 if (write_eff != read_eff)
- 83 LOGE(
"write %d -> %d", read_eff, write_eff);
-
-
- 86 if (++zero_count > MAX_ZERO_READ_COUNT){
-
-
-
-
-
-
-
-
-
- 96 int result_len = min((
int)len, result_queue.available());
- 97 result_len = result_queue.readBytes(data, result_len);
- 98 LOGD(
"TransformationReader::readBytes: %d -> %d", (
int)len,
-
-
-
-
-
-
-
-
-
-
- 109 void setByteCountFactor(
int f) { byte_count_factor = f; }
-
-
- 112 RingBuffer<uint8_t> rb{0};
- 113 QueueStream<uint8_t> result_queue{rb};
- 114 Stream *p_stream =
nullptr;
- 115 Vector<uint8_t> buffer{0};
- 116 T *p_transform =
nullptr;
-
- 118 int byte_count_factor = 3;
+ 55 size_t readBytes(uint8_t *data,
size_t len) {
+ 56 LOGD(
"TransformationReader::readBytes: %d", (
int)len);
+
+
+
+
+ 61 if (p_stream ==
nullptr) {
+ 62 LOGE(
"p_stream is NULL");
+
+
+
+
+ 67 if (buffer.size() == 0) {
+ 68 int size = (0.5f / p_transform->getByteFactor() * len);
+
+
+ 71 LOGI(
"read size: %d", size);
+
+
+
+ 75 if (result_queue_buffer.
size() == 0) {
+
+ 77 int rb_size = len * byte_count_factor;
+ 78 LOGI(
"buffer size: %d", rb_size);
+ 79 result_queue_buffer.resize(rb_size);
+
+
+
+ 83 if (result_queue.available() < len) {
+
+
+ 86 while (result_queue.available() < len) {
+ 87 int read_eff = p_stream->readBytes(buffer.data(), buffer.size());
+
+
+ 90 if (read_eff != buffer.size())
+ 91 LOGD(
"readBytes %d -> %d", buffer.size(), read_eff);
+ 92 int write_eff = p_transform->write(buffer.data(), read_eff);
+ 93 if (write_eff != read_eff)
+ 94 LOGE(
"write %d -> %d", read_eff, write_eff);
+
+
+ 97 if (++zero_count > MAX_ZERO_READ_COUNT){
+
+
+
+
+
+
+
+
+
+ 107 int result_len = min((
int)len, result_queue.available());
+ 108 result_len = result_queue.readBytes(data, result_len);
+ 109 LOGD(
"TransformationReader::readBytes: %d -> %d", (
int)len,
+
+
+
+
+
+
+ 116 result_queue_buffer.resize(0);
+
+
-
- 124 Print *result = p_transform->getPrint();
- 125 p_transform->setOutput((
Print &)result_queue);
-
-
-
-
- 132 if (out) p_transform->setOutput(*out);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 158 virtual void setOutput(AudioOutput &print) {
-
-
-
-
-
-
-
-
+ 120 void setByteCountFactor(
int f) { byte_count_factor = f; }
+
+
+ 123 RingBuffer<uint8_t> result_queue_buffer{0};
+ 124 QueueStream<uint8_t> result_queue{result_queue_buffer};
+ 125 Stream *p_stream =
nullptr;
+ 126 Vector<uint8_t> buffer{0};
+ 127 T *p_transform =
nullptr;
+
+ 129 int byte_count_factor = 3;
+
+
+ 135 Print *result = p_transform->getPrint();
+ 136 p_transform->setOutput((
Print &)result_queue);
+
+
+
+
+ 143 if (out) p_transform->setOutput(*out);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 169 virtual Print *getPrint() {
return p_print; }
-
- 171 virtual Stream *getStream() {
return p_stream; }
-
- 173 size_t readBytes(uint8_t *data,
size_t len)
override {
- 174 LOGD(
"ReformatBaseStream::readBytes: %d", (
int)len);
- 175 return reader.readBytes(data, len);
-
-
- 178 int available()
override {
- 179 return DEFAULT_BUFFER_SIZE;
-
+ 169 virtual void setOutput(AudioOutput &print) {
+
+
+
+
+
+
+
+
+
+
+ 180 virtual Print *getPrint() {
return p_print; }
- 182 int availableForWrite()
override {
- 183 return DEFAULT_BUFFER_SIZE;
-
-
- 186 virtual float getByteFactor() = 0;
-
- 188 void end()
override {
-
-
-
-
-
-
- 195 TransformationReader<ReformatBaseStream> reader;
- 196 Stream *p_stream =
nullptr;
- 197 Print *p_print =
nullptr;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ 182 virtual Stream *getStream() {
return p_stream; }
+
+ 184 size_t readBytes(uint8_t *data,
size_t len)
override {
+ 185 LOGD(
"ReformatBaseStream::readBytes: %d", (
int)len);
+ 186 return reader.readBytes(data, len);
+
+
+ 189 int available()
override {
+ 190 return DEFAULT_BUFFER_SIZE;
+
+
+ 193 int availableForWrite()
override {
+ 194 return DEFAULT_BUFFER_SIZE;
+
+
+ 197 virtual float getByteFactor() = 0;
+
+ 199 void end()
override {
+
+
+
+
+
+
+
+
+
+ 210 Stream *p_stream =
nullptr;
+ 211 Print *p_print =
nullptr;
214 if (getStream() !=
nullptr) {
- 215 reader.begin(
this, getStream());
+ 215 reader.
begin(
this, getStream());
@@ -800,9 +797,10 @@
-
-
-
+
+
+
+
@@ -823,8 +821,10 @@
-
-
+
+
+
+
diff --git a/_audio_streams_converter_8h_source.html b/_audio_streams_converter_8h_source.html
index 891b0a4ff..ed3ed5ce8 100644
--- a/_audio_streams_converter_8h_source.html
+++ b/_audio_streams_converter_8h_source.html
@@ -882,8 +882,8 @@
-
-
+
+
diff --git a/_resample_stream_8h_source.html b/_resample_stream_8h_source.html
index 1d00630a2..61d5eaafe 100644
--- a/_resample_stream_8h_source.html
+++ b/_resample_stream_8h_source.html
@@ -375,8 +375,8 @@
-
-
+
+
diff --git a/classaudio__tools_1_1_channel_format_converter_stream-members.html b/classaudio__tools_1_1_channel_format_converter_stream-members.html
index cc22d4f93..4067f5d14 100644
--- a/classaudio__tools_1_1_channel_format_converter_stream-members.html
+++ b/classaudio__tools_1_1_channel_format_converter_stream-members.html
@@ -98,41 +98,42 @@
getByteFactor() (defined in ChannelFormatConverterStream) | ChannelFormatConverterStream | inlinevirtual |
getConverter() (defined in ChannelFormatConverterStream) | ChannelFormatConverterStream | inlineprotected |
getPrint() (defined in ReformatBaseStream) | ReformatBaseStream | inlinevirtual |
- getStream() (defined in ReformatBaseStream) | ReformatBaseStream | inlinevirtual |
- info (defined in AudioStream) | AudioStream | protected |
- is_notify_active (defined in AudioInfoSource) | AudioInfoSource | protected |
- isNotifyActive() | AudioInfoSource | inline |
- not_supported(int out, const char *msg="") (defined in AudioStream) | AudioStream | inlineprotectedvirtual |
- notify_vector (defined in AudioInfoSource) | AudioInfoSource | protected |
- notifyAudioChange(AudioInfo info) (defined in AudioInfoSource) | AudioInfoSource | inlineprotected |
- operator bool() (defined in AudioStream) | AudioStream | inlinevirtual |
- operator=(ChannelFormatConverterStream const &)=delete (defined in ChannelFormatConverterStream) | ChannelFormatConverterStream | |
- operator=(AudioStream const &)=delete (defined in AudioStream) | AudioStream | |
- operator=(BaseStream const &)=delete (defined in BaseStream) | BaseStream | |
- p_print (defined in ReformatBaseStream) | ReformatBaseStream | protected |
- p_stream (defined in ReformatBaseStream) | ReformatBaseStream | protected |
- readBytes(uint8_t *data, size_t len) override (defined in ChannelFormatConverterStream) | ChannelFormatConverterStream | inlinevirtual |
- reader (defined in ReformatBaseStream) | ReformatBaseStream | protected |
- readSilence(uint8_t *buffer, size_t length) | AudioStream | inlinevirtual |
- refillReadBuffer() (defined in BaseStream) | BaseStream | inlineprotected |
- removeNotifyAudioChange(AudioInfoSupport &bi) | AudioInfoSource | inlinevirtual |
- setAudioInfo(AudioInfo cfg) override | ChannelFormatConverterStream | inlinevirtual |
- setNotifyActive(bool flag) | AudioInfoSource | inline |
- setOutput(AudioOutput &print) (defined in ReformatBaseStream) | ReformatBaseStream | inlinevirtual |
- setOutput(Print &print) override | ReformatBaseStream | inlinevirtual |
- setStream(Stream &stream) override | ReformatBaseStream | inlinevirtual |
- setStream(AudioStream &stream) (defined in ReformatBaseStream) | ReformatBaseStream | inlinevirtual |
- setToChannels(uint16_t channels) (defined in ChannelFormatConverterStream) | ChannelFormatConverterStream | inline |
- setupConverter(int fromChannels, int toChannels) (defined in ChannelFormatConverterStream) | ChannelFormatConverterStream | inlineprotected |
- setupReader() (defined in ReformatBaseStream) | ReformatBaseStream | inlineprotected |
- tmp_in (defined in BaseStream) | BaseStream | protected |
- tmp_out (defined in BaseStream) | BaseStream | protected |
- to_channels (defined in ChannelFormatConverterStream) | ChannelFormatConverterStream | protected |
- write(const uint8_t *data, size_t len) override (defined in ChannelFormatConverterStream) | ChannelFormatConverterStream | inlinevirtual |
- write(uint8_t ch) override (defined in BaseStream) | BaseStream | inlinevirtual |
- writeSilence(size_t len) | AudioStream | inlinevirtual |
- ~AudioStream()=default (defined in AudioStream) | AudioStream | virtual |
- ~BaseStream()=default (defined in BaseStream) | BaseStream | virtual |
+ getReader() | ReformatBaseStream | inline |
+ getStream() (defined in ReformatBaseStream) | ReformatBaseStream | inlinevirtual |
+ info (defined in AudioStream) | AudioStream | protected |
+ is_notify_active (defined in AudioInfoSource) | AudioInfoSource | protected |
+ isNotifyActive() | AudioInfoSource | inline |
+ not_supported(int out, const char *msg="") (defined in AudioStream) | AudioStream | inlineprotectedvirtual |
+ notify_vector (defined in AudioInfoSource) | AudioInfoSource | protected |
+ notifyAudioChange(AudioInfo info) (defined in AudioInfoSource) | AudioInfoSource | inlineprotected |
+ operator bool() (defined in AudioStream) | AudioStream | inlinevirtual |
+ operator=(ChannelFormatConverterStream const &)=delete (defined in ChannelFormatConverterStream) | ChannelFormatConverterStream | |
+ operator=(AudioStream const &)=delete (defined in AudioStream) | AudioStream | |
+ operator=(BaseStream const &)=delete (defined in BaseStream) | BaseStream | |
+ p_print (defined in ReformatBaseStream) | ReformatBaseStream | protected |
+ p_stream (defined in ReformatBaseStream) | ReformatBaseStream | protected |
+ readBytes(uint8_t *data, size_t len) override (defined in ChannelFormatConverterStream) | ChannelFormatConverterStream | inlinevirtual |
+ reader (defined in ReformatBaseStream) | ReformatBaseStream | protected |
+ readSilence(uint8_t *buffer, size_t length) | AudioStream | inlinevirtual |
+ refillReadBuffer() (defined in BaseStream) | BaseStream | inlineprotected |
+ removeNotifyAudioChange(AudioInfoSupport &bi) | AudioInfoSource | inlinevirtual |
+ setAudioInfo(AudioInfo cfg) override | ChannelFormatConverterStream | inlinevirtual |
+ setNotifyActive(bool flag) | AudioInfoSource | inline |
+ setOutput(AudioOutput &print) (defined in ReformatBaseStream) | ReformatBaseStream | inlinevirtual |
+ setOutput(Print &print) override | ReformatBaseStream | inlinevirtual |
+ setStream(Stream &stream) override | ReformatBaseStream | inlinevirtual |
+ setStream(AudioStream &stream) (defined in ReformatBaseStream) | ReformatBaseStream | inlinevirtual |
+ setToChannels(uint16_t channels) (defined in ChannelFormatConverterStream) | ChannelFormatConverterStream | inline |
+ setupConverter(int fromChannels, int toChannels) (defined in ChannelFormatConverterStream) | ChannelFormatConverterStream | inlineprotected |
+ setupReader() (defined in ReformatBaseStream) | ReformatBaseStream | inlineprotected |
+ tmp_in (defined in BaseStream) | BaseStream | protected |
+ tmp_out (defined in BaseStream) | BaseStream | protected |
+ to_channels (defined in ChannelFormatConverterStream) | ChannelFormatConverterStream | protected |
+ write(const uint8_t *data, size_t len) override (defined in ChannelFormatConverterStream) | ChannelFormatConverterStream | inlinevirtual |
+ write(uint8_t ch) override (defined in BaseStream) | BaseStream | inlinevirtual |
+ writeSilence(size_t len) | AudioStream | inlinevirtual |
+ ~AudioStream()=default (defined in AudioStream) | AudioStream | virtual |
+ ~BaseStream()=default (defined in BaseStream) | BaseStream | virtual |