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
43937eba
Commit
43937eba
authored
Jul 09, 2014
by
Rémi Denis-Courmont
Committed by
Jean-Baptiste Kempf
Jul 11, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
smf: simplify usage of VLC_TS_0
parent
798f81df
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
4 deletions
+3
-4
modules/demux/smf.c
modules/demux/smf.c
+3
-4
No files found.
modules/demux/smf.c
View file @
43937eba
...
...
@@ -342,7 +342,7 @@ int HandleMessage (demux_t *p_demux, mtrk_t *tr)
}
send:
block
->
i_dts
=
block
->
i_pts
=
VLC_TS_0
+
date_Get
(
&
p_demux
->
p_sys
->
pts
);
block
->
i_dts
=
block
->
i_pts
=
date_Get
(
&
p_demux
->
p_sys
->
pts
);
es_out_Send
(
p_demux
->
out
,
p_demux
->
p_sys
->
es
,
block
);
skip:
...
...
@@ -368,8 +368,7 @@ static int Demux (demux_t *p_demux)
if
(
pulse
==
UINT64_MAX
)
return
0
;
/* all tracks are done */
es_out_Control
(
p_demux
->
out
,
ES_OUT_SET_PCR
,
VLC_TS_0
+
date_Get
(
&
p_sys
->
pts
));
es_out_Control
(
p_demux
->
out
,
ES_OUT_SET_PCR
,
date_Get
(
&
p_sys
->
pts
));
for
(
unsigned
i
=
0
;
i
<
p_sys
->
trackc
;
i
++
)
{
...
...
@@ -543,7 +542,7 @@ static int Open (vlc_object_t *obj)
/* Default SMF tempo is 120BPM, i.e. half a second per quarter note */
date_Init
(
&
sys
->
pts
,
ppqn
*
2
,
1
);
date_Set
(
&
sys
->
pts
,
0
);
date_Set
(
&
sys
->
pts
,
VLC_TS_
0
);
sys
->
pulse
=
0
;
sys
->
ppqn
=
ppqn
;
...
...
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