Ticket #5643: mythtv_refresh_rate_auto_pickv2-trunk.patch

mythtv/libs/libmythtv/NuppelVideoPlayer.cpp

@@ -650 +650 @@
             GetDecoder()->GetVideoCodecID(),
             GetDecoder()->GetVideoCodecPrivate(),
             video_disp_dim, video_aspect,
-            widget->winId(), display_rect, 0 /*embedid*/);
+            widget->winId(), display_rect, (video_frame_rate * play_speed), 
+            0 /*embedid*/);
 
         if (!videoOutput)
         {
@@ -665 +666 @@
         videoOutput->SetVideoScalingAllowed(db_scale);
 
         // We need to tell it this for automatic deinterlacer settings
-        videoOutput->SetVideoFrameRate(video_frame_rate * play_speed);
+        //videoOutput->SetVideoFrameRate(video_frame_rate * play_speed);
 
         if (videoOutput->hasMCAcceleration() && !decode_extra_audio)
         {

mythtv/libs/libmythtv/videooutbase.cpp

@@ -67 +67 @@
         void          *codec_priv,
         const QSize   &video_dim, float        video_aspect,
         WId            win_id,    const QRect &display_rect,
+        float          video_playback_rate,
         WId            embed_id)
 {
     (void) codec_priv;
@@ -172 +173 @@
             if (vo->Init(
                     video_dim.width(), video_dim.height(), video_aspect,
                     win_id, display_rect.x(), display_rect.y(),
-                    display_rect.width(), display_rect.height(), embed_id))
+                    display_rect.width(), display_rect.height(),
+                    video_playback_rate, embed_id))
             {
                 return vo;
             }
@@ -370 +372 @@
  * \return true if successful, false otherwise.
  */
 bool VideoOutput::Init(int width, int height, float aspect, WId winid,
-                       int winx, int winy, int winw, int winh, WId embedid)
+                       int winx, int winy, int winw, int winh, 
+                       float prate, WId embedid)
 {
     (void)winid;
     (void)embedid;
@@ -397 +400 @@
 
     embedding = false;
 
+    SetVideoFrameRate(prate);
+
     return true;
 }
 
@@ -415 +420 @@
 
 void VideoOutput::SetVideoFrameRate(float playback_fps)
 {
+    video_playback_rate = playback_fps;
     if (db_vdisp_profile)
         db_vdisp_profile->SetOutput(playback_fps);
 }

mythtv/libs/libmythtv/videoout_xv.h

@@ -60 +60 @@
    ~VideoOutputXv();
 
     bool Init(int width, int height, float aspect, WId winid,
-              int winx, int winy, int winw, int winh, WId embedid = 0);
+              int winx, int winy, int winw, int winh, 
+              float videoPlaybackRate, WId embedid = 0);
 
     bool SetDeinterlacingEnabled(bool);
     bool SetupDeinterlace(bool interlaced, const QString& ovrf="");

mythtv/libs/libmythtv/videoout_xv.cpp

@@ -426 +426 @@
     if ((width == 1920 || width == 1440) && height == 1088)
         height = 1080; // ATSC 1920x1080
 
-    if (display_res && display_res->SwitchToVideo(width, height))
+    if (display_res && display_res->SwitchToVideo(width, height, (short) roundf(video_playback_rate)))
     {
         // Switching to custom display resolution succeeded
         // Make a note of the new size
@@ -1605 +1605 @@
  */
 bool VideoOutputXv::Init(
     int width, int height, float aspect,
-    WId winid, int winx, int winy, int winw, int winh, WId embedid)
+    WId winid, int winx, int winy, int winw, int winh, 
+    float prate, WId embedid)
 {
     needrepaint = true;
 
@@ -1662 +1663 @@
     // Basic setup
     VideoOutput::Init(width, height, aspect,
                       winid, winx, winy, winw, winh,
-                      embedid);
+                      prate, embedid);
 
     // Set resolution/measurements (check XRandR, Xinerama, config settings)
     InitDisplayMeasurements(width, height);

