Ticket #7426: reencode_non16bitsaudio.diff

mythplugins/mythmusic/mythmusic/avfdecoder.cpp

@@ -63 +63 @@
     m_audioEnc(NULL),       m_audioDec(NULL),
     m_pkt(&m_pkt1),         errcode(0),
     ptr(NULL),              dec_len(0),
-    data_size(0),           m_samples(NULL)
+    data_size(0),           m_samples(NULL),
+    m_samples2(NULL),       reformat_ctx(NULL)
 {
     setFilename(file);
 
@@ -77 +78 @@
         deinit();
 
     av_freep((void *)&m_samples);
+    av_freep((void *)&m_samples2);
 
     if (output_buf)
     {
@@ -149 +151 @@
             return false;
         }
     }
+    if (!m_samples2)
+    {
+        m_samples2 = (int16_t *)av_mallocz(AVCODEC_MAX_AUDIO_FRAME_SIZE / 2 *
+                                          sizeof(*m_samples2));
+        if (!m_samples2)
+        {
+            VERBOSE(VB_GENERAL, "Could not allocate output buffer in "
+                    "avfDecoder::initialize");
+            return false;
+        }
+    }
 
     if (!output_buf)
         output_buf = new char[globalBufferSize];
@@ -373 +386 @@
                 break;
             }
 
-            s = (char *)m_samples;
+            if (m_audioDec->sample_fmt != SAMPLE_FMT_S16)
+            {
+                if (reformat_ctx)
+                    av_audio_convert_free(reformat_ctx);
+                reformat_ctx = av_audio_convert_alloc(SAMPLE_FMT_S16, 1,
+                                                      m_audioDec->sample_fmt, 1,
+                                                      NULL, 0);
+                if (!reformat_ctx)
+                {
+                    VERBOSE(VB_PLAYBACK, QString("Cannot convert %1 sample format to %2 sample format").arg(avcodec_get_sample_fmt_name(m_audioDec->sample_fmt)).arg(avcodec_get_sample_fmt_name(SAMPLE_FMT_S16)));
+                    
+                    unlock();
+                    break;
+                }
+
+                const void *ibuf[6] = {m_samples};
+                void *obuf[6] = {m_samples2};
+                int istride[6] = {av_get_bits_per_sample_format(m_audioDec->sample_fmt)/8};
+                int ostride[6] = {2};
+                int len = data_size/istride[0];
+                if (av_audio_convert(reformat_ctx, obuf, ostride,
+                                     ibuf, istride, len) < 0)
+                {
+                    VERBOSE(VB_PLAYBACK, "av_audio_convert() failed");
+                    
+                    unlock();
+                    break;
+                }
+
+                data_size = len * 2;
+                s = (char *)m_samples2;
+            }
+            else    
+                s = (char *)m_samples;
+
             unlock();
 
             while (data_size > 0 && !done && !finish && !user_stop &&

mythplugins/mythmusic/mythmusic/avfdecoder.h

@@ -8 +8 @@
 extern "C" {
 #include <mythtv/libavformat/avformat.h>
 #include <mythtv/libavcodec/avcodec.h>
+#include <mythtv/libavcodec/audioconvert.h>
 }
 
 class Metadata;
@@ -62 +63 @@
 
     unsigned char *ptr;
     int dec_len, data_size;
-    int16_t *m_samples;
+    int16_t *m_samples, *m_samples2;
+    AVAudioConvert *reformat_ctx;
 };
 
 #endif

mythtv/libs/libavcodec/libavcodec.pro

@@ -60 +60 @@
 SOURCES += myth_utils.c
 
 inc.path = $${PREFIX}/include/mythtv/libavcodec/
-inc.files = avcodec.h x86/mmx.h opt.h
+inc.files = avcodec.h audioconvert.h x86/mmx.h opt.h
 
 INSTALLS += inc