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
87fe87e3
Commit
87fe87e3
authored
Jul 10, 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: implement GET_POSITION and GET_LENGTH
parent
cd4f1bb1
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
39 additions
and
14 deletions
+39
-14
modules/demux/smf.c
modules/demux/smf.c
+39
-14
No files found.
modules/demux/smf.c
View file @
87fe87e3
...
@@ -98,6 +98,7 @@ struct demux_sys_t
...
@@ -98,6 +98,7 @@ struct demux_sys_t
uint64_t
pulse
;
/*< Pulses counter */
uint64_t
pulse
;
/*< Pulses counter */
mtime_t
tick
;
/*< Last tick timestamp */
mtime_t
tick
;
/*< Last tick timestamp */
mtime_t
duration
;
/*< Total duration */
unsigned
ppqn
;
/*< Pulses Per Quarter Note */
unsigned
ppqn
;
/*< Pulses Per Quarter Note */
/* by the way, "quarter note" is "noire" in French */
/* by the way, "quarter note" is "noire" in French */
...
@@ -253,7 +254,7 @@ int HandleMeta (demux_t *p_demux, mtrk_t *tr)
...
@@ -253,7 +254,7 @@ int HandleMeta (demux_t *p_demux, mtrk_t *tr)
}
}
static
static
int
HandleMessage
(
demux_t
*
p_demux
,
mtrk_t
*
tr
)
int
HandleMessage
(
demux_t
*
p_demux
,
mtrk_t
*
tr
,
es_out_t
*
out
)
{
{
stream_t
*
s
=
p_demux
->
s
;
stream_t
*
s
=
p_demux
->
s
;
block_t
*
block
;
block_t
*
block
;
...
@@ -345,7 +346,10 @@ int HandleMessage (demux_t *p_demux, mtrk_t *tr)
...
@@ -345,7 +346,10 @@ int HandleMessage (demux_t *p_demux, mtrk_t *tr)
send:
send:
block
->
i_dts
=
block
->
i_pts
=
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
);
if
(
out
!=
NULL
)
es_out_Send
(
out
,
p_demux
->
p_sys
->
es
,
block
);
else
block_Release
(
block
);
skip:
skip:
if
(
event
<
0xF8
)
if
(
event
<
0xF8
)
...
@@ -389,7 +393,8 @@ static int SeekSet0 (demux_t *demux)
...
@@ -389,7 +393,8 @@ static int SeekSet0 (demux_t *demux)
return
0
;
return
0
;
}
}
static
int
ReadEvents
(
demux_t
*
demux
,
uint64_t
*
restrict
pulse
)
static
int
ReadEvents
(
demux_t
*
demux
,
uint64_t
*
restrict
pulse
,
es_out_t
*
out
)
{
{
uint64_t
cur_pulse
=
*
pulse
,
next_pulse
=
UINT64_MAX
;
uint64_t
cur_pulse
=
*
pulse
,
next_pulse
=
UINT64_MAX
;
demux_sys_t
*
sys
=
demux
->
p_sys
;
demux_sys_t
*
sys
=
demux
->
p_sys
;
...
@@ -400,7 +405,7 @@ static int ReadEvents (demux_t *demux, uint64_t *restrict pulse)
...
@@ -400,7 +405,7 @@ static int ReadEvents (demux_t *demux, uint64_t *restrict pulse)
while
(
track
->
next
<=
cur_pulse
)
while
(
track
->
next
<=
cur_pulse
)
{
{
if
(
HandleMessage
(
demux
,
track
)
if
(
HandleMessage
(
demux
,
track
,
out
)
||
ReadDeltaTime
(
demux
->
s
,
track
))
||
ReadDeltaTime
(
demux
->
s
,
track
))
{
{
msg_Err
(
demux
,
"fatal parsing error"
);
msg_Err
(
demux
,
"fatal parsing error"
);
...
@@ -447,7 +452,7 @@ static int Demux (demux_t *demux)
...
@@ -447,7 +452,7 @@ static int Demux (demux_t *demux)
/* MIDI events in chronological order across all tracks */
/* MIDI events in chronological order across all tracks */
uint64_t
pulse
=
sys
->
pulse
;
uint64_t
pulse
=
sys
->
pulse
;
if
(
ReadEvents
(
demux
,
&
pulse
))
if
(
ReadEvents
(
demux
,
&
pulse
,
demux
->
out
))
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
if
(
pulse
==
UINT64_MAX
)
if
(
pulse
==
UINT64_MAX
)
...
@@ -466,18 +471,24 @@ static int Control (demux_t *p_demux, int i_query, va_list args)
...
@@ -466,18 +471,24 @@ static int Control (demux_t *p_demux, int i_query, va_list args)
switch
(
i_query
)
switch
(
i_query
)
{
{
case
DEMUX_GET_TIME
:
*
va_arg
(
args
,
int64_t
*
)
=
sys
->
tick
-
VLC_TS_0
;
return
0
;
#if 0
/* TODO: */
case DEMUX_SET_TIME:
case
DEMUX_GET_POSITION
:
case
DEMUX_GET_POSITION
:
case DEMUX_SET_POSITION:
if
(
!
sys
->
duration
)
return
VLC_EGENERIC
;
*
va_arg
(
args
,
double
*
)
=
(
sys
->
tick
-
(
double
)
VLC_TS_0
)
/
sys
->
duration
;
break
;
//case DEMUX_SET_POSITION:
case
DEMUX_GET_LENGTH
:
case
DEMUX_GET_LENGTH
:
#endif
*
va_arg
(
args
,
int64_t
*
)
=
sys
->
duration
;
}
break
;
case
DEMUX_GET_TIME
:
*
va_arg
(
args
,
int64_t
*
)
=
sys
->
tick
-
VLC_TS_0
;
break
;
//case DEMUX_SET_TIME:
default:
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
return
VLC_SUCCESS
;
}
}
/**
/**
...
@@ -585,6 +596,7 @@ static int Open (vlc_object_t *obj)
...
@@ -585,6 +596,7 @@ static int Open (vlc_object_t *obj)
goto
error
;
goto
error
;
demux
->
p_sys
=
sys
;
demux
->
p_sys
=
sys
;
sys
->
duration
=
0
;
sys
->
ppqn
=
ppqn
;
sys
->
ppqn
=
ppqn
;
sys
->
trackc
=
tracks
;
sys
->
trackc
=
tracks
;
...
@@ -623,6 +635,19 @@ static int Open (vlc_object_t *obj)
...
@@ -623,6 +635,19 @@ static int Open (vlc_object_t *obj)
tr
->
length
=
GetDWBE
(
head
+
4
);
tr
->
length
=
GetDWBE
(
head
+
4
);
}
}
bool
b
;
if
(
stream_Control
(
stream
,
STREAM_CAN_FASTSEEK
,
&
b
)
==
0
&&
b
)
{
if
(
SeekSet0
(
demux
))
goto
error
;
for
(
uint64_t
pulse
=
0
;
pulse
!=
UINT64_MAX
;)
if
(
ReadEvents
(
demux
,
&
pulse
,
NULL
))
break
;
sys
->
duration
=
date_Get
(
&
sys
->
pts
);
}
if
(
SeekSet0
(
demux
))
if
(
SeekSet0
(
demux
))
goto
error
;
goto
error
;
...
...
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