rename writeSamples to writeData

Author: pschatzmann

examples/sandbox/basic-a2dp-vs1053/basic-a2dp-vs1053.ino

@@ -21,7 +21,7 @@ VS1053Config cfg;
 void read_data_stream(const uint8_t *data, uint32_t bytes) {
   int samples = bytes / sizeof(int16_t);
   // split up writes to max 512 samples
-  writeSamples<int16_t>(&out, (int16_t*) data, samples, 512);
+  writeData<int16_t>(&out, (int16_t*) data, samples, 512);
 }
 
 

src/AudioTools/AudioCodecs/CodecADTS.h

@@ -121,7 +121,7 @@ class ADTSParser {
       LOGW(error_fmt, "freq", header.sampling_freq_idx);
       is_valid = false;
     }
-    if (header.channel_cfg > 2) {
+    if (header.channel_cfg == 0 || header.channel_cfg > 2) {
       LOGW(error_fmt, "channels", header.channel_cfg);
       is_valid = false;
     }
@@ -321,13 +321,13 @@ class ADTSDecoder : public AudioDecoder {
   size_t writeData(uint8_t *data, size_t size) {
     LOGI("writeData: %d", (int)size);
     if (p_print) {
-      size_t len = p_print->write(data, size);
+      size_t len = ::writeData<uint8_t>(p_print,data, size);
       assert(len == size);
       return (len == size);
     }
     if (p_dec) {
       LOGI("write to decoder: %d", (int)size);
-      size_t len = p_dec->write(data, size);
+      size_t len = writeDataT<uint8_t, AudioDecoder>(p_dec, data, size);
       assert(len == size);
       return (len == size);
     }

src/AudioTools/AudioCodecs/CodecMTS.h

@@ -6,6 +6,8 @@
 #define MTS_WRITE_BUFFER_SIZE 2000
 #endif
 
+#include "AudioToolsConfig.h"
+#include "AudioTools/CoreAudio/AudioTypes.h"
 #include "AudioTools/AudioCodecs/AudioCodecsBase.h"
 #include "stdlib.h"
 
@@ -409,14 +411,15 @@ class MTSDecoder : public AudioDecoder {
     open_pes_data_size -= dataSize;
 
     LOGI("- writing %d bytes (open: %d)", dataSize, open_pes_data_size);
-    // if (open_pes_data_size == 9) {
-    //   uint8_t *tmp = pes + len;
-    //   for (int j = 0; j <= 9; j++) {
-    //     LOGI("    0x%02X", tmp[j]);
-    //   }
-    // }
-    if (p_print) p_print->write(data, dataSize);
-    if (p_dec) p_dec->write(data, dataSize);
+
+    if (p_print) {
+      size_t result = writeData<uint8_t>(p_print, data, dataSize);
+      assert(result==dataSize);
+    }
+    if (p_dec) {
+      size_t result = writeDataT<uint8_t, AudioDecoder>(p_dec, data, dataSize);
+      assert(result==dataSize);
+    } 
   }
 
   // check for PES packet start code prefix

src/AudioTools/AudioCodecs/CodecTSDemux.h

@@ -281,7 +281,7 @@ class MTSDecoderTSDemux : public AudioDecoder {
           if (p_print != nullptr) {
             // size_t eff = p_print->write(pes->data_bytes,
             // pes->data_bytes_length);
-            size_t eff = writeSamples<uint8_t>(
+            size_t eff = writeData<uint8_t>(
                 p_print, (uint8_t *)pes->data_bytes, pes->data_bytes_length);
             if (eff != pes->data_bytes_length) {
               // we should not get here

src/AudioTools/AudioCodecs/ContainerOgg.h

@@ -329,7 +329,7 @@ class OggContainerOutput : public AudioOutput {
       return 0;
     }
     // self->out.write((uint8_t *)buf, n);
-    writeSamples<uint8_t>(self->p_out, (uint8_t *)buf, n);
+    writeData<uint8_t>(self->p_out, (uint8_t *)buf, n);
     // 0 = continue
     return 0;
   }