Ticket #8549: 8549-v1.patch

File 8549-v1.patch, 4.6 KB (added by danielk, 11 years ago)
  • libs/libmythtv/firewiredevice.cpp

     
    329329
    330330void FirewireDevice::ProcessPATPacket(const TSPacket &tspacket)
    331331{
    332     if (!tspacket.TransportError() && !tspacket.ScramplingControl() &&
     332    if (!tspacket.TransportError() && !tspacket.Scrambled() &&
    333333        tspacket.HasPayload() && tspacket.PayloadStart() && !tspacket.PID())
    334334    {
    335335        PESPacket pes = PESPacket::View(tspacket);
  • libs/libmythtv/firewirerecorder.cpp

     
    127127    if (tspacket.TransportError())
    128128        return;
    129129
    130     if (tspacket.ScramplingControl())
     130    if (tspacket.Scrambled())
    131131        return;
    132132
    133133    if (tspacket.HasAdaptationField())
  • libs/libmythtv/mpeg/mpegstreamdata.cpp

     
    891891    if (!psip->IsCurrent()) // we don't cache the next table, for now
    892892        DONE_WITH_PES_PACKET();
    893893
    894     if (tspacket->ScramplingControl())
     894    if (tspacket->Scrambled())
    895895    { // scrambled! ATSC, DVB require tables not to be scrambled
    896896        VERBOSE(VB_RECORD,
    897897                "PSIP packet is scrambled, not ATSC/DVB compiant");
     
    975975    if (!ok)
    976976        return false;
    977977
    978     if (!tspacket.ScramplingControl() && tspacket.HasPayload())
     978    if (!tspacket.Scrambled() && tspacket.HasPayload())
    979979    {
    980980        if (IsVideoPID(tspacket.PID()))
    981981        {
     
    10041004            HandleTSTables(&tspacket);
    10051005        }
    10061006    }
    1007     else if (!tspacket.ScramplingControl() && IsWritingPID(tspacket.PID()))
     1007    else if (!tspacket.Scrambled() && IsWritingPID(tspacket.PID()))
    10081008    {
    10091009        // PCRPID and other streams we're writing may not have payload...
    10101010        for (uint j = 0; j < _ts_writing_listeners.size(); j++)
     
    17281728
    17291729    CryptStatus status = kEncUnknown;
    17301730
    1731     if (tspacket.ScramplingControl())
     1731    if (tspacket.Scrambled())
    17321732    {
    17331733        info.decrypted_packets = 0;
    17341734
  • libs/libmythtv/mpeg/tspacket.cpp

     
    3939    str.append("           payloadStart: %1\n").arg( PayloadStart() );
    4040    str.append("               priority: %1\n").arg( Priority() );
    4141    str.append("                    pid: %1\n").arg( PID() );
    42     str.append("              scrampled: %1\n").arg( ScramplingControl() );
     42    str.append("       scrambled (if>1): %1\n").arg( ScramblingControl() );
    4343    str.append(" adaptationFieldControl: %1\n").arg( AdaptationFieldControl() );
    4444    str.append("      continuityCounter: %1\n").arg( ContinuityCounter() );
    4545    return str;
  • libs/libmythtv/mpeg/tspacket.h

     
    6767        return ((_tsdata[1] << 8) + _tsdata[2]) & 0x1fff;
    6868    }
    6969    //3.0  2 bit transport_scrambling_control (00,01 OK; 10,11 scrambled)
    70     unsigned int ScramplingControl() const { return (_tsdata[3] >> 6) & 0x3; }
     70    unsigned int ScramblingControl() const { return (_tsdata[3] >> 6) & 0x3; }
    7171    //3.2  2 bit adaptation_field_control
    7272    //       (01-no adaptation field,payload only
    7373    //        10-adaptation field only,no payload
     
    8282    unsigned int ContinuityCounter() const { return _tsdata[3] & 0xf; }
    8383
    8484    // shortcuts
    85     bool Scrampled() const { return bool(_tsdata[3]&0x80); }
     85    bool Scrambled() const { return bool(_tsdata[3]&0x80); }
    8686    bool HasAdaptationField() const { return bool(_tsdata[3] & 0x20); }
    8787    bool HasPayload() const { return bool(_tsdata[3] & 0x10); }
    8888
  • libs/libmythtv/iptvrecorder.cpp

     
    209209    if (!_stream_data)
    210210        return;
    211211
    212     if (tspacket.TransportError() || tspacket.ScramplingControl())
     212    if (tspacket.TransportError() || tspacket.Scrambled())
    213213        return;
    214214
    215215    if (tspacket.HasAdaptationField())