R3944Realms/srs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DVR: Fix HEVC mp4 recording error. v7.0.135 (#4604) (#4604)

Browse Source 
When recording HEVC streams to MP4, DVR fails with error "doesn't
support
hvcC change" (ERROR_MP4_HVCC_CHANGE).

The root cause is in video_avc_demux(): the SrsVideoFrame object is
reused
across frames, and its initialize() method does not reset
avc_packet_type.
When a sequence header is processed, avc_packet_type is set to 0
(SrsVideoAvcFrameTraitSequenceHeader). When the next video info frame
arrives (which only appears in HEVC streams), the function returns early
without assigning video->avc_packet_type, so it retains the value 0 from
the previous sequence header frame.

When DVR processes this video info frame, it checks avc_packet_type and
incorrectly identifies it as a sequence header. Since the real HEVC
sequence
header was already recorded, DVR returns the "hvcC change" error.

The fix assigns video->avc_packet_type = packet_type before returning
early for VideoInfoFrame. After the fix, avc_packet_type is correctly
set
to the actual packet type (1 or 3 for coded frames), so DVR correctly
identifies it as NOT a sequence header.

---------

Co-authored-by: OSSRS-AI <winlinam@gmail.com>
This commit is contained in:
Jacob Su 2025-12-07 08:49:13 +08:00 committed by GitHub
parent 1560077cbc
commit 6a86d9e805
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 89 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/doc/CHANGELOG.md
View File

@ -7,6 +7,7 @@ The changelog for SRS.
<a name="v7-changes"></a>
## SRS 7.0 Changelog
* v7.0, 2025-12-06, Merge [#4604](https://github.com/ossrs/srs/pull/4604): DVR: Fix HEVC mp4 recording error. v7.0.135 (#4604)
* v7.0, 2025-12-06, SRT: Fix peer_idle_timeout not applied to publishers and players. v7.0.134 (#4600)
* v7.0, 2025-12-04, SRT: Enable tlpktdrop by default to prevent 100% CPU usage. v7.0.133 (#4587)
* v7.0, 2025-12-03, AI: WebRTC: Fix audio-only WHIP publish without SSRC. v7.0.132 (#4570)
@ -148,6 +149,7 @@ The changelog for SRS.
<a name="v6-changes"></a>
## SRS 6.0 Changelog
* v6.0, 2025-12-06, Merge [#4605](https://github.com/ossrs/srs/pull/4605): DVR: Fix HEVC mp4 recording error. v6.0.185 (#4605)
* v6.0, 2025-12-03, Merge [#4588](https://github.com/ossrs/srs/pull/4588): RTMP: Ignore FMLE start packet after flash publish. v6.0.184 (#4588)
* v6.0, 2025-10-17, Merge [#4534](https://github.com/ossrs/srs/pull/4534): HLS: Fix a iterator bug in hls_ctx cleanup function. v6.0.182 (#4534)
* v6.0, 2025-10-14, Disable sanitizer by default to fix memory leak. (#4364) v6.0.181

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 182
#define VERSION_REVISION 185
#endif

2
trunk/src/core/srs_core_version7.hpp
View File

@ -9,6 +9,6 @@
#define VERSION_MAJOR 7
#define VERSION_MINOR 0
#define VERSION_REVISION 134
#define VERSION_REVISION 135
#endif

6
trunk/src/kernel/srs_kernel_packet.cpp
View File

@ -643,6 +643,12 @@ srs_error_t SrsFormat::video_avc_demux(SrsBuffer *stream, int64_t timestamp)
// ignore info frame without error,
// @see https://github.com/ossrs/srs/issues/288#issuecomment-69863909
if (video_->frame_type_ == SrsVideoAvcFrameTypeVideoInfoFrame) {
// For non-ext header Video Info Frame, try to read packet type from stream if available
if (!is_ext_header && stream->left() > 0) {
packet_type = (SrsVideoAvcFrameTrait)stream->read_1bytes();
}
video_->avc_packet_type_ = packet_type;
srs_warn("avc ignore the info frame");
return err;
}

79
trunk/src/utest/srs_utest_manual_kernel.cpp
View File

@ -4326,6 +4326,85 @@ VOID TEST(KernelCodecTest, VideoFrameH264_BFrameDetection_EdgeCases)
}
}
VOID TEST(KernelCodecTest, VideoFrameVideoInfoFrameHandling)
{
srs_error_t err;
// Test both AVC and HEVC video codecs
SrsFormat format;
HELPER_EXPECT_SUCCESS(format.initialize());
// Test 1: AVC Video Info Frame handling with additional NALU data
{
// AVC Video Info Frame
// Frame type 5 (Video Info Frame) | Codec ID 7 (AVC)
uint8_t avc_video_info_frame[] = {
0x57, // Frame type 5 (Video Info Frame) | Codec ID 7 (AVC)
0x01, // AVC packet type 1 (NALU)
0x00, 0x00, 0x00, // Composition time 0
// NALU data (mock IDR frame)
0x00, 0x00, 0x00, 0x01, // NAL unit start code
0x65, 0x88, 0x84, 0x00 // IDR NALU (mock data)
};
// Call on_video with AVC video info frame - should not return error
err = format.on_video(2000, (char *)avc_video_info_frame, sizeof(avc_video_info_frame));
EXPECT_TRUE(err == NULL) << "Failed to handle AVC Video Info Frame with NALU data";
// Verify avc_packet_type_ is correctly set to SrsVideoAvcFrameTraitNALU (1)
EXPECT_TRUE(format.video_ != NULL) << "Video packet should be initialized after on_video call";
EXPECT_EQ(format.video_->avc_packet_type_, SrsVideoAvcFrameTraitNALU)
<< "Expected avc_packet_type_ to be SrsVideoAvcFrameTraitNALU (1), got "
<< format.video_->avc_packet_type_;
srs_freep(err);
}
// Test 2: HEVC Video Info Frame handling with coded frames
{
// HEVC Video Info Frame (enhanced RTMP format)
uint8_t hevc_video_info_frame[] = {
0xD1, // Frame type 5 (Video Info Frame) | Extended header flag (0x80) | Packet type 1
0x68, 0x76, 0x63, 0x31, // 'hvc1' FourCC (HEVC)
0x00, 0x00, 0x00 // Composition time 0 (for coded frames packet type)
};
// Call on_video with HEVC video info frame - should not return error
err = format.on_video(4000, (char *)hevc_video_info_frame, sizeof(hevc_video_info_frame));
EXPECT_TRUE(err == NULL) << "Failed to handle HEVC Video Info Frame with coded frames";
// Verify avc_packet_type_ is correctly set to SrsVideoHEVCFrameTraitPacketTypeCodedFrames (1)
EXPECT_TRUE(format.video_ != NULL) << "Video packet should be initialized after on_video call";
EXPECT_EQ(format.video_->avc_packet_type_, SrsVideoHEVCFrameTraitPacketTypeCodedFrames)
<< "Expected avc_packet_type_ to be SrsVideoHEVCFrameTraitPacketTypeCodedFrames (1), got "
<< format.video_->avc_packet_type_;
srs_freep(err);
}
// Test 3: HEVC Video Info Frame handling with coded frames X (optimized zero composition time)
{
// HEVC Video Info Frame with coded frames X (optimized)
uint8_t hevc_video_info_frame[] = {
0xD3, // Frame type 5 (Video Info Frame) | Extended header flag (0x80) | Packet type 3 (coded frames X)
0x68, 0x76, 0x63, 0x31 // 'hvc1' FourCC (HEVC)
// No composition time field for coded frames X (implied to be zero)
};
// Call on_video with HEVC video info frame - should not return error
err = format.on_video(7000, (char *)hevc_video_info_frame, sizeof(hevc_video_info_frame));
EXPECT_TRUE(err == NULL) << "Failed to handle HEVC Video Info Frame with coded frames X";
// Verify avc_packet_type_ is correctly set to SrsVideoHEVCFrameTraitPacketTypeCodedFramesX (3)
EXPECT_TRUE(format.video_ != NULL) << "Video packet should be initialized after on_video call";
EXPECT_EQ(format.video_->avc_packet_type_, SrsVideoHEVCFrameTraitPacketTypeCodedFramesX)
<< "Expected avc_packet_type_ to be SrsVideoHEVCFrameTraitPacketTypeCodedFramesX (3), got "
<< format.video_->avc_packet_type_;
srs_freep(err);
}
}
VOID TEST(KernelCodecTest, VideoFrameH265)
{
srs_error_t err;