Ticket #6263: hdpvr_audio_codec_selection-v1.1.diff

libs/libmythtv/mpegrecorder.cpp

@@ -285 +285 @@
                     QString("%1 is invalid").arg(value));
         }
     }
+    else if (opt == "audiocodec")
+    {
+        if (value == "AAC Hardware Encoder")
+            audtype = 4;
+        else if (value == "AC3 Hardware Encoder")
+            audtype = 5;
+    }
     else
     {
         RecorderBase::SetOption(opt, value);
@@ -340 +347 @@
     SetIntOption(profile, "medium_mpeg4peakbitrate");
     SetIntOption(profile, "high_mpeg4avgbitrate");
     SetIntOption(profile, "high_mpeg4peakbitrate");
+
+    SetStrOption(profile, "audiocodec");
 }
 
 // same as the base class, it just doesn't complain if an option is missing
@@ -829 +838 @@
     {
         maxbitrate = high_mpeg4peakbitrate;
         bitrate    = high_mpeg4avgbitrate;
+
+        // query supported audio codecs
+        struct v4l2_queryctrl qctrl;
+        qctrl.id = V4L2_CID_MPEG_AUDIO_ENCODING;
+
+        if (ioctl(chanfd, VIDIOC_QUERYCTRL, &qctrl) < 0)
+        {
+            VERBOSE(VB_IMPORTANT, LOC_WARN +
+                    "Unable to get supported audio codecs." + ENO);
+        }
+        else
+        {
+            uint audio_encoding = max(min(audtype-1, qctrl.maximum), qctrl.minimum);
+            add_ext_ctrl(ext_ctrls, V4L2_CID_MPEG_AUDIO_ENCODING,
+                         audio_encoding);
+        }
     }
     maxbitrate = std::max(maxbitrate, bitrate);
 

libs/libmythtv/recordingprofile.cpp

@@ -424 +424 @@
         params->addChild(new SampleRate(parent));
         params->addChild(new BTTVVolume(parent));
         addTarget("Uncompressed", params);
+
+        params = new VerticalConfigurationGroup(false);
+        params->setLabel("AC3 Hardware Encoder");
+        addTarget("AC3 Hardware Encoder", params);
+
+        params = new VerticalConfigurationGroup(false);
+        params->setLabel("AAC Hardware Encoder");
+        addTarget("AAC Hardware Encoder", params);
+
     };
 
     void selectCodecs(QString groupType)
@@ -432 +441 @@
         {
             if (groupType == "MPEG")
                codecName->addSelection("MPEG-2 Hardware Encoder");
+            else if (groupType == "HDPVR")
+            {
+                codecName->addSelection("AC3 Hardware Encoder");
+                codecName->addSelection("AAC Hardware Encoder");
+            }
             else
             {
                 // V4L, TRANSCODE (and any undefined types)
@@ -1260 +1274 @@
         videoSettings = new VideoCompressionSettings(*this, profileName);
         addChild(videoSettings);
 
-        if (type.toUpper() != "HDPVR")
-        {
-            audioSettings = new AudioCompressionSettings(*this, profileName);
-            addChild(audioSettings);
-        }
+        audioSettings = new AudioCompressionSettings(*this, profileName);
+        addChild(audioSettings);
 
         if (!profileName.isEmpty() && profileName.left(11) == "Transcoders")
         {