Ticket #8549: 8549-v1.patch

libs/libmythtv/firewiredevice.cpp

@@ -329 +329 @@
 
 void FirewireDevice::ProcessPATPacket(const TSPacket &tspacket)
 {
-    if (!tspacket.TransportError() && !tspacket.ScramplingControl() &&
+    if (!tspacket.TransportError() && !tspacket.Scrambled() &&
         tspacket.HasPayload() && tspacket.PayloadStart() && !tspacket.PID())
     {
         PESPacket pes = PESPacket::View(tspacket);

libs/libmythtv/firewirerecorder.cpp

@@ -127 +127 @@
     if (tspacket.TransportError())
         return;
 
-    if (tspacket.ScramplingControl())
+    if (tspacket.Scrambled())
         return;
 
     if (tspacket.HasAdaptationField())

libs/libmythtv/mpeg/mpegstreamdata.cpp

@@ -891 +891 @@
     if (!psip->IsCurrent()) // we don't cache the next table, for now
         DONE_WITH_PES_PACKET();
 
-    if (tspacket->ScramplingControl())
+    if (tspacket->Scrambled())
     { // scrambled! ATSC, DVB require tables not to be scrambled
         VERBOSE(VB_RECORD,
                 "PSIP packet is scrambled, not ATSC/DVB compiant");
@@ -975 +975 @@
     if (!ok)
         return false;
 
-    if (!tspacket.ScramplingControl() && tspacket.HasPayload())
+    if (!tspacket.Scrambled() && tspacket.HasPayload())
     {
         if (IsVideoPID(tspacket.PID()))
         {
@@ -1004 +1004 @@
             HandleTSTables(&tspacket);
         }
     }
-    else if (!tspacket.ScramplingControl() && IsWritingPID(tspacket.PID()))
+    else if (!tspacket.Scrambled() && IsWritingPID(tspacket.PID()))
     {
         // PCRPID and other streams we're writing may not have payload...
         for (uint j = 0; j < _ts_writing_listeners.size(); j++)
@@ -1728 +1728 @@
 
     CryptStatus status = kEncUnknown;
 
-    if (tspacket.ScramplingControl())
+    if (tspacket.Scrambled())
     {
         info.decrypted_packets = 0;
 

libs/libmythtv/mpeg/tspacket.cpp

@@ -39 +39 @@
     str.append("           payloadStart: %1\n").arg( PayloadStart() );
     str.append("               priority: %1\n").arg( Priority() );
     str.append("                    pid: %1\n").arg( PID() );
-    str.append("              scrampled: %1\n").arg( ScramplingControl() );
+    str.append("       scrambled (if>1): %1\n").arg( ScramblingControl() );
     str.append(" adaptationFieldControl: %1\n").arg( AdaptationFieldControl() );
     str.append("      continuityCounter: %1\n").arg( ContinuityCounter() );
     return str;

libs/libmythtv/mpeg/tspacket.h

@@ -67 +67 @@
         return ((_tsdata[1] << 8) + _tsdata[2]) & 0x1fff;
     }
     //3.0  2 bit transport_scrambling_control (00,01 OK; 10,11 scrambled)
-    unsigned int ScramplingControl() const { return (_tsdata[3] >> 6) & 0x3; }
+    unsigned int ScramblingControl() const { return (_tsdata[3] >> 6) & 0x3; }
     //3.2  2 bit adaptation_field_control
     //       (01-no adaptation field,payload only
     //        10-adaptation field only,no payload
@@ -82 +82 @@
     unsigned int ContinuityCounter() const { return _tsdata[3] & 0xf; }
 
     // shortcuts
-    bool Scrampled() const { return bool(_tsdata[3]&0x80); }
+    bool Scrambled() const { return bool(_tsdata[3]&0x80); }
     bool HasAdaptationField() const { return bool(_tsdata[3] & 0x20); }
     bool HasPayload() const { return bool(_tsdata[3] & 0x10); }
 

libs/libmythtv/iptvrecorder.cpp

@@ -209 +209 @@
     if (!_stream_data)
         return;
 
-    if (tspacket.TransportError() || tspacket.ScramplingControl())
+    if (tspacket.TransportError() || tspacket.Scrambled())
         return;
 
     if (tspacket.HasAdaptationField())