openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Silence audio data if repeating last frame in FFmpegReader (to prevent audio glitch for files with invalid durations)

Browse Source
This commit is contained in:
Jonathan Thomas
2022-11-23 13:56:57 -06:00
parent 2defcc58d0
commit 1bd1fdcb2a
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/FFmpegReader.cpp
View File

@@ -1057,13 +1057,26 @@ std::shared_ptr<Frame> FFmpegReader::ReadStream(int64_t requested_frame) {
// Check if largest frame is still cached
frame = final_cache.GetFrame(largest_frame_processed);
int samples_in_frame = Frame::GetSamplesPerFrame(requested_frame, info.fps,
info.sample_rate, info.channels);
if (frame) {
// return the largest processed frame (assuming it was the last in the video file)
// Copy and return the largest processed frame (assuming it was the last in the video file)
std::shared_ptr<Frame> f = CreateFrame(largest_frame_processed);
// Use solid color (if no image data found)
if (!frame->has_image_data) {
// Use solid black frame if no image data available
f->AddColor(info.width, info.height, "#000");
}
// Silence audio data (if any), since we are repeating the last frame
frame->AddAudioSilence(samples_in_frame);
return frame;
} else {
// The largest processed frame is no longer in cache, return a blank frame
std::shared_ptr<Frame> f = CreateFrame(largest_frame_processed);
f->AddColor(info.width, info.height, "#000");
f->AddAudioSilence(samples_in_frame);
return f;
}
}