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

Fixing whitespace

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

26
src/FFmpegReader.cpp
View File

@@ -1057,26 +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);
int samples_in_frame = Frame::GetSamplesPerFrame(requested_frame, info.fps,
info.sample_rate, info.channels);
if (frame) {
// 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);
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);
// 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);
f->AddAudioSilence(samples_in_frame);
return f;
}
}
@@ -1787,8 +1787,8 @@ void FFmpegReader::Seek(int64_t requested_frame) {
if (requested_frame > info.video_length)
requested_frame = info.video_length;
if (requested_frame > largest_frame_processed && packet_status.end_of_file) {
// Not possible to search past largest_frame once EOF is reached (no more packets)
return;
// Not possible to search past largest_frame once EOF is reached (no more packets)
return;
}
// Debug output