Ticket #2830: scandiff-to-12768.patch

libs/libmythtv/siscan.cpp

@@ -1228 +1228 @@
                 IgnoreAudioOnlyMsg(friendlyName, pat->ProgramNumber(i));
                 continue;
             }
+#if 0
+            /* This only tells us that the pmt includes a ca stream */
             else if (ignoreEncryptedServices && (*vit)->IsEncrypted())
+#else
+            /* This tells us if the actual program data is encrypted */
+            else if (ignoreEncryptedServices && ! GetDTVSignalMonitor()->GetScanStreamData()->IsProgramDecrypted(pat->ProgramNumber(i)))
+#endif
             {
                 IgnoreEncryptedMsg(friendlyName, pat->ProgramNumber(i));
                 continue;

libs/libmythtv/mpeg/mpegstreamdata.cpp

@@ -1390 +1390 @@
     const uint pid = tspacket.PID();
     CryptInfo &info = _encryption_pid_to_info[pid];
 
+#if 0
     CryptStatus status = kEncUnknown;
+#else
+    CryptStatus status = info.status;
+#endif
 
     if (tspacket.ScramplingControl())
     {
@@ -1404 +1408 @@
     else
     {
         info.encrypted_packets = 0;
-        if (++info.decrypted_packets > info.decrypted_min)
+        if (++info.decrypted_packets >= info.decrypted_min)
             status = kEncDecrypted;
     }
 

libs/libmythtv/dtvsignalmonitor.cpp

@@ -312 +312 @@
     AddFlags(kDTVSigMon_PMTSeen);
 
     if (programNumber < 0)
+    {
+#if 1
+        if (pmt->IsEncrypted())
+        {
+        uint hasAV = 0;
+
+            for (uint i = 0; i < pmt->StreamCount(); i++)
+            {
+                hasAV += pmt->IsVideo(i, GetDTVChannel()->GetSIStandard());
+                hasAV += pmt->IsAudio(i, GetDTVChannel()->GetSIStandard());
+            }
+            if (hasAV)
+            {
+                VERBOSE(VB_SIPARSER, LOC + QString("Program %1 has ca info, test the program streams")
+                        .arg(pmt->ProgramNumber()));
+                GetStreamData()->TestDecryption(pmt);
+                AddFlags(kDTVSigMon_WaitForCrypt);
+                AddFlags(kDTVSigMon_PMTMatch);
+            }
+            else
+            {
+                VERBOSE(VB_SIPARSER, LOC + QString("Program %1 has no audio/video")
+                        .arg(pmt->ProgramNumber()));
+            }
+        }
+#endif
         return; // don't print error messages during channel scan.
+    }
 
     if (pmt->ProgramNumber() != (uint)programNumber)
     {
@@ -460 +487 @@
     AddFlags(kDTVSigMon_CryptSeen);
     if (!enc_status)
         AddFlags(kDTVSigMon_CryptMatch);
+
+    if (programNumber < 0)
+    {
+        RemoveFlags(kDTVSigMon_WaitForCrypt);
+    }
 }
 
 ATSCStreamData *DTVSignalMonitor::GetATSCStreamData()