mythtv/libs/libmythtv/videooutbase.h

@@ -40 +40 @@
         void          *codec_priv,
         const QSize   &video_dim, float        video_aspect,
         WId            win_id,    const QRect &display_rect,
+        float          video_playback_rate,
         WId            embed_id);
 
     VideoOutput();
@@ -47 +48 @@
 
     virtual bool Init(int width, int height, float aspect,
                       WId winid, int winx, int winy, int winw, 
-                      int winh, WId embedid = 0);
+                      int winh, float video_playback_rate, WId embedid = 0);
     virtual void InitOSD(OSD *osd);
     virtual void SetVideoFrameRate(float);
 
@@ -282 +283 @@
     QSize   video_dim;        ///< Pixel dimensions of video buffer
     QSize   video_disp_dim;   ///< Pixel dimensions of video display area
     float   video_aspect;     ///< Physical aspect ratio of video
+    float   video_playback_rate;  ///< Playback frame rate of video
 
     /// Normally this is the same as videoAspect, but may not be
     /// if the user has toggled the aspect override mode.

mythtv/libs/libmythui/DisplayRes.cpp

@@ -40 +40 @@
     // Initialize GUI mode
     mode[GUI].Init();
     tW = tH = 0;
-    GetMythDB()->GetResolutionSetting("GuiVidMode", tW, tH);
+    GetMythDB()->GetResolutionSetting("GuiVidMode", tW, tH, tAspect, tRate);
     GetDisplaySize(tW_mm, tH_mm);
     GetMythDB()->GetResolutionSetting("DisplaySize", tW_mm, tH_mm);
-    mode[GUI] = DisplayResScreen(tW, tH, tW_mm, tH_mm, -1.0, 0);
+    mode[GUI] = DisplayResScreen(tW, tH, tW_mm, tH_mm, -1.0, tRate);
 
 
     // Initialize default VIDEO mode
@@ -89 +89 @@
 {
     tmode next_mode = VIDEO; // default VIDEO mode
     DisplayResScreen next = mode[next_mode];
+    next.AddRefreshRate(irate);
 
     // try to find video override mode
     uint key = DisplayResScreen::CalcKey(iwidth, iheight, irate);
@@ -133 +134 @@
     // need to change video mode?
     short target_rate = 0;
     DisplayResScreen::FindBestMatch(GetVideoModes(), next, target_rate);
-    bool chg = !(next == last) || !(last.RefreshRate() == target_rate);
+    // If GuiVidModeRefreshRate is 0, assume any refresh rate is good enough.
+    bool chg = !(next == last) || (next.RefreshRate() !=0 && !(last.RefreshRate() == target_rate)); 
 
     VERBOSE(VB_PLAYBACK, QString("Trying %1x%2 %3 Hz")
             .arg(next.Width()).arg(next.Height()).arg(target_rate));

mythtv/libs/libmythui/DisplayResScreen.cpp

@@ -90 +90 @@
         if (dsr[i].Width()==d.Width() && dsr[i].Height()==d.Height())
         {
             const vector<short>& rates = dsr[i].RefreshRates();
-            if (rates.size())
+            if (rates.size() && d.RefreshRate() != 0)
             {
-                vector<short>::const_iterator it =
-                    find(rates.begin(), rates.end(), d.RefreshRate());
-                target_rate = (it == rates.end()) ? *(--rates.end()) : *it;
-                return i;
+                for (uint j=0; j < rates.size(); ++j)
+                {
+                    // Multiple of target_rate will do
+                    if (rates[j] % d.RefreshRate() == 0)
+                    {
+                        target_rate = rates[j];
+                        return i;
+                    }
+                }
+                target_rate = rates[rates.size() - 1];
             }
+            return i;
         }
     }
     return -1;