Skip to content

O
opencv
Unverified Commit 255b20f6 authored by Loic Petit's avatar Loic Petit Committed by GitHub
Browse files
Options

Fix frame rate rounding in ffmpeg wrapper (#9023)

parent 1059735b
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/videoio/src/cap_ffmpeg_impl.hpp
View file @ 255b20f6
...@@ -1541,7 +1541,7 @@ static AVStream *icv_add_video_stream_FFMPEG(AVFormatContext *oc, ...@@ -1541,7 +1541,7 @@ static AVStream *icv_add_video_stream_FFMPEG(AVFormatContext *oc,
identically 1. */ identically 1. */
frame_rate=(int)(fps+0.5); frame_rate=(int)(fps+0.5);
frame_rate_base=1; frame_rate_base=1;
while (fabs((double)frame_rate/frame_rate_base) - fps > 0.001){ while (fabs(((double)frame_rate/frame_rate_base) - fps) > 0.001){
frame_rate_base*=10; frame_rate_base*=10;
frame_rate=(int)(fps*frame_rate_base + 0.5); frame_rate=(int)(fps*frame_rate_base + 0.5);
} }
...@@ -2374,7 +2374,7 @@ AVStream* OutputMediaStream_FFMPEG::addVideoStream(AVFormatContext *oc, CV_CODEC ...@@ -2374,7 +2374,7 @@ AVStream* OutputMediaStream_FFMPEG::addVideoStream(AVFormatContext *oc, CV_CODEC
int frame_rate = static_cast<int>(fps+0.5); int frame_rate = static_cast<int>(fps+0.5);
int frame_rate_base = 1; int frame_rate_base = 1;
while (fabs(static_cast<double>(frame_rate)/frame_rate_base) - fps > 0.001) while (fabs((static_cast<double>(frame_rate)/frame_rate_base) - fps) > 0.001)
{ {
frame_rate_base *= 10; frame_rate_base *= 10;
frame_rate = static_cast<int>(fps*frame_rate_base + 0.5); frame_rate = static_cast<int>(fps*frame_rate_base + 0.5);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment