From 74079871f6bd896cc15f5e2463c7fb6679265a11 Mon Sep 17 00:00:00 2001 From: chundonglinlin Date: Mon, 12 Jun 2023 16:45:40 +0800 Subject: [PATCH] GB: Correct the range of HEVC keyframe error. v6.0.49 (#3570) --------- Co-authored-by: Haibo Chen <495810242@qq.com> --- trunk/doc/CHANGELOG.md | 1 + trunk/src/app/srs_app_gb28181.cpp | 4 ++-- trunk/src/core/srs_core_version6.hpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 99770a6b3..92deff039 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -8,6 +8,7 @@ The changelog for SRS. ## SRS 6.0 Changelog +* v6.0, 2023-06-12, Merge [#3570](https://github.com/ossrs/srs/pull/3570): GB: Correct the range of keyframe error for compile warning. v6.0.49 (#3570) * v6.0, 2023-06-05, Fix command injection in demonstration api-server for HTTP callback. v6.0.48 * v6.0, 2023-06-05, Merge [#3565](https://github.com/ossrs/srs/pull/3565): DTLS: Use bio callback to get fragment packet. v6.0.47 (#3565) * v6.0, 2023-05-29, Merge [#3513](https://github.com/ossrs/srs/pull/3513): SSL: Fix SSL_get_error get the error of other coroutine. v6.0.46 (#3513) diff --git a/trunk/src/app/srs_app_gb28181.cpp b/trunk/src/app/srs_app_gb28181.cpp index 71180f661..9e1df764c 100644 --- a/trunk/src/app/srs_app_gb28181.cpp +++ b/trunk/src/app/srs_app_gb28181.cpp @@ -1946,9 +1946,9 @@ srs_error_t SrsGbMuxer::write_h265_ipb_frame(char* frame, int frame_size, uint32 SrsHevcNaluType nt = SrsHevcNaluTypeParse(frame[0]); // F.3.29 intra random access point (IRAP) picture - // ITU-T-H.265-2021.pdf, page 28. + // ITU-T-H.265-2021.pdf, page 462. SrsVideoAvcFrameType frame_type = SrsVideoAvcFrameTypeInterFrame; - if (nt >= SrsHevcNaluType_CODED_SLICE_BLA || nt <= SrsHevcNaluType_RESERVED_23) { + if (nt >= SrsHevcNaluType_CODED_SLICE_BLA && nt <= SrsHevcNaluType_RESERVED_23) { frame_type = SrsVideoAvcFrameTypeKeyFrame; } diff --git a/trunk/src/core/srs_core_version6.hpp b/trunk/src/core/srs_core_version6.hpp index 4d2de5ddb..0ca80c5d7 100644 --- a/trunk/src/core/srs_core_version6.hpp +++ b/trunk/src/core/srs_core_version6.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 6 #define VERSION_MINOR 0 -#define VERSION_REVISION 48 +#define VERSION_REVISION 49 #endif