Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pes error when mpegts demux in srt #2671

Merged
merged 2 commits into from
Oct 13, 2021
Merged

Pes error when mpegts demux in srt #2671

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a3d279
solve mpegts demux bug
runner365 Oct 13, 2021
f25ca7e
solve pes error when mpegts demux
runner365 Oct 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion trunk/src/srt/ts_demux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
pos = npos;//must consider the 'stuffing_byte' in adaptation field
}

if(ts_header_info._adaptation_field_control == 1
Expand Down Expand Up @@ -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
)
{
assert(0x80 == p[pos]);
//skip 2bits//'10' 2 bslbf
int PES_scrambling_control = (p[pos]&30)>>4; //PES_scrambling_control 2 bslbf
(void)PES_scrambling_control;
Expand Down