Context Navigation

Ticket #8134: afd_based_solution_to_8134.diff

File afd_based_solution_to_8134.diff, 1.6 KB (added by skamithi, 14 years ago)
ffmpeg alias suggested not changing the audio codec on the fly. this approach uses AvformatDecoder? calls to avoid generating an audio codec for the stream when channels == 0, and if an audio stream with no codec is found, call scanstreams to generate the correct stream. made it dvd specific and pcm_dvd/pcm_s16be specific so it doesn't affect detection of other audio codecs.

diff --git a/mythtv/libs/libavcodec/pcm.c b/mythtv/libs/libavcodec/pcm.c
index b16f663..572ee94 100644

  static int pcm_decode_frame(AVCodecContext *avctx,
     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;

diff --git a/mythtv/libs/libmythtv/avformatdecoder.cpp b/mythtv/libs/libmythtv/avformatdecoder.cpp
index c332004..419e60e 100644

  int AvFormatDecoder::ScanStreams(bool novideo)
                         .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
-…
+ bool AvFormatDecoder::GetFrame(DecodeType decodetype)
                     .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_id == CODEC_ID_PCM_S16BE)
+            {
+                ScanStreams(false);
+            }
             continue;
+        }