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
ebcc69cf
Commit
ebcc69cf
authored
May 09, 2014
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
TS mux: start timestamps from 0
Make mplayer timeline display nicer
parent
882be2a1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
1 deletion
+8
-1
modules/mux/mpeg/ts.c
modules/mux/mpeg/ts.c
+8
-1
No files found.
modules/mux/mpeg/ts.c
View file @
ebcc69cf
...
...
@@ -379,6 +379,7 @@ struct sout_mux_sys_t
int64_t
i_pcr_delay
;
int64_t
i_dts_delay
;
mtime_t
first_dts
;
bool
b_use_key_frames
;
...
...
@@ -1274,7 +1275,7 @@ static bool MuxStreams(sout_mux_t *p_mux )
/* Don't mux the SPU yet if it is too early */
block_t
*
p_spu
=
block_FifoShow
(
p_input
->
p_fifo
);
int64_t
i_spu_delay
=
p_spu
->
i_dts
-
p_pcr_stream
->
i_pes_dts
;
int64_t
i_spu_delay
=
p_spu
->
i_dts
-
p_
sys
->
first_dts
-
p_
pcr_stream
->
i_pes_dts
;
if
(
(
i_spu_delay
>
i_shaping_delay
)
&&
(
i_spu_delay
<
INT64_C
(
100000000
)
)
)
continue
;
...
...
@@ -1317,6 +1318,12 @@ static bool MuxStreams(sout_mux_t *p_mux )
VLC_CODEC_SUBT
)
p_data
->
i_length
=
1000
;
if
(
p_sys
->
first_dts
==
0
)
p_sys
->
first_dts
=
p_data
->
i_dts
;
p_data
->
i_dts
-=
p_sys
->
first_dts
;
p_data
->
i_pts
-=
p_sys
->
first_dts
;
if
(
(
p_pcr_stream
->
i_pes_dts
>
0
&&
p_data
->
i_dts
-
10000000
>
p_pcr_stream
->
i_pes_dts
+
p_pcr_stream
->
i_pes_length
)
||
...
...
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