From d1bd6993c559857b18d4a1c7c91d60ca18f7afab Mon Sep 17 00:00:00 2001 From: OtterWa Date: Mon, 29 May 2017 12:11:42 +0800 Subject: [PATCH 1/2] fix ts decode (#899) --- trunk/src/kernel/srs_kernel_ts.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trunk/src/kernel/srs_kernel_ts.cpp b/trunk/src/kernel/srs_kernel_ts.cpp index 3aefb898da..fad50ea2ba 100644 --- a/trunk/src/kernel/srs_kernel_ts.cpp +++ b/trunk/src/kernel/srs_kernel_ts.cpp @@ -1670,7 +1670,7 @@ int SrsTsPayloadPES::decode(SrsStream* stream, SrsTsMessage** ppmsg) // (1+x)B if (PES_extension_flag_2) { PES_extension_field_length = stream->read_1bytes(); - PES_extension_field_length &= 0x07; + PES_extension_field_length &= 0x7F; if (PES_extension_field_length > 0) { if (!stream->require(PES_extension_field_length)) { @@ -2462,7 +2462,7 @@ int SrsTsPayloadPMTESInfo::decode(SrsStream* stream) elementary_PID = epv & 0x1FFF; int16_t eilv = stream->read_2bytes(); - const1_value1 = (epv >> 12) & 0x0f; + const1_value1 = (eilv >> 12) & 0x0f; ES_info_length = eilv & 0x0FFF; if (ES_info_length > 0) { From e8cb2e6be4c8f84639592360587b7b275242f6c8 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 29 May 2017 12:15:04 +0800 Subject: [PATCH 2/2] Merge #899 to fix #893, ts PES ext length. 2.0.243 --- README.md | 3 +++ trunk/src/core/srs_core.hpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9f5733021c..f619aaf965 100755 --- a/README.md +++ b/README.md @@ -337,6 +337,7 @@ Remark: ## History +* v2.0, 2017-05-29, Merge [#899][bug #899] to fix [#893][bug #893], ts PES ext length. 2.0.243 * v2.0, 2017-05-01, Fix [#865][bug #865], shouldn't remove ts/m3u8 when hls_dispose disabled. 2.0.242 * v2.0, 2017-04-30, Fix [#636][bug #636], FD leak for requesting empty HTTP stream. 2.0.241 * v2.0, 2017-04-23, Fix [#851][bug #851], HTTP API support number of video frames for FPS. 2.0.240 @@ -1297,6 +1298,8 @@ Winlin [bug #851]: https://github.com/ossrs/srs/issues/851 [bug #636]: https://github.com/ossrs/srs/issues/636 [bug #865]: https://github.com/ossrs/srs/issues/865 +[bug #893]: https://github.com/ossrs/srs/issues/893 +[bug #899]: https://github.com/ossrs/srs/issues/899 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx [exo #828]: https://github.com/google/ExoPlayer/pull/828 diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 0c6fc2b92d..1ffc55580e 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // current release version #define VERSION_MAJOR 2 #define VERSION_MINOR 0 -#define VERSION_REVISION 242 +#define VERSION_REVISION 243 // generated by configure, only macros. #include