Commit 89f99df8 authored by Francois Cartegnie's avatar Francois Cartegnie

demux: mp4: add some missing raw audio atom/rules

parent 0de00b2c
...@@ -524,19 +524,19 @@ int SetupAudioES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample ) ...@@ -524,19 +524,19 @@ int SetupAudioES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample )
break; 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 ? 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'); VLC_FOURCC('4','2','n','i') : VLC_FOURCC('i','n','2','4');
break; 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 ? p_track->fmt.i_codec = p_enda && BOXDATA(p_enda)->i_little_endian == 1 ?
VLC_CODEC_S32L : VLC_CODEC_S32B; VLC_CODEC_S32L : VLC_CODEC_S32B;
break; 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 ? p_track->fmt.i_codec = p_enda && BOXDATA(p_enda)->i_little_endian == 1 ?
VLC_CODEC_F32L : VLC_CODEC_F32B; VLC_CODEC_F32L : VLC_CODEC_F32B;
break; 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 ? p_track->fmt.i_codec = p_enda && BOXDATA(p_enda)->i_little_endian == 1 ?
VLC_CODEC_F64L : VLC_CODEC_F64B; VLC_CODEC_F64L : VLC_CODEC_F64B;
break; break;
......
...@@ -3524,6 +3524,10 @@ static const struct ...@@ -3524,6 +3524,10 @@ static const struct
{ ATOM_wave, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_stsd }, { 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_mp4a }, /* some quicktime mp4a/wave/mp4a.. */
{ ATOM_wave, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_WMA2 }, /* flip4mac */ { 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_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_moov },
{ ATOM_mvex, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_ftyp }, { ATOM_mvex, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_ftyp },
......
...@@ -152,6 +152,10 @@ ...@@ -152,6 +152,10 @@
#define ATOM_gnre VLC_FOURCC( 'g', 'n', 'r', 'e' ) #define ATOM_gnre VLC_FOURCC( 'g', 'n', 'r', 'e' )
#define ATOM_trkn VLC_FOURCC( 't', 'r', 'k', 'n' ) #define ATOM_trkn VLC_FOURCC( 't', 'r', 'k', 'n' )
#define ATOM_chan VLC_FOURCC( 'c', 'h', 'a', '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_zlib VLC_FOURCC( 'z', 'l', 'i', 'b' )
#define ATOM_SVQ1 VLC_FOURCC( 'S', 'V', 'Q', '1' ) #define ATOM_SVQ1 VLC_FOURCC( 'S', 'V', 'Q', '1' )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment