fixed playback of mp3s that have both mono and stereo frames

2 files changed, 25 insertions, 8 deletions

diff --git a/plugins/mpgmad/mpgmad.c b/plugins/mpgmad/mpgmad.c
index cb271883..803e6732 100644
--- a/plugins/mpgmad/mpgmad.c
+++ b/plugins/mpgmad/mpgmad.c
@@ -643,7 +643,8 @@ cmp3_init (DB_playItem_t *it) {
     }
     _info->bps = info->buffer.bitspersample;
     _info->samplerate = info->buffer.samplerate;
-    _info->channels = info->buffer.channels;
+    _info->channels = 2;//info->buffer.channels;
+//    trace ("mpgmad: nchannels: %d\n", _info->channels);
 
 	mad_stream_init(&info->stream);
 	mad_frame_init(&info->frame);
@@ -733,14 +734,20 @@ cmp3_decode_requested_int16 (mpgmad_info_t *info) {
     // copy synthesized samples into readbuffer
     int idx = info->synth.pcm.length-info->buffer.decode_remaining;
     while (info->buffer.decode_remaining > 0 && info->buffer.readsize > 0) {
-        *((int16_t*)info->buffer.out) = MadFixedToSshort (info->synth.pcm.samples[0][idx]);
+        int16_t sample = MadFixedToSshort (info->synth.pcm.samples[0][idx]);
+        *((int16_t*)info->buffer.out) = sample;
         info->buffer.readsize -= 2;
         info->buffer.out += 2;
-        if (MAD_NCHANNELS(&info->frame.header) == 2) {
+        if (MAD_NCHANNELS(&info->frame.header) == 2 && info->info.channels == 2) {
             *((int16_t*)info->buffer.out) = MadFixedToSshort (info->synth.pcm.samples[1][idx]);
             info->buffer.readsize -= 2;
             info->buffer.out += 2;
         }
+        else if (MAD_NCHANNELS(&info->frame.header) == 1 && info->info.channels == 2) {
+            *((int16_t*)info->buffer.out) = sample;
+            info->buffer.readsize -= 2;
+            info->buffer.out += 2;
+        }
         info->buffer.decode_remaining--;
         idx++;
     }
@@ -754,14 +761,20 @@ cmp3_decode_requested_float32 (mpgmad_info_t *info) {
     // copy synthesized samples into readinfo->buffer
     int idx = info->synth.pcm.length-info->buffer.decode_remaining;
     while (info->buffer.decode_remaining > 0 && info->buffer.readsize > 0) {
-        *((float*)info->buffer.out) = MadFixedToFloat (info->synth.pcm.samples[0][idx]);
+        float sample = MadFixedToFloat (info->synth.pcm.samples[0][idx]);
+        *((float*)info->buffer.out) = sample;
         info->buffer.readsize -= 4;
         info->buffer.out += 4;
-        if (MAD_NCHANNELS(&info->frame.header) == 2) {
+        if (MAD_NCHANNELS(&info->frame.header) == 2 && info->info.channels == 2) {
             *((float*)info->buffer.out) = MadFixedToFloat (info->synth.pcm.samples[1][idx]);
             info->buffer.readsize -= 4;
             info->buffer.out += 4;
         }
+        else if (MAD_NCHANNELS(&info->frame.header) == 1 && info->info.channels == 2) {
+            *((float*)info->buffer.out) = sample;
+            info->buffer.readsize -= 4;
+            info->buffer.out += 4;
+        }
         info->buffer.decode_remaining--;
         idx++;
     }
@@ -836,7 +849,12 @@ cmp3_stream_frame (mpgmad_info_t *info) {
         }
 
         info->info.samplerate = info->frame.header.samplerate;
-        info->info.channels = MAD_NCHANNELS(&info->frame.header);
+#if 0
+        // don't switch number of channels on the fly
+        if (info->info.channels == 0) {
+            info->info.channels = MAD_NCHANNELS(&info->frame.header);
+        }
+#endif
 
         // synthesize single frame
         mad_synth_frame(&info->synth,&info->frame);
@@ -938,6 +956,7 @@ cmp3_read_int16 (DB_fileinfo_t *_info, char *bytes, int size) {
 static int
 cmp3_read_float32 (DB_fileinfo_t *_info, char *bytes, int size) {
     mpgmad_info_t *info = (mpgmad_info_t *)_info;
+    trace ("cmp3_read_float32 readsize=%d, nchannels=%d\n", size, _info->channels);
     info->buffer.readsize = size;
     info->buffer.out = bytes;
     cmp3_decode_float32 (info);
diff --git a/streamer.c b/streamer.c
index cc0ff7ee..f4adf981 100644
--- a/streamer.c
+++ b/streamer.c
@@ -1141,7 +1141,6 @@ streamer_read_data_for_src_float (float *buffer, int frames) {
         channels = 2;
     }
     if (fileinfo->plugin->read_float32) {
-        {
         int bytesread = fileinfo->plugin->read_float32 (fileinfo, (uint8_t*)buffer, frames * sizeof (float) * channels);
         apply_replay_gain_float32 (streaming_track, (uint8_t*)buffer, bytesread);
         if (channels == 1) {
@@ -1154,7 +1153,6 @@ streamer_read_data_for_src_float (float *buffer, int frames) {
             }
         }
         return bytesread / (sizeof (float) * channels);
-        }
     }
 
 //    trace ("read_float32 not impl\n");