Bluray: Initial still frame support

- only infinite still frames are currently supported (as I haven't seen
anything else)
- there's a small pts hack in place to ensure keypresses are processed
while we're using the pause frame code
- resuming the current title will always start at the beginning until
the pts is fixed (and not at the current position)

mythtv/libs/libmythtv/bdringbuffer.cpp

@@ -32,7 +32,8 @@ static void HandleOverlayCallback(void *data, const bd_overlay_s *const overlay)
 BDRingBuffer::BDRingBuffer(const QString &lfilename)
   : bdnav(NULL), m_is_hdmv_navigation(false),
     m_numTitles(0), m_titleChanged(false), m_playerWait(false),
-    m_ignorePlayerWait(true)
+    m_ignorePlayerWait(true),
+    m_stillTime(0), m_stillMode(BLURAY_STILL_NONE)
 {
     OpenFile(lfilename);
 }
@@ -363,7 +364,8 @@ bool BDRingBuffer::OpenFile(const QString &lfilename, uint retry_ms)
     m_secondaryAudioEnabled = false;
     m_secondaryVideoEnabled = false;
     m_secondaryVideoIsFullscreen = false;
-    m_still = 0;
+    m_stillMode = BLURAY_STILL_NONE;
+    m_stillTime = 0;
     m_inMenu = false;
 
     bool try_hdmv = NULL != getenv("MYTHTV_HDMV");
@@ -551,6 +553,7 @@ bool BDRingBuffer::UpdateTitleInfo(uint32_t index)
     }
 
     int still = BLURAY_STILL_NONE;
+    int time  = 0;
     if (m_currentTitleInfo->clip_count)
     {
         for (uint i = 0; i < m_currentTitleInfo->clip_count; i++)
@@ -563,16 +566,25 @@ bool BDRingBuffer::UpdateTitleInfo(uint32_t index)
                     .arg(m_currentTitleInfo->clips[i].video_stream_count)
                     .arg(m_currentTitleInfo->clips[i].audio_stream_count));
             still |= m_currentTitleInfo->clips[i].still_mode;
+            time = m_currentTitleInfo->clips[i].still_time;
         }
     }
 
-    if (m_currentTitleInfo->clip_count > 1)
+    if (m_currentTitleInfo->clip_count > 1 && still != BLURAY_STILL_NONE)
         VERBOSE(VB_IMPORTANT, LOC + "Warning: more than 1 clip, following still"
                                     " frame analysis may be wrong");
     if (still == BLURAY_STILL_TIME)
-        VERBOSE(VB_PLAYBACK, LOC + "Entering still frame.");
+    {
+        VERBOSE(VB_PLAYBACK, LOC +
+            QString("Entering still frame (%1 seconds) UNSUPPORTED").arg(time));
+    }
     else if (still == BLURAY_STILL_INFINITE)
-        VERBOSE(VB_PLAYBACK, LOC + "Entering inifinite still frame.");
+    {
+        VERBOSE(VB_PLAYBACK, LOC + "Entering infinite still frame.");
+    }
+
+    m_stillMode = still;
+    m_stillTime = time;
 
     return true;
 }
@@ -704,13 +716,11 @@ int BDRingBuffer::GetSubtitleLanguage(uint streamID)
 
 void BDRingBuffer::PressButton(int32_t key, int64_t pts)
 {
-    if (!bdnav)
-        return;
+    VERBOSE(VB_PLAYBACK, LOC + QString("Key %1 (pts %2)").arg(key).arg(pts));
+    // HACK for still frame menu navigation
+    pts = 1;
 
-    if (pts <= 0)
-        return;
-
-    if (key < 0)
+    if (!bdnav || pts <= 0 || key < 0)
         return;
 
     bd_user_input(bdnav, pts, key);
@@ -740,7 +750,8 @@ bool BDRingBuffer::GoToMenu(const QString str, int64_t pts)
     {
         if (bd_menu_call(bdnav, pts))
         {
-            VERBOSE(VB_PLAYBACK, QString("BDRingBuf: Invoked Menu Successfully"));
+            VERBOSE(VB_PLAYBACK,
+                QString("BDRingBuf: Invoked Top Menu (pts %1)").arg(pts));
             return true;
         }
     }
@@ -822,14 +833,11 @@ void BDRingBuffer::HandleBDEvent(BD_EVENT &ev)
         case BD_EVENT_STILL:
             VERBOSE(VB_PLAYBACK,
                     QString("BDRingBuf: EVENT_STILL %1").arg(ev.param));
-            m_still = ev.param;
             break;
         case BD_EVENT_STILL_TIME:
-            VERBOSE(VB_PLAYBACK,
-                    QString("BDRingBuf: EVENT_STILL_TIME %1").arg(ev.param));
+            // we use the clip information to determine the still frame status
             // sleep a little
             usleep(10000);
-            // TODO: Handle still playback.  0 = infinite, 1-300 = seconds.
             break;
         case BD_EVENT_SEEK:
             VERBOSE(VB_PLAYBACK,
@@ -892,6 +900,11 @@ void BDRingBuffer::HandleBDEvent(BD_EVENT &ev)
       }
 }
 
