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
59d398f7
Commit
59d398f7
authored
Oct 15, 2014
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: libmp4: read ilst as indexed list
And enforce handler
parent
fa5dc0c5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
36 additions
and
1 deletion
+36
-1
modules/demux/mp4/libmp4.c
modules/demux/mp4/libmp4.c
+36
-1
No files found.
modules/demux/mp4/libmp4.c
View file @
59d398f7
...
...
@@ -310,6 +310,41 @@ static int MP4_ReadBoxSkip( stream_t *p_stream, MP4_Box_t *p_box )
return
1
;
}
static
int
MP4_ReadBox_ilst
(
stream_t
*
p_stream
,
MP4_Box_t
*
p_box
)
{
if
(
p_box
->
i_size
<
8
||
stream_Read
(
p_stream
,
NULL
,
8
)
<
8
)
return
0
;
/* Find our handler */
if
(
!
p_box
->
i_handler
&&
p_box
->
p_father
)
{
const
MP4_Box_t
*
p_sibling
=
p_box
->
p_father
->
p_first
;
while
(
p_sibling
)
{
if
(
p_sibling
->
i_type
==
ATOM_hdlr
&&
p_sibling
->
data
.
p_hdlr
)
{
p_box
->
i_handler
=
p_sibling
->
data
.
p_hdlr
->
i_handler_type
;
break
;
}
p_sibling
=
p_sibling
->
p_next
;
}
}
switch
(
p_box
->
i_handler
)
{
case
0
:
msg_Warn
(
p_stream
,
"no handler for ilst atom"
);
return
0
;
case
VLC_FOURCC
(
'm'
,
'd'
,
't'
,
'a'
):
return
MP4_ReadBoxContainerChildrenIndexed
(
p_stream
,
p_box
,
0
,
true
);
case
VLC_FOURCC
(
'm'
,
'd'
,
'i'
,
'r'
):
return
MP4_ReadBoxContainerChildren
(
p_stream
,
p_box
,
0
);
default:
msg_Warn
(
p_stream
,
"Unknown ilst handler type '%4.4s'"
,
(
char
*
)
&
p_box
->
i_handler
);
return
0
;
}
}
static
int
MP4_ReadBox_ftyp
(
stream_t
*
p_stream
,
MP4_Box_t
*
p_box
)
{
MP4_READBOX_ENTER
(
MP4_Box_data_ftyp_t
);
...
...
@@ -3584,7 +3619,7 @@ static const struct
{
ATOM_wave
,
MP4_ReadBoxContainer
,
MP4_FreeBox_Common
,
ATOM_stsd
},
{
ATOM_wave
,
MP4_ReadBoxContainer
,
MP4_FreeBox_Common
,
ATOM_mp4a
},
/* some quicktime mp4a/wave/mp4a.. */
{
ATOM_wave
,
MP4_ReadBoxContainer
,
MP4_FreeBox_Common
,
ATOM_WMA2
},
/* flip4mac */
{
ATOM_ilst
,
MP4_ReadBox
Container
,
MP4_FreeBox_Common
,
ATOM_meta
},
{
ATOM_ilst
,
MP4_ReadBox
_ilst
,
MP4_FreeBox_Common
,
ATOM_meta
},
{
ATOM_mvex
,
MP4_ReadBoxContainer
,
MP4_FreeBox_Common
,
ATOM_moov
},
{
ATOM_mvex
,
MP4_ReadBoxContainer
,
MP4_FreeBox_Common
,
ATOM_ftyp
},
...
...
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