Ticket #2830: scandiff-to-12768.patch
File scandiff-to-12768.patch, 2.9 KB (added by , 17 years ago) |
---|
-
libs/libmythtv/siscan.cpp
1228 1228 IgnoreAudioOnlyMsg(friendlyName, pat->ProgramNumber(i)); 1229 1229 continue; 1230 1230 } 1231 #if 0 1232 /* This only tells us that the pmt includes a ca stream */ 1231 1233 else if (ignoreEncryptedServices && (*vit)->IsEncrypted()) 1234 #else 1235 /* This tells us if the actual program data is encrypted */ 1236 else if (ignoreEncryptedServices && ! GetDTVSignalMonitor()->GetScanStreamData()->IsProgramDecrypted(pat->ProgramNumber(i))) 1237 #endif 1232 1238 { 1233 1239 IgnoreEncryptedMsg(friendlyName, pat->ProgramNumber(i)); 1234 1240 continue; -
libs/libmythtv/mpeg/mpegstreamdata.cpp
1390 1390 const uint pid = tspacket.PID(); 1391 1391 CryptInfo &info = _encryption_pid_to_info[pid]; 1392 1392 1393 #if 0 1393 1394 CryptStatus status = kEncUnknown; 1395 #else 1396 CryptStatus status = info.status; 1397 #endif 1394 1398 1395 1399 if (tspacket.ScramplingControl()) 1396 1400 { … … 1404 1408 else 1405 1409 { 1406 1410 info.encrypted_packets = 0; 1407 if (++info.decrypted_packets > info.decrypted_min)1411 if (++info.decrypted_packets >= info.decrypted_min) 1408 1412 status = kEncDecrypted; 1409 1413 } 1410 1414 -
libs/libmythtv/dtvsignalmonitor.cpp
312 312 AddFlags(kDTVSigMon_PMTSeen); 313 313 314 314 if (programNumber < 0) 315 { 316 #if 1 317 if (pmt->IsEncrypted()) 318 { 319 uint hasAV = 0; 320 321 for (uint i = 0; i < pmt->StreamCount(); i++) 322 { 323 hasAV += pmt->IsVideo(i, GetDTVChannel()->GetSIStandard()); 324 hasAV += pmt->IsAudio(i, GetDTVChannel()->GetSIStandard()); 325 } 326 if (hasAV) 327 { 328 VERBOSE(VB_SIPARSER, LOC + QString("Program %1 has ca info, test the program streams") 329 .arg(pmt->ProgramNumber())); 330 GetStreamData()->TestDecryption(pmt); 331 AddFlags(kDTVSigMon_WaitForCrypt); 332 AddFlags(kDTVSigMon_PMTMatch); 333 } 334 else 335 { 336 VERBOSE(VB_SIPARSER, LOC + QString("Program %1 has no audio/video") 337 .arg(pmt->ProgramNumber())); 338 } 339 } 340 #endif 315 341 return; // don't print error messages during channel scan. 342 } 316 343 317 344 if (pmt->ProgramNumber() != (uint)programNumber) 318 345 { … … 460 487 AddFlags(kDTVSigMon_CryptSeen); 461 488 if (!enc_status) 462 489 AddFlags(kDTVSigMon_CryptMatch); 490 491 if (programNumber < 0) 492 { 493 RemoveFlags(kDTVSigMon_WaitForCrypt); 494 } 463 495 } 464 496 465 497 ATSCStreamData *DTVSignalMonitor::GetATSCStreamData()