external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

SRT: Pes error when mpegts demux in srt. v4.0.178

Browse source 
* solve mpegts demux bug

* solve pes error when mpegts demux
This commit is contained in:
Alex.CR 2021-10-13 19:51:05 +08:00 • committed by winlin
parent 18a155bf31
commit 1649386ed5
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/doc/CHANGELOG.md
View file

@ -8,6 +8,7 @@ The changelog for SRS.
## SRS 4.0 Changelog ## SRS 4.0 Changelog
* v4.0, 2021-10-13, Merge [#2671](https://github.com/ossrs/srs/pull/2671): SRT: Pes error when mpegts demux in srt. v4.0.178
* v4.0, 2021-10-12, Merge [#2550](https://github.com/ossrs/srs/pull/2550): API use publish params. v4.0.177 * v4.0, 2021-10-12, Merge [#2550](https://github.com/ossrs/srs/pull/2550): API use publish params. v4.0.177
* v4.0, 2021-10-12, Merge [#2549](https://github.com/ossrs/srs/pull/2549): Fix duration issue for HLS on_hls. v4.0.176 * v4.0, 2021-10-12, Merge [#2549](https://github.com/ossrs/srs/pull/2549): Fix duration issue for HLS on_hls. v4.0.176
* v4.0, 2021-10-11, Fix [#1641](https://github.com/ossrs/srs/issues/1641), HLS/RTC picture corrupt for SPS/PPS lost. v4.0.175 * v4.0, 2021-10-11, Fix [#1641](https://github.com/ossrs/srs/issues/1641), HLS/RTC picture corrupt for SPS/PPS lost. v4.0.175

2
trunk/src/core/srs_core_version4.hpp
View file

@ -9,6 +9,6 @@
#define VERSION_MAJOR 4 #define VERSION_MAJOR 4
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 177 #define VERSION_REVISION 178
#endif #endif

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;