external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity

GB: Correct the range of HEVC keyframe error. v6.0.49 (#3570)

Browse source 
---------

Co-authored-by: Haibo Chen <495810242@qq.com>
This commit is contained in:
chundonglinlin 2023-06-12 16:45:40 +08:00 committed by winlin
parent 1d878c2daa
commit 74079871f6
3 changed files with 4 additions and 3 deletions
Show stats 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 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)

4
trunk/src/app/srs_app_gb28181.cpp
View file

@ -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;
}

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

@ -9,6 +9,6 @@
#define VERSION_MAJOR 6
#define VERSION_MINOR 0
#define VERSION_REVISION 48
#define VERSION_REVISION 49
#endif