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
425521e9
Commit
425521e9
authored
Dec 13, 2013
by
Tristan Matthews
Committed by
Tristan Matthews
Dec 13, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ogg: use CLOCK_FREQ in muxer
parent
ed67b5a0
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
modules/mux/ogg.c
modules/mux/ogg.c
+5
-5
No files found.
modules/mux/ogg.c
View file @
425521e9
...
...
@@ -1541,7 +1541,7 @@ static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input )
/* number of sample from begining + current packet */
op
.
granulepos
=
(
p_data
->
i_dts
-
p_sys
->
i_start_dts
+
p_data
->
i_length
)
*
(
mtime_t
)
p_input
->
p_fmt
->
audio
.
i_rate
/
INT64_C
(
1000000
)
;
(
mtime_t
)
p_input
->
p_fmt
->
audio
.
i_rate
/
CLOCK_FREQ
;
i_time
=
p_data
->
i_dts
-
p_sys
->
i_start_dts
;
AddIndexEntry
(
p_mux
,
i_time
,
p_input
);
...
...
@@ -1550,7 +1550,7 @@ static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input )
{
/* number of sample from begining */
op
.
granulepos
=
(
p_data
->
i_dts
-
p_sys
->
i_start_dts
)
*
p_stream
->
p_oggds_header
->
i_samples_per_unit
/
INT64_C
(
1000000
)
;
p_stream
->
p_oggds_header
->
i_samples_per_unit
/
CLOCK_FREQ
;
}
}
else
if
(
p_stream
->
i_cat
==
VIDEO_ES
)
...
...
@@ -1564,7 +1564,7 @@ static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input )
p_stream
->
i_last_keyframe
=
p_stream
->
i_num_frames
;
/* presentation time */
i_time
=
INT64_C
(
1000000
)
*
(
p_stream
->
i_num_frames
-
1
)
*
i_time
=
CLOCK_FREQ
*
(
p_stream
->
i_num_frames
-
1
)
*
p_input
->
p_fmt
->
video
.
i_frame_rate_base
/
p_input
->
p_fmt
->
video
.
i_frame_rate
;
AddIndexEntry
(
p_mux
,
i_time
,
p_input
);
}
...
...
@@ -1577,11 +1577,11 @@ static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input )
mtime_t
dt
=
(
p_data
->
i_dts
-
p_sys
->
i_start_dts
+
1
)
*
p_input
->
p_fmt
->
video
.
i_frame_rate
*
2
/
p_input
->
p_fmt
->
video
.
i_frame_rate_base
/
INT64_C
(
1000000
)
;
/
CLOCK_FREQ
;
mtime_t
delay
=
(
p_data
->
i_pts
-
p_data
->
i_dts
+
1
)
*
p_input
->
p_fmt
->
video
.
i_frame_rate
*
2
/
p_input
->
p_fmt
->
video
.
i_frame_rate_base
/
INT64_C
(
1000000
)
;
/
CLOCK_FREQ
;
if
(
p_data
->
i_flags
&
BLOCK_FLAG_TYPE_I
)
p_stream
->
i_last_keyframe
=
dt
;
mtime_t
dist
=
dt
-
p_stream
->
i_last_keyframe
;
...
...
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