Ticket #8134: afd_based_solution_to_8134_v2.diff

mythtv/libs/libavcodec/pcm.c

@@ -373 +373 @@
 
     n = buf_size/sample_size;
 
-    switch(avctx->codec_id) {
+    switch(avctx->codec->id) {
     case CODEC_ID_PCM_U32LE:
         DECODE(uint32_t, le32, src, samples, n, 0, 0x80000000)
         break;

mythtv/libs/libmythtv/avformatdecoder.cpp

@@ -2030 +2030 @@
                         .arg(codec_id_string(enc->codec_id))
                         .arg(enc->channels));
 
+                if (ringBuffer && ringBuffer->isDVD() && enc->channels == 0)
+                    continue;
 #if 0
                 // HACK MULTICHANNEL DTS passthru disabled for multichannel,
                 // dont know how to handle this
@@ -3911 +3913 @@
                     .arg(codec_id_string(curstream->codec->codec_id))
                     .arg(curstream->codec->codec_id));
             av_free_packet(pkt);
+
+            // workaround for #8134.
+            if (ringBuffer && ringBuffer->isDVD() && 
+                curstream->codec->codec_type == CODEC_TYPE_AUDIO &&
+                curstream->codec->channels > 0)
+            {
+                ScanStreams(false);
+            }
             continue;
         }