Correct CodecLC3 quality problem

Author: pschatzmann

src/AudioCodecs/AudioEncoded.h

@@ -332,10 +332,8 @@ class EncodedAudioPrint : public AudioStream {
     const CodecNOP *nop = CodecNOP::instance();
     if (decoder_ptr != nop || encoder_ptr != nop) {
       // some decoders need this - e.g. opus
-      decoder_ptr->setAudioInfo(info);
-      decoder_ptr->begin();
-      encoder_ptr->setAudioInfo(info);
-      encoder_ptr->begin();
+      decoder_ptr->begin(info);
+      encoder_ptr->begin(info);
       active = true;
     } else {
       LOGW("no decoder or encoder defined");

src/AudioCodecs/CodecLC3.h

@@ -13,12 +13,11 @@
 #include "AudioCodecs/AudioEncoded.h"
 #include "lc3.h"
 
-/** 
+/**
  * @defgroup c lc3
  * @ingroup codecs
- * @brief LC3 Codec   
-**/
-
+ * @brief LC3 Codec
+ **/
 
 namespace audio_tools {
 
@@ -43,12 +42,13 @@ class LC3Decoder : public AudioDecoder {
     this->input_byte_count = inputByteCount;
   }
 
-  LC3Decoder(int dt_us = LC3_DEFAULT_DT_US, uint16_t inputByteCount = DEFAULT_BYTE_COUNT) {
+  LC3Decoder(int dt_us = LC3_DEFAULT_DT_US,
+             uint16_t inputByteCount = DEFAULT_BYTE_COUNT) {
     this->dt_us = dt_us;
     this->input_byte_count = inputByteCount;
     info.sample_rate = 32000;
     info.bits_per_sample = 16;
-    info.channels = 2;
+    info.channels = 1;
   }
 
   virtual AudioInfo audioInfo() { return info; }
@@ -60,6 +60,8 @@ class LC3Decoder : public AudioDecoder {
 
   virtual void begin() {
     TRACEI();
+
+    // Return the number of PCM samples in a frame
     num_frames = lc3_frame_samples(dt_us, info.sample_rate);
     dec_size = lc3_decoder_size(dt_us, info.sample_rate);
 
@@ -71,12 +73,13 @@ class LC3Decoder : public AudioDecoder {
     LOGI("dec_size: %d", dec_size);
 
     if (!checkValues()) {
+      LOGE("Invalid Parameters");
       return;
     }
 
     // setup memory
     input_buffer.resize(input_byte_count);
-    output_buffer.resize(num_frames*2);
+    output_buffer.resize(num_frames * 2);
     lc3_decoder_memory.resize(dec_size);
 
     // setup decoder
@@ -133,8 +136,6 @@ class LC3Decoder : public AudioDecoder {
 
  protected:
   Print *p_print = nullptr;
-  AudioInfo info;
-  AudioInfoDependent *p_notify = nullptr;
   lc3_decoder_t lc3_decoder = nullptr;
   lc3_pcm_format pcm_format;
   Vector<uint8_t> lc3_decoder_memory;
@@ -163,6 +164,10 @@ class LC3Decoder : public AudioDecoder {
       return false;
     }
 
+    if (info.channels!=1){
+      LOGE("channels: %d", info.channels);
+    }
+
     if (num_frames == -1) {
       LOGE("num_frames could not be determined - using m");
       return false;
@@ -197,11 +202,12 @@ class LC3Decoder : public AudioDecoder {
  */
 class LC3Encoder : public AudioEncoder {
  public:
-  LC3Encoder(int dt_us = LC3_DEFAULT_DT_US, uint16_t outputByteCount = DEFAULT_BYTE_COUNT) {
+  LC3Encoder(int dt_us = LC3_DEFAULT_DT_US,
+             uint16_t outputByteCount = DEFAULT_BYTE_COUNT) {
     this->dt_us = dt_us;
     info.sample_rate = 32000;
     info.bits_per_sample = 16;
-    info.channels = 2;
+    info.channels = 1;
     output_byte_count = outputByteCount;
   }
 
@@ -212,6 +218,7 @@ class LC3Encoder : public AudioEncoder {
 
   void begin() {
     TRACEI();
+
     unsigned enc_size = lc3_encoder_size(dt_us, info.sample_rate);
     num_frames = lc3_frame_samples(dt_us, info.sample_rate);
 
@@ -232,8 +239,8 @@ class LC3Encoder : public AudioEncoder {
     output_buffer.resize(output_byte_count);
 
     // setup encoder
-    lc3_encoder =
-        lc3_setup_encoder(dt_us, info.sample_rate, 0, lc3_encoder_memory.data());
+    lc3_encoder = lc3_setup_encoder(dt_us, info.sample_rate, 0,
+                                    lc3_encoder_memory.data());
 
     input_pos = 0;
     active = true;
@@ -260,8 +267,9 @@ class LC3Encoder : public AudioEncoder {
     for (int j = 0; j < in_size; j++) {
       input_buffer[input_pos++] = p_ptr8[j];
       if (input_pos >= num_frames * 2) {
-        if (lc3_encode(lc3_encoder, pcm_format, (const int16_t *)input_buffer.data(),
-                       1, output_buffer.size(), output_buffer.data()) != 0) {
+        if (lc3_encode(lc3_encoder, pcm_format,
+                       (const int16_t *)input_buffer.data(), 1,
+                       output_buffer.size(), output_buffer.data()) != 0) {
           LOGE("lc3_encode");
         }
 
@@ -307,6 +315,10 @@ class LC3Encoder : public AudioEncoder {
       return false;
     }
 
+    if (info.channels!=1){
+      LOGE("channels: %d", info.channels);
+    }
+
     if (num_frames == -1) {
       LOGE("Invalid num_frames");
       return false;

src/AudioTools/AudioTypes.h

@@ -126,6 +126,10 @@ class AudioWriter {
         virtual void setOutputStream(Print &out_stream) = 0;
         virtual operator bool() = 0;
         virtual void begin() = 0;
+        virtual void begin(AudioInfo info) {
+            setAudioInfo(info);
+            begin();
+        }
         virtual void end() = 0;
     protected:
         void writeBlocking(Print *out, uint8_t* data, size_t len){