Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
6d54abbd
Commit
6d54abbd
authored
8 years ago
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg: fix get_fps()
parent
595fd275
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
1 deletion
+8
-1
cap_ffmpeg_impl.hpp
modules/videoio/src/cap_ffmpeg_impl.hpp
+8
-1
No files found.
modules/videoio/src/cap_ffmpeg_impl.hpp
View file @
6d54abbd
...
...
@@ -1135,7 +1135,14 @@ int CvCapture_FFMPEG::get_bitrate() const
double
CvCapture_FFMPEG
::
get_fps
()
const
{
#if 0 && LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(55, 1, 100) && LIBAVFORMAT_VERSION_MICRO >= 100
double fps = r2d(av_guess_frame_rate(ic, ic->streams[video_stream], NULL));
#else
#if LIBAVCODEC_BUILD >= CALC_FFMPEG_VERSION(54, 1, 0)
double
fps
=
r2d
(
ic
->
streams
[
video_stream
]
->
avg_frame_rate
);
#else
double
fps
=
r2d
(
ic
->
streams
[
video_stream
]
->
r_frame_rate
);
#endif
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(52, 111, 0)
if
(
fps
<
eps_zero
)
...
...
@@ -1148,7 +1155,7 @@ double CvCapture_FFMPEG::get_fps() const
{
fps
=
1.0
/
r2d
(
ic
->
streams
[
video_stream
]
->
codec
->
time_base
);
}
#endif
return
fps
;
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment