DRAFT ContainerOgg

Author: pschatzmann

examples/tests/codecs/test-codec-ogg/test-codec-ogg.ino

@@ -0,0 +1,50 @@
+/**
+ * @file communication-codec-test.ino
+ * @author Phil Schatzmann
+ * @brief generate sine wave -> encoder -> decoder -> audiokit (i2s)
+ * @version 0.1
+ * @date 2022-04-30
+ * 
+ * @copyright Copyright (c) 2022
+ * 
+ */
+#include "AudioTools.h"
+#include "AudioCodecs/ContainerOgg.h"
+#include "AudioLibs/AudioKit.h"
+
+AudioInfo info(8000, 1, 16);
+SineWaveGenerator<int16_t> sineWave( 32000);  // subclass of SoundGenerator with max amplitude of 32000
+GeneratedSoundStream<int16_t> sound( sineWave); // Stream generated from sine wave
+AudioKitStream out; 
+OggContainerEncoder enc;
+OggContainerDecoder dec;
+EncodedAudioStream decoder(out, dec); // encode and write
+EncodedAudioStream encoder(decoder, enc); // encode and write
+StreamCopy copier(encoder, sound);     
+
+void setup() {
+  Serial.begin(115200);
+  AudioLogger::instance().begin(Serial, AudioLogger::Warning);
+
+  // start I2S
+  Serial.println("starting I2S...");
+  auto cfgi = out.defaultConfig(TX_MODE);
+  cfgi.copyFrom(info);
+  out.begin(cfgi);
+
+  // Setup sine wave
+  sineWave.begin(info, N_B4);
+
+  // start decoder
+  decoder.begin(info);
+
+  // start encoder
+  encoder.begin(info);
+
+  Serial.println("Test started...");
+}
+
+
+void loop() { 
+  copier.copy();
+}

examples/tests/codecs/test-ogg-write/test-write-ogg.ino

@@ -0,0 +1,27 @@
+#include "AudioTools.h"
+#include "AudioCodecs/ContainerOgg.h"
+
+AudioInfo info(24000, 1, 16);
+SineWaveGenerator<int16_t> sineWave(
+    32000);  // subclass of SoundGenerator with max amplitude of 32000
+GeneratedSoundStream<int16_t> sound(
+    sineWave);  // Stream generated from sine wave
+HexDumpStream out(Serial);
+OggContainerEncoder enc;
+EncodedAudioStream encoder(out, enc);  // encode and write
+StreamCopy copier(encoder, sound);
+
+void setup() {
+  Serial.begin(115200);
+  AudioLogger::instance().begin(Serial, AudioLogger::Warning);
+
+  // Setup sine wave
+  sineWave.begin(info, N_B4);
+
+  // Opus encoder and decoder need to know the audio info
+  encoder.begin(info);
+
+  copier.copyN(2);
+}
+
+void loop() {}

src/AudioCodecs/ContainerOgg.h

@@ -105,7 +105,7 @@ class OggContainerDecoder : public AudioDecoder {
 
   virtual size_t write(const void *in_ptr, size_t in_size) override {
     LOGD("write: %d", (int)in_size);
-    if (p_print == nullptr) return 0;
+    if (p_print == nullptr || in_ptr==nullptr) return 0;
 
     // fill buffer
     size_t size_consumed = buffer.writeArray((uint8_t *)in_ptr, in_size);
@@ -138,8 +138,8 @@ class OggContainerDecoder : public AudioDecoder {
     OggContainerDecoder *self = (OggContainerDecoder *)user_handle;
     int len = self->buffer.readArray((uint8_t *)buf, n);
     self->pos += len;
+    //self->p_print->write((uint8_t *)buf, n);
     return len;
-    //return self->p_print->write((uint8_t *)buf, n);
   }
 
   // Process full packet
@@ -236,13 +236,15 @@ class OggContainerEncoder : public AudioEncoder {
   virtual void setAudioInfo(AudioInfo from) override { cfg = from; }
 
   virtual void begin(AudioInfo from) {
-    setAudioInfo(cfg);
+    setAudioInfo(from);
     begin();
   }
 
   /// starts the processing using the actual AudioInfo
   virtual void begin() override {
     TRACED();
+    assert(cfg.channels!=0);
+    assert(cfg.sample_rate!=0);
     is_open = true;
     codec_buffer.begin();
     if (p_oggz == nullptr) {
@@ -277,14 +279,14 @@ class OggContainerEncoder : public AudioEncoder {
 
   /// Writes raw data to be encoded and packaged
   virtual size_t write(const void *in_ptr, size_t in_size) override {
-    if (!is_open || p_print == nullptr) return 0;
-    LOGD("write: %d", (int) in_size);
+    if (!is_open || p_print == nullptr || in_ptr==nullptr) return 0;
+    LOGD("OggContainerEncoder::write: %d", (int) in_size);
 
     if (p_codec!=nullptr){
       // encode the data
       size_t eff = p_encoded_audio_stream->write((uint8_t*)in_ptr, in_size);
       if (eff!=in_size){
-        LOGE("Write overflow");
+        LOGE("Write overflow req:%d eff:%d", in_size, eff);
       }
       // get the result from the buffer
       void *encoded_data = buffer.address();
@@ -338,7 +340,7 @@ class OggContainerEncoder : public AudioEncoder {
   virtual bool writePacket(ogg_packet &op, int flag = 0) {
     LOGD("writePacket: %d", (int) op.bytes);
     long result = oggz_write_feed(p_oggz, &op, serialno, flag, NULL);
-    if (result < 0) {
+    if (result < 0 && result!=OGGZ_ERR_OUT_OF_MEMORY) {
       LOGE("oggz_write_feed: %d", (int) result);
       return false;
     }