Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
f8959894
Commit
f8959894
authored
May 25, 2014
by
François Cartegnie
🤞
Browse files
demux: mp4: set smooth as priv property
parent
1c6daf4c
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/demux/mp4/mp4.c
View file @
f8959894
...
...
@@ -81,6 +81,7 @@ struct demux_sys_t
bool
b_fragmented
;
/* fMP4 */
bool
b_seekable
;
bool
b_fastseekable
;
bool
b_smooth
;
/* Is it Smooth Streaming? */
/* */
MP4_Box_t
*
p_tref_chap
;
...
...
@@ -227,11 +228,11 @@ static inline int64_t MP4_GetMoviePTS(demux_sys_t *p_sys )
static
void
LoadChapter
(
demux_t
*
p_demux
);
static
int
LoadInitFrag
(
demux_t
*
p_demux
,
const
bool
b_smooth
)
static
int
LoadInitFrag
(
demux_t
*
p_demux
)
{
demux_sys_t
*
p_sys
=
p_demux
->
p_sys
;
if
(
b_smooth
)
/* Smooth Streaming */
if
(
p_sys
->
b_smooth
)
/* Smooth Streaming */
{
if
(
(
p_sys
->
p_root
=
MP4_BoxGetSmooBox
(
p_demux
->
s
)
)
==
NULL
)
{
...
...
@@ -400,16 +401,14 @@ static int Open( vlc_object_t * p_this )
p_demux
->
p_sys
=
p_sys
;
/* Is it Smooth Streaming? */
bool
b_smooth
=
false
;
if
(
stream_Peek
(
p_demux
->
s
,
&
p_peek
,
24
)
<
24
)
return
VLC_EGENERIC
;
if
(
!
CmpUUID
(
(
UUID_t
*
)(
p_peek
+
8
),
&
SmooBoxUUID
)
)
{
b_smooth
=
true
;
p_sys
->
b_smooth
=
true
;
p_sys
->
b_fragmented
=
true
;
}
if
(
LoadInitFrag
(
p_demux
,
b_smooth
)
!=
VLC_SUCCESS
)
if
(
LoadInitFrag
(
p_demux
)
!=
VLC_SUCCESS
)
goto
error
;
/* LoadInitFrag early failed */
...
...
@@ -431,7 +430,7 @@ static int Open( vlc_object_t * p_this )
p_demux
->
pf_demux
=
DemuxFrg
;
}
if
(
b_smooth
)
if
(
p_sys
->
b_smooth
)
{
if
(
InitTracks
(
p_demux
)
!=
VLC_SUCCESS
)
goto
error
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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