Ticket #5866: hdpvr-livetv.patch

libs/libmythtv/mpegrecorder.cpp

@@ -1109 +1109 @@
 
     if (driver == "hdpvr")
     {
+        if (curRecording->recgroup == "LiveTV")
+        {
+            // Don't bother checking resolution, always use best bitrate
+            int maxbitrate = std::max(high_mpeg4peakbitrate,
+                                      high_mpeg4avgbitrate);
+            SetBitrate(high_mpeg4avgbitrate, maxbitrate, "LiveTV");
+        }
+
         int progNum = 1;
         MPEGStreamData *sd = new MPEGStreamData(progNum, true);
         sd->SetRecordingType(_recording_type);
@@ -1553 +1561 @@
     memset(&command, 0, sizeof(struct v4l2_encoder_cmd));
     command.cmd = V4L2_ENC_CMD_START;
 
-    if (driver == "hdpvr")
+    if (driver == "hdpvr" && curRecording->recgroup != "LiveTV")
         HandleResolutionChanges();
 
     VERBOSE(VB_RECORD, LOC + "StartEncoding");
@@ -1755 +1763 @@
     return false;
 }
 
+void MpegRecorder::SetBitrate(int bitrate, int maxbitrate,
+                              const QString & reason)
+{
+    if (maxbitrate == bitrate)
+    {
+        VERBOSE(VB_RECORD, LOC + QString("%1 bitrate %2 kbps CBR")
+                .arg(reason).arg(bitrate));
+    }
+    else
+    {
+        VERBOSE(VB_RECORD, LOC + QString("%1 bitrate %2/%3 kbps VBR")
+                .arg(reason).arg(bitrate).arg(maxbitrate));
+    }
+
+    vector<struct v4l2_ext_control> ext_ctrls;
+    add_ext_ctrl(ext_ctrls, V4L2_CID_MPEG_VIDEO_BITRATE_MODE,
+                 (maxbitrate == bitrate) ?
+                 V4L2_MPEG_VIDEO_BITRATE_MODE_CBR :
+                 V4L2_MPEG_VIDEO_BITRATE_MODE_VBR);
+
+    add_ext_ctrl(ext_ctrls, V4L2_CID_MPEG_VIDEO_BITRATE,
+                 bitrate * 1000);
+
+    add_ext_ctrl(ext_ctrls, V4L2_CID_MPEG_VIDEO_BITRATE_PEAK,
+                 maxbitrate * 1000);
+
+    set_ctrls(readfd, ext_ctrls);
+}
+
 void MpegRecorder::HandleResolutionChanges(void)
 {
     VERBOSE(VB_RECORD, LOC + "Checking Resolution");
@@ -1819 +1856 @@
                     .arg(old_avg).arg(old_max));
         }
 
-        if (maxbitrate == bitrate)
-        {
-            VERBOSE(VB_RECORD, LOC + QString("New bitrate %1 kbps CBR")
-                    .arg(bitrate));
-        }
-        else
-        {
-            VERBOSE(VB_RECORD, LOC + QString("New bitrate %1/%2 kbps VBR")
-                    .arg(bitrate).arg(maxbitrate));
-        }
-
-        vector<struct v4l2_ext_control> ext_ctrls;
-        add_ext_ctrl(ext_ctrls, V4L2_CID_MPEG_VIDEO_BITRATE_MODE,
-                     (maxbitrate == bitrate) ?
-                     V4L2_MPEG_VIDEO_BITRATE_MODE_CBR :
-                     V4L2_MPEG_VIDEO_BITRATE_MODE_VBR);
-
-        add_ext_ctrl(ext_ctrls, V4L2_CID_MPEG_VIDEO_BITRATE,
-                     bitrate * 1000);
-
-        add_ext_ctrl(ext_ctrls, V4L2_CID_MPEG_VIDEO_BITRATE_PEAK,
-                     maxbitrate * 1000);
-
-        set_ctrls(readfd, ext_ctrls);
-
+        SetBitrate(bitrate, maxbitrate, "New");
     }
 }
+

libs/libmythtv/mpegrecorder.h

@@ -87 +87 @@
     void ResetForNewFile(void);
 
     bool WaitFor_HDPVR(void);
+    void SetBitrate(int bitrate, int maxbitrate, const QString & reason);
     void HandleResolutionChanges(void);
 
     inline bool CheckCC(uint pid, uint cc);