Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
72b1563b
Commit
72b1563b
authored
Oct 24, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lib: get frame rate from media ES, not from demux
parent
9ee43240
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
7 deletions
+16
-7
lib/media_player.c
lib/media_player.c
+16
-7
No files found.
lib/media_player.c
View file @
72b1563b
...
...
@@ -1608,16 +1608,25 @@ void libvlc_media_player_previous_chapter( libvlc_media_player_t *p_mi )
float
libvlc_media_player_get_fps
(
libvlc_media_player_t
*
p_mi
)
{
input_thread_t
*
p_input_thread
=
libvlc_get_input_thread
(
p_mi
);
double
f_fps
=
0
.
0
;
libvlc_media_t
*
media
=
libvlc_media_player_get_media
(
p_mi
);
if
(
media
==
NULL
)
return
0
.
f
;
if
(
p_input_thread
)
input_item_t
*
item
=
p_mi
->
p_md
->
p_input_item
;
float
fps
=
0
.
f
;
vlc_mutex_lock
(
&
item
->
lock
);
for
(
int
i
=
0
;
i
<
item
->
i_es
;
i
++
)
{
if
(
input_Control
(
p_input_thread
,
INPUT_GET_VIDEO_FPS
,
&
f_fps
)
)
f_fps
=
0
.
0
;
vlc_object_release
(
p_input_thread
);
const
es_format_t
*
fmt
=
item
->
es
[
i
];
if
(
fmt
->
i_cat
==
VIDEO_ES
&&
fmt
->
video
.
i_frame_rate_base
>
0
)
fps
=
(
float
)
fmt
->
video
.
i_frame_rate
/
(
float
)
fmt
->
video
.
i_frame_rate_base
;
}
return
f_fps
;
vlc_mutex_unlock
(
&
item
->
lock
);
return
fps
;
}
int
libvlc_media_player_will_play
(
libvlc_media_player_t
*
p_mi
)
...
...
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