Opus codec

Author: pschatzmann

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

@@ -13,8 +13,7 @@
 #include "AudioCodecs/CodecOpus.h"
 
 int sample_rate = 24000;
-int channels = 2;  // The stream will have 2 channels
-int application = OPUS_APPLICATION_AUDIO; // Opus application
+int channels = 1;  // The stream will have 2 channels
 
 SineWaveGenerator<int16_t> sineWave( 32000);  // subclass of SoundGenerator with max amplitude of 32000
 GeneratedSoundStream<int16_t> sound( sineWave); // Stream generated from sine wave
@@ -47,8 +46,12 @@ void setup() {
   decoder.begin(cfgs);
 
   // configure and start encoder
-  enc.config().application = application;
-  encoder.begin(cfgs);
+  auto encfg = enc.config();
+  encfg.copyFrom(cfgs); // use sample rate, channels ...
+  //encfg.application = OPUS_APPLICATION_RESTRICTED_LOWDELAY;
+  //encfg.frame_sizes_ms_x2 = OPUS_FRAMESIZE_20_MS;
+  //encfg.complexity = 5;
+  encoder.begin(encfg);
 
   Serial.println("Test started...");
 }

src/AudioCodecs/CodecOpus.h

@@ -81,7 +81,7 @@ struct OpusEncoderSettings : public OpusSettings {
   /// OPUS_BANDWIDTH_SUPERWIDEBAND, OPUS_BANDWIDTH_FULLBAND,
   /// OPUS_BANDWIDTH_FULLBAND
   int max_bandwidth = -1;
-  /// OPUS_AUTO, OPUS_AUTO, OPUS_SIGNAL_VOICE, OPUS_SIGNAL_MUSIC
+  /// OPUS_AUTO,  OPUS_SIGNAL_VOICE, OPUS_SIGNAL_MUSIC
   int singal = -1;
   ///  0, 1
   int inband_fec = -1;
@@ -93,7 +93,7 @@ struct OpusEncoderSettings : public OpusSettings {
   int prediction_disabled = -1;
   /// 0, 1
   int use_dtx = -1;
-  /// 5,   10,  20,  40, 80, 120, 160, 200, 240
+  /// OPUS_FRAMESIZE_2_5_MS,OPUS_FRAMESIZE_5_MS,OPUS_FRAMESIZE_10_MS,OPUS_FRAMESIZE_20_MS,OPUS_FRAMESIZE_40_MS,OPUS_FRAMESIZE_60_MS,OPUS_FRAMESIZE_80_MS,OPUS_FRAMESIZE_100_MS,OPUS_FRAMESIZE_120_MS
   int frame_sizes_ms_x2 = -1; /* x2 to avoid 2.5 ms */
 };
 
@@ -306,7 +306,10 @@ class OpusAudioEncoder : public AudioEncoder {
       if (len < 0) {
         LOGE("opus_encode: %s", opus_strerror(len));
       } else if (len > 0 && len <= cfg.max_buffer_size) {
-        p_print->write(packet.data(), len);
+        int eff = p_print->write(packet.data(), len);
+        if (eff!=len){
+          LOGE("encodeFrame data lost");
+        }
       }
     }
   }

src/AudioCodecs/CodecOpusOgg.h

