Ticket #10346: dvb_user_private_stream_type_0x80.patch

File dvb_user_private_stream_type_0x80.patch, 2.4 KB (added by klaas.de.waal@…, 12 years ago)

  • mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp 

    diff --git a/mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp b/mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp
index 233bac1..8fc83f2 100644
    a b bool MPEGStreamData::CreatePMTSingleProgram(const ProgramMapTable &pmt) 
    567567            type = StreamID::H264Video;
    568568        }
    569569
    570         bool is_video = StreamID::IsVideo(type);
     570        bool is_video = StreamID::IsVideo(type, _sistandard);
    571571        bool is_audio = StreamID::IsAudio(type);
    572572
    573573        if (is_audio)

  • mythtv/libs/libmythtv/mpeg/mpegtables.cpp 

    diff --git a/mythtv/libs/libmythtv/mpeg/mpegtables.cpp b/mythtv/libs/libmythtv/mpeg/mpegtables.cpp
index 2cdb5cf..891a22b 100644
    a b static const uint len_for_alloc[] = 
    4646uint StreamID::Normalize(uint stream_id, const desc_list_t &desc,
    4747                         const QString &sistandard)
    4848{
    49     if ((sistandard != "dvb") && (OpenCableVideo == stream_id))
     49    if ((sistandard == "opencable") && (OpenCableVideo == stream_id))
    5050        return MPEG2Video;
    5151
    5252    if (MPEGDescriptor::Find(desc, DescriptorID::ac3))

  • mythtv/libs/libmythtv/mpeg/mpegtables.h 

    diff --git a/mythtv/libs/libmythtv/mpeg/mpegtables.h b/mythtv/libs/libmythtv/mpeg/mpegtables.h
index 335c431..36f2d6f 100644
    a b class MTV_PUBLIC StreamID 
    155155        AnyVideo       = 0xFFFF0001,
    156156        AnyAudio       = 0xFFFF0002,
    157157    };
     158
    158159    /// Returns true iff video is an MPEG1/2/3, H264 or open cable video stream.
    159160    static bool IsVideo(uint type)
    160161    {
    … … class MTV_PUBLIC StreamID 
    165166                (StreamID::VC1Video   == type) ||
    166167                (StreamID::OpenCableVideo == type));
    167168    }
     169
     170    /// Returns true iff video is an MPEG1/2/3, H264 or open cable video stream.
     171    static bool IsVideo(uint type, const QString &sistandard)
     172    {
     173        return ((StreamID::MPEG1Video == type) ||
     174                (StreamID::MPEG2Video == type) ||
     175                (StreamID::MPEG4Video == type) ||
     176                (StreamID::H264Video  == type) ||
     177                (StreamID::VC1Video   == type) ||
     178                ((StreamID::OpenCableVideo == type) && (sistandard == "opencable")));
     179    }
     180
    168181    /// Returns true iff audio is MPEG1/2, AAC, AC3 or DTS audio stream.
    169182    static bool IsAudio(uint type)
    170183    {