Ticket #11288: DVDPlaybackCleanup-0.26.diff

mythtv/libs/libmythtv/DVD/avformatdecoderdvd.cpp

@@ -26 +26 @@
     m_parent->SetFramesPlayed(currentpos + 1);
 }
 
+bool AvFormatDecoderDVD::GetFrame(DecodeType decodetype)
+{
+    // Always try to decode audio and video for DVDs
+    return AvFormatDecoder::GetFrame( kDecodeAV );
+}
+
 void AvFormatDecoderDVD::PostProcessTracks(void)
 {
     if (!ringBuffer)

mythtv/libs/libmythtv/DVD/avformatdecoderdvd.h

@@ -10 +10 @@
                        PlayerFlags flags);
     virtual void Reset(bool reset_video_data, bool seek_reset, bool reset_file);
     virtual void UpdateFramesPlayed(void);
+    virtual bool GetFrame(DecodeType decodetype); // DecoderBase
 
   private:
     virtual bool DoRewindSeek(long long desiredFrame);

mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp

@@ -340 +340 @@
     dvdnav_set_readahead_flag(m_dvdnav, 0);
     dvdnav_set_PGC_positioning_flag(m_dvdnav, 1);
 
-    int32_t num_titles = 0;
-    res = dvdnav_get_number_of_titles(m_dvdnav, &num_titles);
-    if (num_titles == 0 || res == DVDNAV_STATUS_ERR)
-    {
-        char buf[DVD_BLOCK_SIZE * 5];
-        LOG(VB_GENERAL, LOG_INFO,
-            LOC + QString("Reading %1 bytes from the drive")
-                .arg(DVD_BLOCK_SIZE * 5));
-        safe_read(buf, DVD_BLOCK_SIZE * 5);
-        res = dvdnav_get_number_of_titles(m_dvdnav, &num_titles);
-    }
-
-    if (res == DVDNAV_STATUS_ERR)
-    {
-        LOG(VB_GENERAL, LOG_ERR,
-            LOC + QString("Failed to get the number of titles on the DVD" ));
-    }
-    else
-    {
-        LOG(VB_GENERAL, LOG_INFO,
-            LOC + QString("There are %1 titles on the disk")
-                .arg(num_titles));
-    }
-
-    int startTitle = 1;
-    dvdnav_status_t result;
-    while (startTitle <= num_titles)
-    {
-        result = dvdnav_title_play(m_dvdnav, startTitle);
-        if (result == DVDNAV_STATUS_OK)
-            break;
-        else if (startTitle < num_titles)
-            LOG(VB_GENERAL, LOG_WARNING, QString("Unable to play DVD title %1, "
-                                                 "trying next title")
-                                                    .arg(startTitle));
-        startTitle++;
-    }
-
-    if (result == DVDNAV_STATUS_ERR)
-    {
-        LOG(VB_GENERAL, LOG_ERR, QString("Unable to play any title on this "
-                                         "DVD. Disc may be damaged or "
-                                         "corrupted as a means of copy "
-                                         "protection."));
-
-        rwlock.unlock();
-        return false;
-    }
-
     // Check we aren't starting in a still frame (which will probably fail as
     // ffmpeg will be unable to create a decoder)
     if (dvdnav_get_next_still_flag(m_dvdnav))
@@ -444 +395 @@
     if (m_dvdnav)
     {
         QMutexLocker lock(&m_seekLock);
+        dvdnav_reset(m_dvdnav);
         dvdnav_first_play(m_dvdnav);
         m_audioStreamsChanged = true;
     }

mythtv/libs/libmythtv/avformatdecoder.cpp

@@ -335 +335 @@
       // Audio
       disable_passthru(false),
       m_fps(0.0f),
-      codec_is_mpeg(false)
+      codec_is_mpeg(false),
+      m_processFrames(true)
 {
     memset(&readcontext, 0, sizeof(readcontext));
     memset(ccX08_in_pmt, 0, sizeof(ccX08_in_pmt));
@@ -684 +685 @@
 void AvFormatDecoder::SeekReset(long long newKey, uint skipFrames,
                                 bool doflush, bool discardFrames)
 {
-    if (ringBuffer->IsInDiscMenuOrStillFrame() || newKey == 0)
-        return;
-
     LOG(VB_PLAYBACK, LOG_INFO, LOC +
         QString("SeekReset(%1, %2, %3 flush, %4 discard)")
             .arg(newKey).arg(skipFrames)
@@ -935 +933 @@
 
     ringBuffer = rbuffer;
 
+    // Process frames immediately unless we're decoding
+    // a DVD, in which case don't so that we don't show
+    // anything whilst probing the data streams.
+    m_processFrames = !ringBuffer->IsDVD();
+
     if (avfRingBuffer)
         delete avfRingBuffer;
     avfRingBuffer = new AVFRingBuffer(rbuffer);
@@ -982 +985 @@
     }
 
     int ret = FindStreamInfo();
-
-    // Reset DVD/bluray ringbuffers
-    if (!ringBuffer->StartFromBeginning())
-        return -1;
-    ringBuffer->IgnoreWaitStates(false);
-
     if (ret < 0)
     {
         LOG(VB_GENERAL, LOG_ERR, LOC + "Could not find codec parameters. " +
@@ -1144 +1141 @@
     if (getenv("FORCE_DTS_TIMESTAMPS"))
         force_dts_timestamps = true;
 
+    if (ringBuffer->IsDVD())
+    {
+        // Reset DVD playback and clear any of
+        // our buffers so that none of the data
+        // parsed so far to determine decoders
+        // gets shown.
+        if (!ringBuffer->StartFromBeginning())
+            return -1;
+        ringBuffer->IgnoreWaitStates(false);
+
+        Reset(true, true, true);
+
+        // Now we're ready to process and show frames
+        m_processFrames = true;
+    }
+
+
     // Return true if recording has position map
     return recordingHasPositionMap;
 }
@@ -4418 +4432 @@
 
     skipaudio = (lastvpts == 0);
 
+    if( !m_processFrames )
+    {
+        return false;
+    }
+
     hasVideo = HasVideo(ic);
     needDummyVideoFrames = false;
 

mythtv/libs/libmythtv/avformatdecoder.h

@@ -360 +360 @@
 
     float m_fps;
     bool  codec_is_mpeg;
+    bool  m_processFrames;
 };
 
 #endif