external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into merge/develop

Browse source
This commit is contained in:
winlin 2021-10-13 19:56:58 +08:00
commit 761820e0ec
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/srt/ts_demux.cpp
View file

@ -126,6 +126,7 @@ int ts_demux::decode_unit(unsigned char* data_p, std::string key_path, TS_DATA_C
} }
} }
npos += sizeof(field_p->_adaptation_field_length) + field_p->_adaptation_field_length; npos += sizeof(field_p->_adaptation_field_length) + field_p->_adaptation_field_length;
pos = npos;//must consider the 'stuffing_byte' in adaptation field
} }
if(ts_header_info._adaptation_field_control == 1 if(ts_header_info._adaptation_field_control == 1
@ -396,7 +397,6 @@ int ts_demux::pes_parse(unsigned char* p, size_t npos,
&& stream_id != 248//ITU-T Rec. H.222.1 type E stream 1111 1000 && stream_id != 248//ITU-T Rec. H.222.1 type E stream 1111 1000
) )
{ {
assert(0x80 == p[pos]);
//skip 2bits//'10' 2 bslbf //skip 2bits//'10' 2 bslbf
int PES_scrambling_control = (p[pos]&30)>>4; //PES_scrambling_control 2 bslbf int PES_scrambling_control = (p[pos]&30)>>4; //PES_scrambling_control 2 bslbf
(void)PES_scrambling_control; (void)PES_scrambling_control;