external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-12 19:31:53 +00:00
Code Issues Releases Wiki Activity

issue #3993: fix av off sync for mp4 dvr.

Browse source
This commit is contained in:
Jacob Su 2024-11-12 16:45:34 +08:00
parent 7951bf3bd6
commit 8a9ab1147c
2 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
trunk/src/kernel/srs_kernel_mp4.cpp
View file

@ -4820,6 +4820,10 @@ uint32_t SrsMp4Sample::pts_ms()
SrsMp4SampleManager::SrsMp4SampleManager() SrsMp4SampleManager::SrsMp4SampleManager()
{ {
video_start_dts_ = 0;
audio_start_dts_ = 0;
has_first_video_ = false;
has_first_audio_ = false;
} }
SrsMp4SampleManager::~SrsMp4SampleManager() SrsMp4SampleManager::~SrsMp4SampleManager()
@ -4900,6 +4904,16 @@ SrsMp4Sample* SrsMp4SampleManager::at(uint32_t index)
void SrsMp4SampleManager::append(SrsMp4Sample* sample) void SrsMp4SampleManager::append(SrsMp4Sample* sample)
{ {
if (!has_first_audio_ && sample->type == SrsFrameTypeAudio) {
has_first_audio_ = true;
audio_start_dts_ = sample->dts;
}
if (!has_first_video_ && sample->type == SrsFrameTypeVideo) {
has_first_video_ = true;
video_start_dts_ = sample->dts;
}
samples.push_back(sample); samples.push_back(sample);
} }
@ -5077,6 +5091,11 @@ srs_error_t SrsMp4SampleManager::write_track(SrsFrameType track,
} else { } else {
// The first sample always in the STTS table. // The first sample always in the STTS table.
stts_entry.sample_count++; stts_entry.sample_count++;
if (track == SrsFrameTypeVideo) {
stts_entry.sample_delta = video_start_dts_ > audio_start_dts_ ? video_start_dts_ - audio_start_dts_ : 0;
} else if (track == SrsFrameTypeAudio) {
stts_entry.sample_delta = audio_start_dts_ > video_start_dts_ ? audio_start_dts_ - video_start_dts_ : 0;
}
} }
} }

5
trunk/src/kernel/srs_kernel_mp4.hpp
View file

@ -1914,6 +1914,11 @@ public:
// The keyframe is specified by stss. // The keyframe is specified by stss.
class SrsMp4SampleManager class SrsMp4SampleManager
{ {
private:
uint64_t video_start_dts_;
uint64_t audio_start_dts_;
bool has_first_video_;
bool has_first_audio_;
public: public:
std::vector<SrsMp4Sample*> samples; std::vector<SrsMp4Sample*> samples;
public: public: