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 another issue where larger FPS files are incorrectly changed to a different FPS

Browse Source
This commit is contained in:
Jonathan Thomas
2018-08-02 00:40:44 -05:00
parent 93c1e2eb49
commit 435932f415
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/FFmpegReader.cpp
View File

@@ -421,18 +421,6 @@ void FFmpegReader::UpdateVideoInfo()
// Calculate FPS, duration, video bit rate, and video length manually
// by scanning through all the video stream packets
CheckFPS();
// If still an invalid FPS detected, just default to 24 FPS
// Set a few important default video settings (so audio can be divided into frames)
if (info.fps.ToFloat() > 240.0f || (info.fps.num == 0 || info.fps.den == 0)) {
info.fps.num = 24;
info.fps.den = 1;
info.video_timebase.num = 1;
info.video_timebase.den = 24;
// Calculate number of frames
info.video_length = round(info.duration * info.fps.ToDouble());
}
}
// Add video metadata (if any)
@@ -1934,6 +1922,18 @@ void FFmpegReader::CheckFPS()
// Update video bit rate
info.video_bit_rate = info.file_size / info.duration;
} else {
// Too short to determine framerate, just default FPS
// Set a few important default video settings (so audio can be divided into frames)
info.fps.num = 30;
info.fps.den = 1;
info.video_timebase.num = info.fps.den;
info.video_timebase.den = info.fps.num;
// Calculate number of frames
info.video_length = frames_detected;
info.duration = frames_detected / info.video_timebase.ToFloat();
}
}