Ticket #11451: 0001-Respect-the-start-and-end-times-of-menu-highlights-t.patch

mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp

@@ -1172 +1172 @@
 
 /** \brief get SPU pkt from dvd menu subtitle stream
  */
-void DVDRingBuffer::GetMenuSPUPkt(uint8_t *buf, int buf_size, int stream_id)
+void DVDRingBuffer::GetMenuSPUPkt(uint8_t *buf, int buf_size,
+                                  int stream_id, uint32_t startTime)
 {
     if (buf_size < 4)
         return;
@@ -1198 +1199 @@
     {
         int32_t gotbutton;
         m_buttonExists = DecodeSubtitles(&m_dvdMenuButton, &gotbutton,
-                                        m_menuSpuPkt, m_menuBuflength);
+                                        m_menuSpuPkt, m_menuBuflength, startTime);
     }
 }
 
@@ -1243 +1244 @@
  * code obtained from ffmpeg project
  */
 bool DVDRingBuffer::DecodeSubtitles(AVSubtitle *sub, int *gotSubtitles,
-                                    const uint8_t *spu_pkt, int buf_size)
+                                    const uint8_t *spu_pkt, int buf_size, uint32_t startTime)
 {
     #define GETBE16(p) (((p)[0] << 8) | (p)[1])
 
@@ -1281 +1282 @@
             {
                 case 0x00:
                     force_subtitle_display = true;
+                    sub->start_display_time = startTime;
+                    sub->end_display_time   = 0xFFFFFFFF;
                 break;
                 case 0x01:
-                    sub->start_display_time = (date << 10) / 90;
+                    sub->start_display_time = ((date << 10) / 90) + startTime;
                 break;
                 case 0x02:
-                    sub->end_display_time = (date << 10) / 90;
+                    sub->end_display_time = ((date << 10) / 90) + startTime;
                 break;
                 case 0x03:
                 {

mythtv/libs/libmythtv/DVD/dvdringbuffer.h

@@ -77 +77 @@
     bool AudioStreamsChanged(void) const { return m_audioStreamsChanged; }
     bool IsWaiting(void) const           { return m_dvdWaiting;          }
     int  NumPartsInTitle(void)     const { return m_titleParts;          }
-    void GetMenuSPUPkt(uint8_t *buf, int len, int stream_id);
+    void GetMenuSPUPkt(uint8_t *buf, int len, int stream_id, uint32_t startTime);
 
     // Public menu/button stuff
     AVSubtitle *GetMenuSubtitle(uint &version);
@@ -90 +90 @@
     // Subtitles
     uint GetSubtitleLanguage(int key);
     bool DecodeSubtitles(AVSubtitle * sub, int * gotSubtitles,
-                         const uint8_t * buf, int buf_size);
+                         const uint8_t * buf, int buf_size, uint32_t startTime);
 
     uint GetAudioLanguage(int id);
     int  GetAudioTrackNum(uint key);

mythtv/libs/libmythtv/DVD/mythdvdplayer.cpp

@@ -518 +518 @@
     AVSubtitle *dvdSubtitle = player_ctx->buffer->DVD()->GetMenuSubtitle(buttonversion);
     bool numbuttons    = player_ctx->buffer->DVD()->NumMenuButtons();
 
+    bool expired = false;
+
+    VideoFrame *currentFrame = videoOutput ? videoOutput->GetLastShownFrame() : NULL;
+
+    if (!currentFrame)
+    {
+        player_ctx->buffer->DVD()->ReleaseMenuButton();
+        return;
+    }
+
+    if (dvdSubtitle &&
+        (dvdSubtitle->end_display_time < currentFrame->timecode))
+    {
+        expired = true;
+    }
+
     // nothing to do
-    if (buttonversion == ((uint)m_buttonVersion))
+    if (!expired && (buttonversion == ((uint)m_buttonVersion)))
     {
         player_ctx->buffer->DVD()->ReleaseMenuButton();
         return;
     }
 
     // clear any buttons
-    if (!numbuttons || !dvdSubtitle || (buttonversion == 0))
+    if (!numbuttons || !dvdSubtitle || (buttonversion == 0) || expired)
     {
         SetCaptionsEnabled(false, false);
         osdLock.lock();
@@ -538 +554 @@
         return;
     }
 
+    if (currentFrame->timecode && (dvdSubtitle->start_display_time > currentFrame->timecode))
+    {
+        player_ctx->buffer->DVD()->ReleaseMenuButton();
+        return;
+    }
+
     m_buttonVersion = buttonversion;
     QRect buttonPos = player_ctx->buffer->DVD()->GetButtonCoords();
     osdLock.lock();

mythtv/libs/libmythtv/avformatdecoder.cpp

@@ -3686 +3686 @@
         if (ringBuffer->DVD()->NumMenuButtons() > 0)
         {
             ringBuffer->DVD()->GetMenuSPUPkt(pkt->data, pkt->size,
-                                             curstream->id);
+                                             curstream->id, pts);
         }
         else
         {
@@ -3694 +3694 @@
             {
                 QMutexLocker locker(avcodeclock);
                 ringBuffer->DVD()->DecodeSubtitles(&subtitle, &gotSubtitles,
-                                                   pkt->data, pkt->size);
+                                                   pkt->data, pkt->size, pts);
             }
         }
     }
@@ -3703 +3703 @@
         QMutexLocker locker(avcodeclock);
         avcodec_decode_subtitle2(curstream->codec, &subtitle, &gotSubtitles,
                                  pkt);
+
+        subtitle.start_display_time += pts;
+        subtitle.end_display_time += pts;
     }
 
     if (gotSubtitles)
     {
         if (isForcedTrack)
             subtitle.forced = true;
-        subtitle.start_display_time += pts;
-        subtitle.end_display_time += pts;
         LOG(VB_PLAYBACK | VB_TIMESTAMP, LOG_INFO, LOC +
             QString("subtl timecode %1 %2 %3 %4")
                 .arg(pkt->pts).arg(pkt->dts)