Ticket #13292: 20190828_fixes30_LiveTVCodecChecks.patch

mythtv/libs/libmythtv/avformatdecoder.cpp

@@ -1111 +1111 @@
 
     if (livetv)
     {
+        QString livetvcodecchecks = gCoreContext->GetSetting("LiveTVCodecChecks", "Yes").toLower();
+
         // We try to open the file for up to 1.5 second using only buffer in memory
         MythTimer timer; timer.start();
 
@@ -1150 +1152 @@
 
             found = true;
 
-            for (uint i = 0; i < ic->nb_streams; i++)
+            // see if we need to check all streams
+            // sometimes we need to skip e.g. UK Freeview DVB-T/T2
+            // see mythtv trac ticket #13292
+
+            if (livetvcodecchecks != "no")
             {
-                if (!has_codec_parameters(ic->streams[i]))
+                for (uint i = 0; i < ic->nb_streams; i++)
                 {
-                    avformat_close_input(&ic);
-                    found = false;
-                    LOG(VB_PLAYBACK, LOG_DEBUG, LOC +
-                        QString("Invalid streams found in ram data after %1ms, retrying in 50ms")
-                        .arg(timer.elapsed()));
-                    usleep(50 * 1000);  // wait 50ms
-                    break;
+                    if (!has_codec_parameters(ic->streams[i]))
+                    {
+                        avformat_close_input(&ic);
+                        found = false;
+                        LOG(VB_PLAYBACK, LOG_DEBUG, LOC +
+                                QString("Invalid streams found in ram data after %1ms, retrying in 50ms")
+                                .arg(timer.elapsed()));
+                        usleep(50 * 1000); // wait 50ms
+                        break;
+                    }
                 }
             }
         }

mythtv/programs/mythtv-setup/backendsettings.cpp

@@ -250 +250 @@
     return gc;
 };
 
+static GlobalComboBoxSetting *LiveTVCodecChecks()
+{
+    GlobalComboBoxSetting *gc = new GlobalComboBoxSetting("LiveTVCodecChecks");
+    gc->setLabel(QObject::tr("Live TV Codec Checks"));
+    gc->addSelection("Yes");
+    gc->addSelection("No");
+    gc->setHelpText(QObject::tr("Usually set to Yes."
+                    "Sometimes DVB-T/T2 transmissions have additional codec types "
+                    "which can cause codec detection to fail "
+                    " For example UK Freeview (DVBT/T2), change to No."));
+    return gc;
+};
 static GlobalCheckBoxSetting *SaveTranscoding()
 {
     GlobalCheckBoxSetting *gc = new GlobalCheckBoxSetting("SaveTranscoding");
@@ -924 +936 @@
     locale->addChild(TVFormat());
     locale->addChild(VbiFormat());
     locale->addChild(FreqTable());
+    locale->addChild(LiveTVCodecChecks());
     addChild(locale);
 
     GroupSetting* group2 = new GroupSetting();