FLAC decoding improvments

src/AudioCodecs/CodecFLAC.h

@@ -189,9 +189,9 @@ class FLACDecoder : public StreamingDecoder {
       return result;
   }
 
-  /// Output decoded result to final output stream
+    /// Output decoded result to final output stream
   static FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame,const FLAC__int32 *const buffer[], void *client_data) {
-    LOGI("write_callback: %d", (int) frame->header.blocksize);
+    LOGI("write_callback: %d", frame->header.blocksize);
     FLACDecoder *self = (FLACDecoder *)client_data;
 
     AudioInfo actual_info = self->audioInfo();
@@ -200,7 +200,7 @@ class FLACDecoder : public StreamingDecoder {
       self->info.logInfo();
       int bps = FLAC__stream_decoder_get_bits_per_sample(decoder);
       if (bps!=16){
-        LOGI("Converting from %d bits", (int) bps);
+        LOGI("Converting from %d bits", bps);
       }
       if (self->p_notify != nullptr) {
         self->info = actual_info;
@@ -210,55 +210,52 @@ class FLACDecoder : public StreamingDecoder {
 
     // write audio data
     int bps = FLAC__stream_decoder_get_bits_per_sample(decoder);
-    int16_t sample;
+    int16_t result_frame[actual_info.channels];
+
     switch(bps){
       case 8:
         for (int j = 0; j < frame->header.blocksize; j++) {
           for (int i = 0; i < actual_info.channels; i++) {
             //self->output_buffer[j*actual_info.channels + i] = buffer[i][j]<<8;
-            sample = buffer[i][j]<<8;;
-            self->p_print->write((uint8_t *)&sample,2);
+            result_frame[i] = buffer[i][j]<<8;
           }
+          self->p_print->write((uint8_t *)&frame, sizeof(frame));
         }
         break;
       case 16:
         for (int j = 0; j < frame->header.blocksize; j++) {
           for (int i = 0; i < actual_info.channels; i++) {
-            //self->output_buffer[j*actual_info.channels + i] = buffer[i][j];
-            sample = buffer[i][j];
-            self->p_print->write((uint8_t *)&sample,2);
+            result_frame[i] = buffer[i][j];
           }
+          self->p_print->write((uint8_t *)&frame, sizeof(frame));
         }
         break;
       case 24:
         for (int j = 0; j < frame->header.blocksize; j++) {
           for (int i = 0; i < actual_info.channels; i++) {
-            //self->output_buffer[j*actual_info.channels + i] = buffer[i][j]>>8;
-            sample = buffer[i][j] >>8;
-            self->p_print->write((uint8_t *)&sample,2);
+            result_frame[i]  = buffer[i][j] >>8;
           }
+          self->p_print->write((uint8_t *)&frame, sizeof(frame));
         }
         break;
       case 32:
         for (int j = 0; j < frame->header.blocksize; j++) {
           for (int i = 0; i < actual_info.channels; i++) {
              //self->output_buffer[j*actual_info.channels+ i] = buffer[i][j]>>16;           
-            sample = buffer[i][j] >>16;
-            self->p_print->write((uint8_t *)&sample,2);
+            result_frame[i] = buffer[i][j] >>16;
           }
+          self->p_print->write((uint8_t *)&frame, sizeof(frame));
         }
         break;
       default:
-        LOGE("Unsupported bps: %d", (int) bps);
+        LOGE("Unsupported bps: %d", bps);
     }
 
     return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
   }
-
 };
 
 
-
 /**
  * @brief FLACEncoder
  * @ingroup codecs

src/AudioCodecs/DecoderFromStreaming.h

@@ -31,6 +31,8 @@ class DecoderFromStreaming : public AudioDecoder {
   void begin() override {
     TRACED();
     active = true;
+    p_dec->begin();
+    queue.begin();
   }
 
   void end() override {
@@ -44,12 +46,13 @@ class DecoderFromStreaming : public AudioDecoder {
   }
 
   size_t write(const void *data, size_t byteCount) override {
-    if (p_out == nullptr)
-      return 0;
     TRACED();
     size_t result = queue.write((uint8_t *)data, byteCount);
-    // trigger processing
-    while(p_dec->copy()) delay(1);
+    // trigger processing - we leave byteCount in the buffer
+    while(queue.available()>byteCount){
+      p_dec->copy(); 
+      delay(1);
+    }
     return result;
   }
 
@@ -60,7 +63,6 @@ class DecoderFromStreaming : public AudioDecoder {
   StreamingDecoder *p_dec = nullptr;
   RingBuffer<uint8_t> rbuffer{0};
   QueueStream<uint8_t> queue{rbuffer}; // convert Buffer to Stream
-  Print *p_out = nullptr;
 };
 
 } // namespace audio_tools