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
89f99df8
Commit
89f99df8
authored
Oct 16, 2014
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: mp4: add some missing raw audio atom/rules
parent
0de00b2c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
4 deletions
+12
-4
modules/demux/mp4/essetup.c
modules/demux/mp4/essetup.c
+4
-4
modules/demux/mp4/libmp4.c
modules/demux/mp4/libmp4.c
+4
-0
modules/demux/mp4/libmp4.h
modules/demux/mp4/libmp4.h
+4
-0
No files found.
modules/demux/mp4/essetup.c
View file @
89f99df8
...
...
@@ -524,19 +524,19 @@ int SetupAudioES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample )
break
;
}
case
VLC_FOURCC
(
'i'
,
'n'
,
'2'
,
'4'
)
:
case
ATOM_in24
:
p_track
->
fmt
.
i_codec
=
p_enda
&&
BOXDATA
(
p_enda
)
->
i_little_endian
==
1
?
VLC_FOURCC
(
'4'
,
'2'
,
'n'
,
'i'
)
:
VLC_FOURCC
(
'i'
,
'n'
,
'2'
,
'4'
);
break
;
case
VLC_FOURCC
(
'i'
,
'n'
,
'3'
,
'2'
)
:
case
ATOM_in32
:
p_track
->
fmt
.
i_codec
=
p_enda
&&
BOXDATA
(
p_enda
)
->
i_little_endian
==
1
?
VLC_CODEC_S32L
:
VLC_CODEC_S32B
;
break
;
case
VLC_FOURCC
(
'f'
,
'l'
,
'3'
,
'2'
)
:
case
ATOM_fl32
:
p_track
->
fmt
.
i_codec
=
p_enda
&&
BOXDATA
(
p_enda
)
->
i_little_endian
==
1
?
VLC_CODEC_F32L
:
VLC_CODEC_F32B
;
break
;
case
VLC_FOURCC
(
'f'
,
'l'
,
'6'
,
'4'
)
:
case
ATOM_fl64
:
p_track
->
fmt
.
i_codec
=
p_enda
&&
BOXDATA
(
p_enda
)
->
i_little_endian
==
1
?
VLC_CODEC_F64L
:
VLC_CODEC_F64B
;
break
;
...
...
modules/demux/mp4/libmp4.c
View file @
89f99df8
...
...
@@ -3524,6 +3524,10 @@ 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_wave
,
MP4_ReadBoxContainer
,
MP4_FreeBox_Common
,
ATOM_in24
},
{
ATOM_wave
,
MP4_ReadBoxContainer
,
MP4_FreeBox_Common
,
ATOM_in32
},
{
ATOM_wave
,
MP4_ReadBoxContainer
,
MP4_FreeBox_Common
,
ATOM_fl32
},
{
ATOM_wave
,
MP4_ReadBoxContainer
,
MP4_FreeBox_Common
,
ATOM_fl64
},
{
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
},
...
...
modules/demux/mp4/libmp4.h
View file @
89f99df8
...
...
@@ -152,6 +152,10 @@
#define ATOM_gnre VLC_FOURCC( 'g', 'n', 'r', 'e' )
#define ATOM_trkn VLC_FOURCC( 't', 'r', 'k', 'n' )
#define ATOM_chan VLC_FOURCC( 'c', 'h', 'a', 'n' )
#define ATOM_in24 VLC_FOURCC( 'i', 'n', '2', '4' )
#define ATOM_in32 VLC_FOURCC( 'i', 'n', '3', '2' )
#define ATOM_fl32 VLC_FOURCC( 'f', 'l', '3', '2' )
#define ATOM_fl64 VLC_FOURCC( 'f', 'l', '6', '4' )
#define ATOM_zlib VLC_FOURCC( 'z', 'l', 'i', 'b' )
#define ATOM_SVQ1 VLC_FOURCC( 'S', 'V', 'Q', '1' )
...
...
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