+bool BDRingBuffer::IsInStillFrame(void) const
+{
+    return m_stillTime >= 0 && m_stillMode != BLURAY_STILL_NONE;
+}
+
 void BDRingBuffer::WaitForPlayer(void)
 {
     if (m_ignorePlayerWait)

mythtv/libs/libmythtv/bdringbuffer.h

@@ -81,7 +81,7 @@ class MPUBLIC BDRingBuffer : public RingBuffer
     bool IsOpen(void)        const { return bdnav; }
     bool IsHDMVNavigation(void) const { return m_is_hdmv_navigation; }
     bool IsInMenu(void) const { return m_inMenu; }
-    bool IsInStillFrame(void) const { return m_still > 0; }
+    bool IsInStillFrame(void) const;
     virtual bool IsInDiscMenuOrStillFrame(void) const
         { return IsInMenu() || IsInStillFrame(); } // RingBuffer
     bool TitleChanged(void);
@@ -159,7 +159,8 @@ class MPUBLIC BDRingBuffer : public RingBuffer
     QMutex             m_overlayLock;
     QList<BDOverlay*>  m_overlayImages;
 
-    uint8_t            m_still;
+    uint8_t            m_stillTime;
+    uint8_t            m_stillMode;
     volatile bool      m_inMenu;
 
 };

mythtv/libs/libmythtv/mythbdplayer.cpp

@@ -4,7 +4,8 @@
 #define LOC     QString("BDPlayer: ")
 #define LOC_ERR QString("BDPlayer error: ")
 
-MythBDPlayer::MythBDPlayer(bool muted) : MythPlayer(muted)
+MythBDPlayer::MythBDPlayer(bool muted)
+  : MythPlayer(muted), m_stillFrameShowing(false)
 {
 }
 
@@ -38,6 +39,17 @@ void MythBDPlayer::DisplayMenu(void)
     osdLock.unlock();
 }
 
+void MythBDPlayer::DisplayPauseFrame(void)
+{
+    if (player_ctx->buffer->IsBD() &&
+        player_ctx->buffer->BD()->IsInStillFrame())
+    {
+        SetScanType(kScan_Progressive);
+    }
+    DisplayMenu();
+    MythPlayer::DisplayPauseFrame();
+}
+
 bool MythBDPlayer::VideoLoop(void)
 {
     if (!player_ctx->buffer->IsBD())
@@ -72,6 +84,48 @@ bool MythBDPlayer::VideoLoop(void)
         return !IsErrored();
     }
 
+    if (player_ctx->buffer->BD()->IsInStillFrame())
+    {
+        if (nbframes > 1 && !m_stillFrameShowing)
+        {
+            videoOutput->UpdatePauseFrame();
+            DisplayNormalFrame(false);
+            return !IsErrored();
+        }
+
+        if (!m_stillFrameShowing)
+            needNewPauseFrame = true;
+
+        // we are in a still frame so pause video output
+        if (!videoPaused)
+        {
+            PauseVideo();
+            return !IsErrored();
+        }
+
+        // flag if we have no frame
+        if (nbframes == 0)
+        {
+            VERBOSE(VB_PLAYBACK, LOC +
+                    "Warning: In BD Still but no video frames in queue");
+            usleep(10000);
+            return !IsErrored();
+        }
+
+        if (!m_stillFrameShowing)
+            VERBOSE(VB_PLAYBACK, LOC + "Entering still frame.");
+        m_stillFrameShowing = true;
+    }
+    else
+    {
+        if (videoPaused && m_stillFrameShowing)
+        {
+            UnpauseVideo();
+            VERBOSE(VB_PLAYBACK, LOC + "Exiting still frame.");
+        }
+        m_stillFrameShowing = false;
+    }
+
     return MythPlayer::VideoLoop();
 }
 

mythtv/libs/libmythtv/mythbdplayer.h

@@ -31,10 +31,12 @@ class MythBDPlayer : public MythPlayer
     // Playback
     virtual bool VideoLoop(void);
     virtual void EventStart(void);
+    virtual void DisplayPauseFrame(void);
     virtual void PreProcessNormalFrame(void);
 
   private:
     void DisplayMenu(void);
+    bool m_stillFrameShowing;
 };
 
 #endif // MYTHBDPLAYER_H