Ticket #13025: 20170414_streamchange.patch

mythtv/libs/libmythtv/Bluray/avformatdecoderbd.cpp

@@ -61 +61 @@
     if (!ringBuffer->IsBD())
         return;
 
+    if (m_streams_changed)
+    {
+        // This was originally in HandleBDStreamChange
+        LOG(VB_PLAYBACK, LOG_INFO, LOC + "resetting");
+        QMutexLocker locker(avcodeclock);
+        Reset(true, false, false);
+        CloseCodecs();
+        FindStreamInfo();
+        ScanStreams(false);
+        avcodeclock->unlock();
+        m_streams_changed=false;
+    }
+
     if (m_parent->AtNormalSpeed() && ringBuffer->BD()->TitleChanged())
     {
         ResetPosMap();

mythtv/libs/libmythtv/DVD/avformatdecoderdvd.cpp

@@ -595 +595 @@
     if (!ringBuffer->IsDVD())
         return;
 
+    if (m_streams_changed)
+    {
+        // This was originally in HandleDVDStreamChange
+        QMutexLocker locker(avcodeclock);
+        ScanStreams(true);
+        avcodeclock->unlock();
+        m_streams_changed=false;
+    }
+
     // Update the title length
     if (m_parent->AtNormalSpeed() &&
         ringBuffer->DVD()->PGCLengthChanged())

mythtv/libs/libmythtv/avformatdecoder.cpp

@@ -409 +409 @@
       disable_passthru(false),
       m_fps(0.0f),
       codec_is_mpeg(false),
-      m_processFrames(true)
+      m_processFrames(true),
+      m_streams_changed(false)
 {
     memset(&readcontext, 0, sizeof(readcontext));
     memset(ccX08_in_pmt, 0, sizeof(ccX08_in_pmt));
@@ -980 +981 @@
         QString("streams_changed 0x%1 -- stream count %2")
             .arg((uint64_t)data,0,16).arg(cnt));
 
-    decoder->SeekReset(0, 0, true, true);
-    QMutexLocker locker(avcodeclock);
-    decoder->ScanStreams(false);
-}
-
-extern "C" void HandleDVDStreamChange(void *data)
-{
-    AvFormatDecoder *decoder =
-        reinterpret_cast<AvFormatDecoder*>(data);
-
-    int cnt = decoder->ic->nb_streams;
-
-    LOG(VB_PLAYBACK, LOG_INFO, LOC +
-        QString("streams_changed 0x%1 -- stream count %2")
-            .arg((uint64_t)data,0,16).arg(cnt));
-
-    //decoder->SeekReset(0, 0, true, true);
-    QMutexLocker locker(avcodeclock);
-    decoder->ScanStreams(true);
-}
-
-extern "C" void HandleBDStreamChange(void *data)
-{
-    AvFormatDecoder *decoder =
-        reinterpret_cast<AvFormatDecoder*>(data);
-
-    LOG(VB_PLAYBACK, LOG_INFO, LOC + "resetting");
-
-    QMutexLocker locker(avcodeclock);
-    decoder->Reset(true, false, false);
-    decoder->CloseCodecs();
-    decoder->FindStreamInfo();
-    decoder->ScanStreams(false);
+    decoder->m_streams_changed = true;
 }
 
 int AvFormatDecoder::FindStreamInfo(void)
@@ -1227 +1196 @@
     }
 
     ic->streams_changed = HandleStreamChange;
-    if (ringBuffer->IsDVD())
-        ic->streams_changed = HandleDVDStreamChange;
-    else if (ringBuffer->IsBD())
-        ic->streams_changed = HandleBDStreamChange;
-
     ic->stream_change_data = this;
 
     fmt->flags &= ~AVFMT_NOFILE;
@@ -5051 +5015 @@
                         .arg(ff_codec_type_string(codec_type))
                         .arg(ff_codec_id_string(curstream->codec->codec_id))
                         .arg(curstream->codec->codec_id));
+                // Process Stream Change in case we have no audio
+                if (codec_type == AVMEDIA_TYPE_AUDIO && !m_audio->HasAudioIn())
+                    m_streams_changed = true;
             }
             av_packet_unref(pkt);
             continue;
@@ -5125 +5092 @@
     return true;
 }
 
+void AvFormatDecoder::StreamChangeCheck() {
+    if (m_streams_changed)
+    {
+        SeekReset(0, 0, true, true);
+        QMutexLocker locker(avcodeclock);
+        ScanStreams(false);
+        m_streams_changed=false;
+    }
+}
+
 int AvFormatDecoder::ReadPacket(AVFormatContext *ctx, AVPacket *pkt, bool &/*storePacket*/)
 {
     QMutexLocker locker(avcodeclock);

mythtv/libs/libmythtv/avformatdecoder.h

@@ -262 +262 @@
     virtual void UpdateFramesPlayed(void);
     virtual bool DoRewindSeek(long long desiredFrame);
     virtual void DoFastForwardSeek(long long desiredFrame, bool &needflush);
-    virtual void StreamChangeCheck(void) { }
+    virtual void StreamChangeCheck(void);
     virtual void PostProcessTracks(void) { }
     virtual bool IsValidStream(int streamid) {return true;}
 
@@ -371 +371 @@
     float m_fps;
     bool  codec_is_mpeg;
     bool  m_processFrames;
+    bool  m_streams_changed;
 };
 
 #endif