Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
198bb199
Commit
198bb199
authored
May 26, 2014
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: mp4: use timescale as rate
parent
8b16963e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
2 deletions
+15
-2
modules/demux/mp4/mp4.c
modules/demux/mp4/mp4.c
+15
-2
No files found.
modules/demux/mp4/mp4.c
View file @
198bb199
...
...
@@ -1904,7 +1904,8 @@ static int TrackCreateSamplesIndex( demux_t *p_demux,
* It computes the sample rate for a video track using the given sample
* description index
*/
static
void
TrackGetESSampleRate
(
unsigned
*
pi_num
,
unsigned
*
pi_den
,
static
void
TrackGetESSampleRate
(
demux_t
*
p_demux
,
unsigned
*
pi_num
,
unsigned
*
pi_den
,
const
mp4_track_t
*
p_track
,
unsigned
i_sd_index
,
unsigned
i_chunk
)
...
...
@@ -1912,6 +1913,16 @@ static void TrackGetESSampleRate( unsigned *pi_num, unsigned *pi_den,
*
pi_num
=
0
;
*
pi_den
=
0
;
MP4_Box_t
*
p_trak
=
MP4_GetTrakByTrackID
(
MP4_BoxGet
(
p_demux
->
p_sys
->
p_root
,
"/moov"
),
p_track
->
i_track_ID
);
MP4_Box_t
*
p_mdhd
=
MP4_BoxGet
(
p_trak
,
"mdia/mdhd"
);
if
(
p_mdhd
)
{
*
pi_num
=
BOXDATA
(
p_mdhd
)
->
i_timescale
/
1000
;
*
pi_den
=
1
;
return
;
}
if
(
p_track
->
i_chunk_count
<=
0
)
return
;
...
...
@@ -2035,9 +2046,11 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track,
p_track
->
fmt
.
video
.
i_visible_height
=
p_track
->
fmt
.
video
.
i_height
;
/* Frame rate */
TrackGetESSampleRate
(
&
p_track
->
fmt
.
video
.
i_frame_rate
,
TrackGetESSampleRate
(
p_demux
,
&
p_track
->
fmt
.
video
.
i_frame_rate
,
&
p_track
->
fmt
.
video
.
i_frame_rate_base
,
p_track
,
i_sample_description_index
,
i_chunk
);
p_demux
->
p_sys
->
f_fps
=
(
float
)
p_track
->
fmt
.
video
.
i_frame_rate
/
(
float
)
p_track
->
fmt
.
video
.
i_frame_rate_base
;
...
...
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