Ticket #4925: remove_audio_streams_v2.diff

libs/libmythtv/avformatdecoder.cpp

@@ -1443 +1443 @@
     map<int,uint> lang_sub_cnt;
     map<int,uint> lang_aud_cnt;
 
+    if (ringBuffer->isDVD() &&
+        ringBuffer->DVD()->AudioStreamsChanged())
+    {
+        ringBuffer->DVD()->AudioStreamsChanged(false);
+        RemoveAudioStreams();
+    }
+
     for (uint i = 0; i < ic->nb_streams; i++)
     {
         AVCodecContext *enc = ic->streams[i]->codec;
@@ -1858 +1865 @@
     {
         GetNVP()->SetAudioParams(-1, -1, -1, false /* AC3/DTS pass-through */);
         GetNVP()->ReinitAudio();
+        audioIn = AudioInfo();
     }
 
     // if we don't have a video stream we still need to make sure some
@@ -1991 +1999 @@
         else
             i++;
     }
-    av_read_frame_flush(ic);
 }
 
 void release_avf_buffer(struct AVCodecContext *c, AVFrame *pic)
@@ -3020 +3027 @@
                 if ((storedPackets.count() > 10 && !decodeStillFrame) ||
                     decodeStillFrame)
                 {
-                    RemoveAudioStreams();
                     storevideoframes = false;
                     dvdTitleChanged = false;
-                    ScanStreams(true);
                 }
                 else
                     storevideoframes = true;

libs/libmythtv/DVDRingBuffer.cpp

@@ -34 +34 @@
       lastNav(NULL),    part(0),
       title(0),         titleParts(0),
       gotStop(false),
-      cellHasStillFrame(false), dvdWaiting(false),
+      cellHasStillFrame(false), audioStreamsChanged(false),
+      dvdWaiting(false),
       titleLength(0), hl_startx(0), hl_width(0),
       hl_starty(0), hl_height(0),
       menuBuflength(0),
@@ -446 +447 @@
                             break;
                     }
                 }
+                
+                audioStreamsChanged = true;
 
                 if (blockBuf != dvdBlockWriteBuf)
                 {

libs/libmythtv/DVDRingBuffer.h

@@ -41 +41 @@
     void GetPartAndTitle(int &_part, int &_title) const
         { _part  = part; _title = title; }
     uint GetTotalTimeOfTitle(void);
-    uint GetChapterLength(void) { return pgLength / 90000; }
+    uint GetChapterLength(void) const { return pgLength / 90000; }
     uint GetCellStart(void);
-    bool InStillFrame(void) { return cellHasStillFrame; }
-    bool IsWaiting(void) { return dvdWaiting; }
-    int  NumPartsInTitle(void) { return titleParts; }
+    bool InStillFrame(void) const { return cellHasStillFrame; }
+    bool AudioStreamsChanged(void) const { return audioStreamsChanged; }
+    bool IsWaiting(void) const { return dvdWaiting; }
+    int  NumPartsInTitle(void) const { return titleParts; }
     void GetMenuSPUPkt(uint8_t *buf, int len, int stream_id);
 
     AVSubtitleRect *GetMenuButton(void);
@@ -97 +98 @@
     int NumMenuButtons(void) const;
     void IgnoreStillOrWait(bool skip) { skipstillorwait = skip; }
     void InStillFrame(bool change) { cellHasStillFrame = change; }
+    void AudioStreamsChanged(bool change) { audioStreamsChanged = change; }
     uint GetCurrentTime(void) { return (currentTime / 90000); }
     uint TitleTimeLeft(void);
     void  SetTrack(uint type, int trackNo);
@@ -129 +131 @@
     bool           gotStop;
 
     bool           cellHasStillFrame;
+    bool           audioStreamsChanged;
     bool           dvdWaiting;
     long long      titleLength;
     MythTimer      stillFrameTimer;

libs/libavformat/utils.c

@@ -580 +580 @@
 
     *pnum = 0;
     *pden = 0;
+
+    if (!st || !st->codec)
+        return;
+    
     switch(st->codec->codec_type) {
     case CODEC_TYPE_VIDEO:
         if(st->time_base.num*1000LL > st->time_base.den){
@@ -792 +796 @@
     for(;;) {
         /* select current input stream component */
         st = s->cur_st;
-        if (st) {
+        if (st && st->codec) {
             if (!st->need_parsing || !st->parser) {
                 /* no parsing needed: we just output the packet as is */
                 /* raw data support */
@@ -867 +871 @@
                 s->cur_pkt.pos = startpos;
 
             st = s->streams[s->cur_pkt.stream_index];
-            if(st->codec->debug & FF_DEBUG_PTS)
+            if(st && st->codec && st->codec->debug & FF_DEBUG_PTS)
                 av_log(s, AV_LOG_DEBUG, "av_read_packet stream=%d, pts=%"PRId64", dts=%"PRId64", size=%d\n",
                     s->cur_pkt.stream_index,
                     s->cur_pkt.pts,
@@ -877 +881 @@
             s->cur_st = st;
             s->cur_ptr = s->cur_pkt.data;
             s->cur_len = s->cur_pkt.size;
-            if (st->need_parsing && !st->parser) {
+            if (st && st->need_parsing && !st->parser) {
                 st->parser = av_parser_init(st->codec->codec_id);
                 if (!st->parser) {
                     /* no parser available : just output the raw packets */
@@ -892 +896 @@
             }
         }
     }
-    if(st->codec->debug & FF_DEBUG_PTS)
+    if(st->codec && st->codec->debug & FF_DEBUG_PTS)
         av_log(s, AV_LOG_DEBUG, "av_read_frame_internal stream=%d, pts=%"PRId64", dts=%"PRId64", size=%d\n",
             pkt->stream_index,
             pkt->pts,