@@ -64,12 +64,14 @@ class OpusOggDecoder : public OggContainerDecoder {
 
   virtual void beginOfSegment(ogg_packet *op) {
     LOGD("bos");
-    if (strncmp((char *)op->bytes, "OpusHead", 8) == 0) {
+    if (op->packet==nullptr) return;
+    if (strncmp("OpusHead", (char *)op->packet, 8) == 0) {
       memmove(&header, (char *)op->packet, sizeof(header));
       cfg.sample_rate = header.sampleRate;
       cfg.channels = header.channelCount;
+      LOGI("sample rate: %d", cfg.sample_rate);
       notify();
-    } else if (strncmp((char *)op->bytes, "OpusTags", 8) == 0) {
+    } else if (strncmp("OpusTags",(char *)op->packet , 8) == 0) {
       // not processed
     }
   }

src/AudioCodecs/ContainerOgg.h

@@ -66,16 +66,21 @@ class OggContainerDecoder : public AudioDecoder {
   void begin() override {
     LOGD(LOG_METHOD);
     if (p_oggz == nullptr) {
-      p_oggz = oggz_new(OGGZ_READ | OGGZ_NONSTRICT | OGGZ_AUTO);
+      p_oggz = oggz_new(OGGZ_READ |  OGGZ_AUTO); // OGGZ_NONSTRICT
       is_open = true;
+      // Callback to Replace standard IO
+      if (oggz_io_set_read(p_oggz, ogg_io_read, this)!=0){
+        LOGE("oggz_io_set_read");
+        is_open = false;
+      }
       // Callback
       if (oggz_set_read_callback(p_oggz, -1, read_packet, this)!=0){
         LOGE("oggz_set_read_callback");
         is_open = false;
       }
-      // Callback to Replace standard IO
-      if (oggz_io_set_read(p_oggz, ogg_io_read, this)!=0){
-        LOGE("oggz_io_set_read");
+
+      if (oggz_set_read_page(p_oggz, -1, read_page, this)!=0){
+        LOGE("oggz_set_read_page");
         is_open = false;
       }
     }
@@ -125,13 +130,14 @@ class OggContainerDecoder : public AudioDecoder {
   bool is_open = false;
   long pos = 0;
 
-  // Final Stream Callback
+  // Final Stream Callback -> write data to requested output destination
   static size_t ogg_io_read(void *user_handle, void *buf, size_t n) {
     LOGI("ogg_io_read: %u", n);
     OggContainerDecoder *self = (OggContainerDecoder *)user_handle;
     int len = self->buffer.readArray((uint8_t *)buf, n);
     self->pos += len;
     return len;
+    //return self->p_print->write((uint8_t *)buf, n);
   }
 
   // Process full packet
@@ -147,11 +153,20 @@ class OggContainerDecoder : public AudioDecoder {
       self->endOfSegment(op);
     } else {
       LOGI("process audio packet");
-      self->p_print->write(op->packet, op->bytes);
+      int eff = self->p_print->write(op->packet, op->bytes);
+      if (eff!=result){
+        LOGE("Incomplere write");
+      }
     }
     return result;
   }
 
+
+ static int read_page(OGGZ *oggz, const ogg_page *og, long serialno, void *user_data){
+    LOGI("read_page: %u", og->body_len);
+    return og->body_len;
+ }
+
   virtual void beginOfSegment(ogg_packet *op) {
     LOGD("bos");
     if (op->bytes >= sizeof(cfg)) {
@@ -225,7 +240,7 @@ class OggContainerEncoder : public AudioEncoder {
     LOGD(LOG_METHOD);
     is_open = true;
     if (p_oggz == nullptr) {
-      p_oggz = oggz_new(OGGZ_WRITE | OGGZ_NONSTRICT);
+      p_oggz = oggz_new(OGGZ_WRITE | OGGZ_NONSTRICT | OGGZ_AUTO);
       serialno = oggz_serialno_new(p_oggz);
       oggz_io_set_write(p_oggz, ogg_io_write, this);
       packetno = 0;
@@ -266,7 +281,7 @@ class OggContainerEncoder : public AudioEncoder {
     op.b_o_s = false;
     op.e_o_s = false;
     op.packetno = packetno++;
-    if (!writePacket(op)) {
+    if (!writePacket(op, OGGZ_FLUSH_AFTER)) {
       return 0;
     }
 

tests/codec/opus/opus.cpp

@@ -19,8 +19,9 @@ SineWaveGenerator<int16_t> sineWave( 32000);  // subclass of SoundGenerator with
 GeneratedSoundStream<int16_t> sound( sineWave); // Stream generated from sine wave
 CsvStream<int16_t> out(Serial, 2);   // Output of sound on desktop 
 OpusAudioEncoder enc;
-EncodedAudioStream decoder(&out, new OpusAudioDecoder()); // encode and write 
-EncodedAudioStream encoder(&decoder, &enc); // encode and write 
+OpusAudioDecoder dec;
+EncodedAudioStream decoder(out, dec); // encode and write 
+EncodedAudioStream encoder(decoder, enc); // encode and write 
 StreamCopy copier(encoder, sound);     
 
 void setup() {

tests/codec/opusogg/opusogg.cpp

@@ -19,8 +19,11 @@ SineWaveGenerator<int16_t> sineWave( 32000);  // subclass of SoundGenerator with
 GeneratedSoundStream<int16_t> sound( sineWave); // Stream generated from sine wave
 CsvStream<int16_t> out(Serial, channels);   // Output of sound on desktop 
 OpusOggEncoder enc;
-EncodedAudioStream decoder(&out, new OpusOggDecoder()); // encode and write 
-EncodedAudioStream encoder(&decoder, &enc); // encode and write 
+OpusOggDecoder dec;
+EncodedAudioStream decoder(out, dec); // encode and write 
+HexDumpStream hex(Serial);
+EncodedAudioStream encoder(&hex, &enc); // encode and write 
+//EncodedAudioStream encoder(&decoder, &enc); // encode and write 
 StreamCopy copier(encoder, sound);     
 
 void setup() {