izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1170 from happyme531/frame-timestamp-assert-fix

Browse Source
This commit is contained in:
Yukino Song
2025-10-16 18:23:11 +08:00
committed by GitHub
parent bf47fca9e4 6d0eaa8ede
commit 08757dcd6c
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/video.cpp
View File

@@ -2013,7 +2013,12 @@ namespace video {
if (!requested_idr_frame || images->peek()) {
if (auto img = images->pop(max_frametime)) {
frame_timestamp = img->frame_timestamp;
auto time_diff = *frame_timestamp - encode_frame_timestamp;
if (!frame_timestamp) {
frame_timestamp = std::chrono::steady_clock::now();
}
auto current_timestamp = *frame_timestamp;
auto time_diff = current_timestamp - encode_frame_timestamp;
// If new frame comes in way too fast, just drop
if (time_diff < -frame_variation_threshold) {
@@ -2028,7 +2033,7 @@ namespace video {
if (time_diff < frame_variation_threshold) {
*frame_timestamp = encode_frame_timestamp;
} else {
encode_frame_timestamp = *frame_timestamp;
encode_frame_timestamp = current_timestamp;
}
encode_frame_timestamp += encode_frame_threshold;