#endif
#include "libmp4.h"
+#include "languages.h"
#include <math.h>
/* Some assumptions:
{
CreateUUID( &p_box->i_uuid, p_box->i_type );
}
-#ifdef MP4_VERBOSE
+#ifdef MP4_ULTRA_VERBOSE
if( p_box->i_size )
{
if MP4_BOX_TYPE_ASCII()
}
/* Nothing to do */
-#ifdef MP4_VERBOSE
+#ifdef MP4_ULTRA_VERBOSE
if MP4_BOX_TYPE_ASCII()
msg_Dbg( p_stream, "skip box: \"%4.4s\"", (char*)&p_box->i_type );
else
MP4_GET4BYTES( p_box->data.p_mdhd->i_timescale );
MP4_GET4BYTES( p_box->data.p_mdhd->i_duration );
}
- p_box->data.p_mdhd->i_language_code = i_language = GetWBE( p_peek );
- for( unsigned i = 0; i < 3; i++ )
- {
- p_box->data.p_mdhd->i_language[i] =
- ( ( i_language >> ( (2-i)*5 ) )&0x1f ) + 0x60;
- }
- MP4_GET2BYTES( p_box->data.p_mdhd->i_predefined );
+ MP4_GET2BYTES( i_language );
+ decodeQtLanguageCode( i_language, p_box->data.p_mdhd->rgs_language,
+ &p_box->data.p_mdhd->b_mac_encoding );
+
+ MP4_GET2BYTES( p_box->data.p_mdhd->i_quality );
#ifdef MP4_VERBOSE
MP4_ConvertDate2Str( s_creation_time, p_box->data.p_mdhd->i_creation_time, false );
MP4_ConvertDate2Str( s_modification_time, p_box->data.p_mdhd->i_modification_time, false );
MP4_ConvertDate2Str( s_duration, p_box->data.p_mdhd->i_duration, true );
- msg_Dbg( p_stream, "read box: \"mdhd\" creation %s modification %s time scale %d duration %s language %c%c%c",
+ msg_Dbg( p_stream, "read box: \"mdhd\" creation %s modification %s time scale %d duration %s language %3.3s",
s_creation_time,
s_modification_time,
(uint32_t)p_box->data.p_mdhd->i_timescale,
s_duration,
- p_box->data.p_mdhd->i_language[0],
- p_box->data.p_mdhd->i_language[1],
- p_box->data.p_mdhd->i_language[2] );
+ (char*) &p_box->data.p_mdhd->rgs_language );
#endif
MP4_READBOX_EXIT( 1 );
}
MP4_GET1BYTE( i_type );
- if( i_type == 0x03 ) /* MP4ESDescrTag */
+ if( i_type == 0x03 ) /* MP4ESDescrTag ISO/IEC 14496-1 8.3.3 */
{
i_len = MP4_ReadLengthDescriptor( &p_peek, &i_read );
unsigned int i_len;
MP4_GET1BYTE( i_len );
+ i_len = __MIN(i_read, i_len);
es_descriptor.psz_URL = malloc( i_len + 1 );
if( es_descriptor.psz_URL )
{
MP4_GET1BYTE( i_type ); /* get next type */
}
- if( i_type != 0x04)/* MP4DecConfigDescrTag */
+ if( i_type != 0x04)/* MP4DecConfigDescrTag ISO/IEC 14496-1 8.3.4 */
{
es_descriptor.p_decConfigDescr = NULL;
MP4_READBOX_EXIT( 1 ); /* rest isn't interesting up to now */
if( unlikely( es_descriptor.p_decConfigDescr == NULL ) )
MP4_READBOX_EXIT( 0 );
- MP4_GET1BYTE( es_descriptor.p_decConfigDescr->i_objectTypeIndication );
+ MP4_GET1BYTE( es_descriptor.p_decConfigDescr->i_objectProfileIndication );
MP4_GET1BYTE( i_flags );
es_descriptor.p_decConfigDescr->i_streamType = i_flags >> 2;
es_descriptor.p_decConfigDescr->b_upStream = ( i_flags >> 1 )&0x01;
MP4_GET4BYTES( es_descriptor.p_decConfigDescr->i_max_bitrate );
MP4_GET4BYTES( es_descriptor.p_decConfigDescr->i_avg_bitrate );
MP4_GET1BYTE( i_type );
- if( i_type != 0x05 )/* MP4DecSpecificDescrTag */
+ if( i_type != 0x05 )/* MP4DecSpecificDescrTag ISO/IEC 14496-1 8.3.5 */
{
es_descriptor.p_decConfigDescr->i_decoder_specific_info_len = 0;
es_descriptor.p_decConfigDescr->p_decoder_specific_info = NULL;
if( !p_avcC->i_sps_length || !p_avcC->sps )
goto error;
- for( i = 0; i < p_avcC->i_sps; i++ )
+ for( i = 0; i < p_avcC->i_sps && i_read > 2; i++ )
{
MP4_GET2BYTES( p_avcC->i_sps_length[i] );
+ if ( p_avcC->i_sps_length[i] > i_read )
+ goto error;
p_avcC->sps[i] = malloc( p_avcC->i_sps_length[i] );
if( p_avcC->sps[i] )
memcpy( p_avcC->sps[i], p_peek, p_avcC->i_sps_length[i] );
p_peek += p_avcC->i_sps_length[i];
i_read -= p_avcC->i_sps_length[i];
}
+ if ( i != p_avcC->i_sps )
+ goto error;
}
MP4_GET1BYTE( p_avcC->i_pps );
if( !p_avcC->i_pps_length || !p_avcC->pps )
goto error;
- for( i = 0; i < p_avcC->i_pps; i++ )
+ for( i = 0; i < p_avcC->i_pps && i_read > 2; i++ )
{
MP4_GET2BYTES( p_avcC->i_pps_length[i] );
+ if( p_avcC->i_pps_length[i] > i_read )
+ goto error;
p_avcC->pps[i] = malloc( p_avcC->i_pps_length[i] );
if( p_avcC->pps[i] )
memcpy( p_avcC->pps[i], p_peek, p_avcC->i_pps_length[i] );
p_peek += p_avcC->i_pps_length[i];
i_read -= p_avcC->i_pps_length[i];
}
+ if ( i != p_avcC->i_pps )
+ goto error;
}
#ifdef MP4_VERBOSE
msg_Dbg( p_stream,
MP4_READBOX_EXIT( 1 );
error:
+ MP4_FreeBox_avcC( p_box );
MP4_READBOX_EXIT( 0 );
}
+static int MP4_ReadBox_WMA2( stream_t *p_stream, MP4_Box_t *p_box )
+{
+ MP4_READBOX_ENTER( MP4_Box_data_WMA2_t );
+
+ MP4_Box_data_WMA2_t *p_WMA2 = p_box->data.p_WMA2;
+
+ MP4_GET2BYTESLE( p_WMA2->Format.wFormatTag );
+ MP4_GET2BYTESLE( p_WMA2->Format.nChannels );
+ MP4_GET4BYTESLE( p_WMA2->Format.nSamplesPerSec );
+ MP4_GET4BYTESLE( p_WMA2->Format.nAvgBytesPerSec );
+ MP4_GET2BYTESLE( p_WMA2->Format.nBlockAlign );
+ MP4_GET2BYTESLE( p_WMA2->Format.wBitsPerSample );
+
+ uint16_t i_cbSize;
+ MP4_GET2BYTESLE( i_cbSize );
+
+ if ( i_read < 0 || i_cbSize > i_read )
+ goto error;
+
+ p_WMA2->i_extra = i_cbSize;
+ if ( p_WMA2->i_extra )
+ {
+ p_WMA2->p_extra = malloc( p_WMA2->i_extra );
+ if ( ! p_WMA2->p_extra )
+ goto error;
+ memcpy( p_WMA2->p_extra, p_peek, p_WMA2->i_extra );
+ }
+
+ MP4_READBOX_EXIT( 1 );
+
+error:
+ MP4_READBOX_EXIT( 0 );
+}
+
+static void MP4_FreeBox_WMA2( MP4_Box_t *p_box )
+{
+ FREENULL( p_box->data.p_WMA2->p_extra );
+}
+
+static int MP4_ReadBox_strf( stream_t *p_stream, MP4_Box_t *p_box )
+{
+ MP4_READBOX_ENTER( MP4_Box_data_strf_t );
+
+ MP4_Box_data_strf_t *p_strf = p_box->data.p_strf;
+
+ MP4_GET4BYTESLE( p_strf->bmiHeader.biSize );
+ MP4_GET4BYTESLE( p_strf->bmiHeader.biWidth );
+ MP4_GET4BYTESLE( p_strf->bmiHeader.biHeight );
+ MP4_GET2BYTESLE( p_strf->bmiHeader.biPlanes );
+ MP4_GET2BYTESLE( p_strf->bmiHeader.biBitCount );
+ MP4_GETFOURCC( p_strf->bmiHeader.biCompression );
+ MP4_GET4BYTESLE( p_strf->bmiHeader.biSizeImage );
+ MP4_GET4BYTESLE( p_strf->bmiHeader.biXPelsPerMeter );
+ MP4_GET4BYTESLE( p_strf->bmiHeader.biYPelsPerMeter );
+ MP4_GET4BYTESLE( p_strf->bmiHeader.biClrUsed );
+ MP4_GET4BYTESLE( p_strf->bmiHeader.biClrImportant );
+
+ if ( i_read < 0 )
+ goto error;
+
+ p_strf->i_extra = i_read;
+ if ( p_strf->i_extra )
+ {
+ p_strf->p_extra = malloc( p_strf->i_extra );
+ if ( ! p_strf->p_extra )
+ goto error;
+ memcpy( p_strf->p_extra, p_peek, i_read );
+ }
+
+ MP4_READBOX_EXIT( 1 );
+
+error:
+ MP4_READBOX_EXIT( 0 );
+}
+
+static void MP4_FreeBox_strf( MP4_Box_t *p_box )
+{
+ FREENULL( p_box->data.p_strf->p_extra );
+}
+
+static int MP4_ReadBox_ASF( stream_t *p_stream, MP4_Box_t *p_box )
+{
+ MP4_READBOX_ENTER( MP4_Box_data_ASF_t );
+
+ MP4_Box_data_ASF_t *p_asf = p_box->data.p_asf;
+
+ if (i_read != 8)
+ MP4_READBOX_EXIT( 0 );
+
+ MP4_GET1BYTE( p_asf->i_stream_number );
+ /* remaining is unknown */
+
+ MP4_READBOX_EXIT( 1 );
+}
+
+static int MP4_ReadBox_stsdext_chan( stream_t *p_stream, MP4_Box_t *p_box )
+{
+ MP4_READBOX_ENTER( MP4_Box_data_chan_t );
+ MP4_Box_data_chan_t *p_chan = p_box->data.p_chan;
+
+ if ( i_read < 16 )
+ MP4_READBOX_EXIT( 0 );
+
+ MP4_GET1BYTE( p_chan->i_version );
+ MP4_GET3BYTES( p_chan->i_channels_flags );
+ MP4_GET4BYTES( p_chan->layout.i_channels_layout_tag );
+ MP4_GET4BYTES( p_chan->layout.i_channels_bitmap );
+ MP4_GET4BYTES( p_chan->layout.i_channels_description_count );
+ if ( i_read < p_chan->layout.i_channels_description_count * 24 )
+ MP4_READBOX_EXIT( 0 );
+
+ p_chan->layout.p_descriptions =
+ malloc( p_chan->layout.i_channels_description_count * 24 );
+
+ if ( !p_chan->layout.p_descriptions )
+ MP4_READBOX_EXIT( 0 );
+
+ for( uint32_t i=0; i<p_chan->layout.i_channels_description_count; i++ )
+ {
+ MP4_GET4BYTES( p_chan->layout.p_descriptions[i].i_channel_label );
+ MP4_GET4BYTES( p_chan->layout.p_descriptions[i].i_channel_flags );
+ MP4_GET4BYTES( p_chan->layout.p_descriptions[i].f_coordinates[0] );
+ MP4_GET4BYTES( p_chan->layout.p_descriptions[i].f_coordinates[1] );
+ MP4_GET4BYTES( p_chan->layout.p_descriptions[i].f_coordinates[2] );
+ }
+
+#ifdef MP4_VERBOSE
+ msg_Dbg( p_stream,
+ "read box: \"chan\" flags=0x%x tag=0x%x bitmap=0x%x descriptions=%u",
+ p_chan->i_channels_flags, p_chan->layout.i_channels_layout_tag,
+ p_chan->layout.i_channels_bitmap, p_chan->layout.i_channels_description_count );
+#endif
+ MP4_READBOX_EXIT( 1 );
+}
+
+static void MP4_FreeBox_stsdext_chan( MP4_Box_t *p_box )
+{
+ MP4_Box_data_chan_t *p_chan = p_box->data.p_chan;
+ free( p_chan->layout.p_descriptions );
+}
+
+static int MP4_ReadBox_dec3( stream_t *p_stream, MP4_Box_t *p_box )
+{
+ MP4_READBOX_ENTER( MP4_Box_data_dec3_t );
+
+ MP4_Box_data_dec3_t *p_dec3 = p_box->data.p_dec3;
+
+ unsigned i_header;
+ MP4_GET2BYTES( i_header );
+
+ p_dec3->i_data_rate = i_header >> 3;
+ p_dec3->i_num_ind_sub = (i_header & 0x7) + 1;
+ for (uint8_t i = 0; i < p_dec3->i_num_ind_sub; i++) {
+ MP4_GET3BYTES( i_header );
+ p_dec3->stream[i].i_fscod = ( i_header >> 22 ) & 0x03;
+ p_dec3->stream[i].i_bsid = ( i_header >> 17 ) & 0x01f;
+ p_dec3->stream[i].i_bsmod = ( i_header >> 12 ) & 0x01f;
+ p_dec3->stream[i].i_acmod = ( i_header >> 9 ) & 0x07;
+ p_dec3->stream[i].i_lfeon = ( i_header >> 8 ) & 0x01;
+ p_dec3->stream[i].i_num_dep_sub = (i_header >> 1) & 0x0f;
+ if (p_dec3->stream[i].i_num_dep_sub) {
+ MP4_GET1BYTE( p_dec3->stream[i].i_chan_loc );
+ p_dec3->stream[i].i_chan_loc |= (i_header & 1) << 8;
+ } else
+ p_dec3->stream[i].i_chan_loc = 0;
+ }
+
+#ifdef MP4_VERBOSE
+ msg_Dbg( p_stream,
+ "read box: \"dec3\" bitrate %dkbps %d independant substreams",
+ p_dec3->i_data_rate, p_dec3->i_num_ind_sub);
+
+ for (uint8_t i = 0; i < p_dec3->i_num_ind_sub; i++)
+ msg_Dbg( p_stream,
+ "\tstream %d: bsid=0x%x bsmod=0x%x acmod=0x%x lfeon=0x%x "
+ "num dependant subs=%d chan_loc=0x%x",
+ i, p_dec3->stream[i].i_bsid, p_dec3->stream[i].i_bsmod, p_dec3->stream[i].i_acmod,
+ p_dec3->stream[i].i_lfeon, p_dec3->stream[i].i_num_dep_sub, p_dec3->stream[i].i_chan_loc );
+#endif
+ MP4_READBOX_EXIT( 1 );
+}
+
static int MP4_ReadBox_dac3( stream_t *p_stream, MP4_Box_t *p_box )
{
MP4_Box_data_dac3_t *p_dac3;
static int MP4_ReadBox_sample_soun( stream_t *p_stream, MP4_Box_t *p_box )
{
+ p_box->i_handler = ATOM_soun;
MP4_READBOX_ENTER( MP4_Box_data_sample_soun_t );
p_box->data.p_sample_soun->p_qt_description = NULL;
MP4_GET2BYTES( p_box->data.p_sample_soun->i_channelcount );
MP4_GET2BYTES( p_box->data.p_sample_soun->i_samplesize );
- MP4_GET2BYTES( p_box->data.p_sample_soun->i_predefined );
+ MP4_GET2BYTES( p_box->data.p_sample_soun->i_compressionid );
MP4_GET2BYTES( p_box->data.p_sample_soun->i_reserved3 );
MP4_GET2BYTES( p_box->data.p_sample_soun->i_sampleratehi );
MP4_GET2BYTES( p_box->data.p_sample_soun->i_sampleratelo );
/* Checks */
if ( p_box->data.p_sample_soun->i_channelcount != 0x3 ||
p_box->data.p_sample_soun->i_samplesize != 0x0010 ||
- p_box->data.p_sample_soun->i_predefined != 0xFFFE ||
+ p_box->data.p_sample_soun->i_compressionid != 0xFFFE ||
p_box->data.p_sample_soun->i_reserved3 != 0x0 ||
p_box->data.p_sample_soun->i_sampleratehi != 0x1 ||//65536
p_box->data.p_sample_soun->i_sampleratelo != 0x0 ) //remainder
int MP4_ReadBox_sample_vide( stream_t *p_stream, MP4_Box_t *p_box )
{
+ p_box->i_handler = ATOM_vide;
MP4_READBOX_ENTER( MP4_Box_data_sample_vide_t );
for( unsigned i = 0; i < 6 ; i++ )
MP4_GET4BYTES( p_box->data.p_sample_vide->i_qt_data_size );
MP4_GET2BYTES( p_box->data.p_sample_vide->i_qt_frame_count );
+ if ( i_read < 32 )
+ MP4_READBOX_EXIT( 0 );
memcpy( &p_box->data.p_sample_vide->i_compressorname, p_peek, 32 );
p_peek += 32; i_read -= 32;
{
int32_t t;
+ p_box->i_handler = ATOM_text;
MP4_READBOX_ENTER( MP4_Box_data_sample_text_t );
MP4_GET4BYTES( p_box->data.p_sample_text->i_reserved1 );
static int MP4_ReadBox_sample_tx3g( stream_t *p_stream, MP4_Box_t *p_box )
{
+ p_box->i_handler = ATOM_text;
MP4_READBOX_ENTER( MP4_Box_data_sample_text_t );
MP4_GET4BYTES( p_box->data.p_sample_text->i_reserved1 );
static int MP4_ReadBox_cprt( stream_t *p_stream, MP4_Box_t *p_box )
{
- unsigned int i_language;
+ uint16_t i_language;
+ bool b_mac;
MP4_READBOX_ENTER( MP4_Box_data_cprt_t );
MP4_GETVERSIONFLAGS( p_box->data.p_cprt );
- i_language = GetWBE( p_peek );
- for( unsigned i = 0; i < 3; i++ )
- {
- p_box->data.p_cprt->i_language[i] =
- ( ( i_language >> ( (2-i)*5 ) )&0x1f ) + 0x60;
- }
- p_peek += 2; i_read -= 2;
+ MP4_GET2BYTES( i_language );
+ decodeQtLanguageCode( i_language, p_box->data.p_cprt->rgs_language, &b_mac );
+
MP4_GETSTRINGZ( p_box->data.p_cprt->psz_notice );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream, "read box: \"cprt\" language %c%c%c notice %s",
- p_box->data.p_cprt->i_language[0],
- p_box->data.p_cprt->i_language[1],
- p_box->data.p_cprt->i_language[2],
+ msg_Dbg( p_stream, "read box: \"cprt\" language %3.3s notice %s",
+ p_box->data.p_cprt->rgs_language,
p_box->data.p_cprt->psz_notice );
#endif
msg_Warn( p_stream,
"unknown box type c%3.3s (incompletely loaded)",
(char*)&p_box->i_type+1 );
+ p_box->e_flags |= BOX_FLAG_INCOMPLETE;
return 1;
}
uint32_t i_type;
int (*MP4_ReadBox_function )( stream_t *p_stream, MP4_Box_t *p_box );
void (*MP4_FreeBox_function )( MP4_Box_t *p_box );
+ uint32_t i_parent; /* set parent to restrict, duplicating if needed; 0 for any */
} MP4_Box_Function [] =
{
/* Containers */
- { ATOM_moov, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { ATOM_trak, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { ATOM_mdia, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { ATOM_moof, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { ATOM_minf, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { ATOM_stbl, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { ATOM_dinf, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { ATOM_edts, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { ATOM_udta, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { ATOM_nmhd, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { ATOM_hnti, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { ATOM_rmra, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { ATOM_rmda, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { ATOM_tref, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { ATOM_gmhd, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { ATOM_wave, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { ATOM_ilst, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { ATOM_mvex, MP4_ReadBoxContainer, MP4_FreeBox_Common },
+ { ATOM_moov, MP4_ReadBoxContainer, MP4_FreeBox_Common, 0 },
+ { ATOM_foov, MP4_ReadBoxContainer, MP4_FreeBox_Common, 0 },
+ { ATOM_trak, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_moov },
+ { ATOM_trak, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_foov },
+ { ATOM_mdia, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_trak },
+ { ATOM_moof, MP4_ReadBoxContainer, MP4_FreeBox_Common, 0 },
+ { ATOM_minf, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_mdia },
+ { ATOM_stbl, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_minf },
+ { ATOM_dinf, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_minf },
+ { ATOM_dinf, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_meta },
+ { ATOM_edts, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_trak },
+ { ATOM_udta, MP4_ReadBoxContainer, MP4_FreeBox_Common, 0 },
+ { ATOM_nmhd, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_minf },
+ { ATOM_hnti, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_udta },
+ { ATOM_rmra, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_moov },
+ { ATOM_rmda, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_rmra },
+ { ATOM_tref, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_trak },
+ { ATOM_gmhd, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_minf },
+ { ATOM_wave, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_stsd },
+ { ATOM_wave, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_WMA2 }, /* flip4mac */
+ { ATOM_ilst, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_meta },
+ { ATOM_mvex, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_moov },
+ { ATOM_mvex, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_ftyp },
/* specific box */
- { ATOM_ftyp, MP4_ReadBox_ftyp, MP4_FreeBox_ftyp },
- { ATOM_cmov, MP4_ReadBox_cmov, MP4_FreeBox_Common },
- { ATOM_mvhd, MP4_ReadBox_mvhd, MP4_FreeBox_Common },
- { ATOM_tkhd, MP4_ReadBox_tkhd, MP4_FreeBox_Common },
- { ATOM_mdhd, MP4_ReadBox_mdhd, MP4_FreeBox_Common },
- { ATOM_hdlr, MP4_ReadBox_hdlr, MP4_FreeBox_hdlr },
- { ATOM_vmhd, MP4_ReadBox_vmhd, MP4_FreeBox_Common },
- { ATOM_smhd, MP4_ReadBox_smhd, MP4_FreeBox_Common },
- { ATOM_hmhd, MP4_ReadBox_hmhd, MP4_FreeBox_Common },
- { ATOM_url, MP4_ReadBox_url, MP4_FreeBox_url },
- { ATOM_urn, MP4_ReadBox_urn, MP4_FreeBox_urn },
- { ATOM_dref, MP4_ReadBox_dref, MP4_FreeBox_Common },
- { ATOM_stts, MP4_ReadBox_stts, MP4_FreeBox_stts },
- { ATOM_ctts, MP4_ReadBox_ctts, MP4_FreeBox_ctts },
- { ATOM_stsd, MP4_ReadBox_stsd, MP4_FreeBox_Common },
- { ATOM_stsz, MP4_ReadBox_stsz, MP4_FreeBox_stsz },
- { ATOM_stsc, MP4_ReadBox_stsc, MP4_FreeBox_stsc },
- { ATOM_stco, MP4_ReadBox_stco_co64, MP4_FreeBox_stco_co64 },
- { ATOM_co64, MP4_ReadBox_stco_co64, MP4_FreeBox_stco_co64 },
- { ATOM_stss, MP4_ReadBox_stss, MP4_FreeBox_stss },
- { ATOM_stsh, MP4_ReadBox_stsh, MP4_FreeBox_stsh },
- { ATOM_stdp, MP4_ReadBox_stdp, MP4_FreeBox_stdp },
- { ATOM_padb, MP4_ReadBox_padb, MP4_FreeBox_padb },
- { ATOM_elst, MP4_ReadBox_elst, MP4_FreeBox_elst },
- { ATOM_cprt, MP4_ReadBox_cprt, MP4_FreeBox_cprt },
- { ATOM_esds, MP4_ReadBox_esds, MP4_FreeBox_esds },
- { ATOM_dcom, MP4_ReadBox_dcom, MP4_FreeBox_Common },
- { ATOM_cmvd, MP4_ReadBox_cmvd, MP4_FreeBox_cmvd },
- { ATOM_avcC, MP4_ReadBox_avcC, MP4_FreeBox_avcC },
- { ATOM_hvcC, MP4_ReadBox_hvcC, MP4_FreeBox_hvcC },
- { ATOM_dac3, MP4_ReadBox_dac3, MP4_FreeBox_Common },
- { ATOM_dvc1, MP4_ReadBox_dvc1, MP4_FreeBox_Common },
- { ATOM_enda, MP4_ReadBox_enda, MP4_FreeBox_Common },
- { ATOM_gnre, MP4_ReadBox_gnre, MP4_FreeBox_Common },
- { ATOM_trkn, MP4_ReadBox_trkn, MP4_FreeBox_Common },
- { ATOM_iods, MP4_ReadBox_iods, MP4_FreeBox_Common },
- { ATOM_pasp, MP4_ReadBox_pasp, MP4_FreeBox_Common },
+ { ATOM_ftyp, MP4_ReadBox_ftyp, MP4_FreeBox_ftyp, 0 },
+ { ATOM_cmov, MP4_ReadBox_cmov, MP4_FreeBox_Common, 0 },
+ { ATOM_mvhd, MP4_ReadBox_mvhd, MP4_FreeBox_Common, ATOM_moov },
+ { ATOM_mvhd, MP4_ReadBox_mvhd, MP4_FreeBox_Common, ATOM_foov },
+ { ATOM_tkhd, MP4_ReadBox_tkhd, MP4_FreeBox_Common, ATOM_trak },
+ { ATOM_mdhd, MP4_ReadBox_mdhd, MP4_FreeBox_Common, ATOM_mdia },
+ { ATOM_hdlr, MP4_ReadBox_hdlr, MP4_FreeBox_hdlr, ATOM_mdia },
+ { ATOM_hdlr, MP4_ReadBox_hdlr, MP4_FreeBox_hdlr, ATOM_meta },
+ { ATOM_hdlr, MP4_ReadBox_hdlr, MP4_FreeBox_hdlr, ATOM_minf },
+ { ATOM_vmhd, MP4_ReadBox_vmhd, MP4_FreeBox_Common, ATOM_minf },
+ { ATOM_smhd, MP4_ReadBox_smhd, MP4_FreeBox_Common, ATOM_minf },
+ { ATOM_hmhd, MP4_ReadBox_hmhd, MP4_FreeBox_Common, ATOM_minf },
+ { ATOM_alis, MP4_ReadBoxSkip, MP4_FreeBox_Common, ATOM_dref },
+ { ATOM_url, MP4_ReadBox_url, MP4_FreeBox_url, 0 },
+ { ATOM_urn, MP4_ReadBox_urn, MP4_FreeBox_urn, 0 },
+ { ATOM_dref, MP4_ReadBox_dref, MP4_FreeBox_Common, 0 },
+ { ATOM_stts, MP4_ReadBox_stts, MP4_FreeBox_stts, ATOM_stbl },
+ { ATOM_ctts, MP4_ReadBox_ctts, MP4_FreeBox_ctts, ATOM_stbl },
+ { ATOM_stsd, MP4_ReadBox_stsd, MP4_FreeBox_Common, ATOM_stbl },
+ { ATOM_stsz, MP4_ReadBox_stsz, MP4_FreeBox_stsz, ATOM_stbl },
+ { ATOM_stsc, MP4_ReadBox_stsc, MP4_FreeBox_stsc, ATOM_stbl },
+ { ATOM_stco, MP4_ReadBox_stco_co64, MP4_FreeBox_stco_co64, ATOM_stbl },
+ { ATOM_co64, MP4_ReadBox_stco_co64, MP4_FreeBox_stco_co64, ATOM_stbl },
+ { ATOM_stss, MP4_ReadBox_stss, MP4_FreeBox_stss, ATOM_stbl },
+ { ATOM_stsh, MP4_ReadBox_stsh, MP4_FreeBox_stsh, ATOM_stbl },
+ { ATOM_stdp, MP4_ReadBox_stdp, MP4_FreeBox_stdp, 0 },
+ { ATOM_padb, MP4_ReadBox_padb, MP4_FreeBox_padb, 0 },
+ { ATOM_elst, MP4_ReadBox_elst, MP4_FreeBox_elst, ATOM_edts },
+ { ATOM_cprt, MP4_ReadBox_cprt, MP4_FreeBox_cprt, 0 },
+ { ATOM_esds, MP4_ReadBox_esds, MP4_FreeBox_esds, ATOM_wave }, /* mp4a in wave chunk */
+ { ATOM_esds, MP4_ReadBox_esds, MP4_FreeBox_esds, ATOM_mp4a },
+ { ATOM_esds, MP4_ReadBox_esds, MP4_FreeBox_esds, ATOM_mp4v },
+ { ATOM_dcom, MP4_ReadBox_dcom, MP4_FreeBox_Common, 0 },
+ { ATOM_cmvd, MP4_ReadBox_cmvd, MP4_FreeBox_cmvd, 0 },
+ { ATOM_avcC, MP4_ReadBox_avcC, MP4_FreeBox_avcC, ATOM_avc1 },
+ { ATOM_hvcC, MP4_ReadBox_hvcC, MP4_FreeBox_hvcC, 0 },
+ { ATOM_dac3, MP4_ReadBox_dac3, MP4_FreeBox_Common, 0 },
+ { ATOM_dec3, MP4_ReadBox_dec3, MP4_FreeBox_Common, 0 },
+ { ATOM_dvc1, MP4_ReadBox_dvc1, MP4_FreeBox_Common, 0 },
+ { ATOM_enda, MP4_ReadBox_enda, MP4_FreeBox_Common, 0 },
+ { ATOM_iods, MP4_ReadBox_iods, MP4_FreeBox_Common, 0 },
+ { ATOM_pasp, MP4_ReadBox_pasp, MP4_FreeBox_Common, 0 },
/* Nothing to do with this box */
- { ATOM_mdat, MP4_ReadBoxSkip, MP4_FreeBox_Common },
- { ATOM_skip, MP4_ReadBoxSkip, MP4_FreeBox_Common },
- { ATOM_free, MP4_ReadBoxSkip, MP4_FreeBox_Common },
- { ATOM_wide, MP4_ReadBoxSkip, MP4_FreeBox_Common },
+ { ATOM_mdat, MP4_ReadBoxSkip, MP4_FreeBox_Common, 0 },
+ { ATOM_skip, MP4_ReadBoxSkip, MP4_FreeBox_Common, 0 },
+ { ATOM_free, MP4_ReadBoxSkip, MP4_FreeBox_Common, 0 },
+ { ATOM_wide, MP4_ReadBoxSkip, MP4_FreeBox_Common, 0 },
+ { ATOM_binm, MP4_ReadBoxSkip, MP4_FreeBox_Common, 0 },
/* Subtitles */
- { ATOM_tx3g, MP4_ReadBox_sample_tx3g, MP4_FreeBox_Common },
- //{ ATOM_text, MP4_ReadBox_sample_text, MP4_FreeBox_Common },
+ { ATOM_tx3g, MP4_ReadBox_sample_tx3g, MP4_FreeBox_Common, 0 },
+ //{ ATOM_text, MP4_ReadBox_sample_text, MP4_FreeBox_Common, 0 },
/* for codecs */
- { ATOM_soun, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { ATOM_lpcm, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { ATOM_ms02, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { ATOM_ms11, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { ATOM_ms55, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { ATOM__mp3, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { ATOM_mp4a, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { ATOM_twos, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { ATOM_sowt, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { ATOM_QDMC, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { ATOM_QDM2, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { ATOM_ima4, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { ATOM_IMA4, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { ATOM_dvi, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { ATOM_alaw, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { ATOM_ulaw, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { ATOM_raw, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { ATOM_MAC3, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { ATOM_MAC6, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { ATOM_Qclp, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { ATOM_samr, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { ATOM_sawb, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { ATOM_OggS, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { ATOM_alac, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
-
- { ATOM_drmi, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_vide, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_mp4v, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_SVQ1, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_SVQ3, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_ZyGo, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_DIVX, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_XVID, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_h263, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_s263, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_cvid, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_3IV1, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_3iv1, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_3IV2, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_3iv2, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_3IVD, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_3ivd, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_3VID, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_3vid, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_mjpa, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_mjpb, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_qdrw, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_mp2v, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_hdv2, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
-
- { ATOM_mjqt, MP4_ReadBox_default, NULL }, /* found in mjpa/b */
- { ATOM_mjht, MP4_ReadBox_default, NULL },
-
- { ATOM_dvc, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_dvp, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_dv5n, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_dv5p, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_VP31, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_vp31, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_h264, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
-
- { ATOM_jpeg, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_avc1, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
-
- { ATOM_yv12, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { ATOM_yuv2, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
-
- { ATOM_mp4s, MP4_ReadBox_sample_mp4s, MP4_FreeBox_Common },
+ { ATOM_soun, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, ATOM_stsd },
+ { ATOM_ac3, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, ATOM_stsd },
+ { ATOM_eac3, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, ATOM_stsd },
+ { ATOM_lpcm, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, ATOM_stsd },
+ { ATOM_ms02, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, ATOM_stsd },
+ { ATOM_ms11, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, ATOM_stsd },
+ { ATOM_ms55, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, ATOM_stsd },
+ { ATOM__mp3, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, ATOM_stsd },
+ { ATOM_mp4a, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, ATOM_stsd },
+ { ATOM_twos, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, ATOM_stsd },
+ { ATOM_sowt, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, ATOM_stsd },
+ { ATOM_QDMC, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, ATOM_stsd },
+ { ATOM_QDM2, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, ATOM_stsd },
+ { ATOM_ima4, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, ATOM_stsd },
+ { ATOM_IMA4, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, ATOM_stsd },
+ { ATOM_dvi, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, ATOM_stsd },
+ { ATOM_alaw, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, ATOM_stsd },
+ { ATOM_ulaw, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, ATOM_stsd },
+ { ATOM_raw, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, ATOM_stsd },
+ { ATOM_MAC3, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, ATOM_stsd },
+ { ATOM_MAC6, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, ATOM_stsd },
+ { ATOM_Qclp, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, ATOM_stsd },
+ { ATOM_samr, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, ATOM_stsd },
+ { ATOM_sawb, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, ATOM_stsd },
+ { ATOM_OggS, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, ATOM_stsd },
+ { ATOM_alac, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, ATOM_stsd },
+ { ATOM_WMA2, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, ATOM_stsd }, /* flip4mac */
+ /* Sound extensions */
+ { ATOM_chan, MP4_ReadBox_stsdext_chan, MP4_FreeBox_stsdext_chan, 0 },
+ { ATOM_WMA2, MP4_ReadBox_WMA2, MP4_FreeBox_WMA2, ATOM_wave }, /* flip4mac */
+
+ { ATOM_drmi, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_vide, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_mp4v, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_SVQ1, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_SVQ3, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_ZyGo, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_DIVX, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_XVID, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_h263, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_s263, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_cvid, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_3IV1, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_3iv1, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_3IV2, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_3iv2, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_3IVD, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_3ivd, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_3VID, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_3vid, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_mjpa, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_mjpb, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_qdrw, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_mp2v, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_hdv2, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_WMV3, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+
+ { ATOM_mjqt, MP4_ReadBox_default, NULL, 0 }, /* found in mjpa/b */
+ { ATOM_mjht, MP4_ReadBox_default, NULL, 0 },
+
+ { ATOM_dvc, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_dvp, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_dv5n, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_dv5p, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_VP31, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_vp31, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_h264, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+
+ { ATOM_jpeg, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+ { ATOM_avc1, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, ATOM_stsd },
+
+ { ATOM_yv12, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, 0 },
+ { ATOM_yuv2, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide, 0 },
+
+ { ATOM_strf, MP4_ReadBox_strf, MP4_FreeBox_strf, ATOM_WMV3 }, /* flip4mac */
+ { ATOM_ASF , MP4_ReadBox_ASF, MP4_FreeBox_Common, ATOM_WMV3 }, /* flip4mac */
+ { ATOM_ASF , MP4_ReadBox_ASF, MP4_FreeBox_Common, ATOM_wave }, /* flip4mac */
+
+ { ATOM_mp4s, MP4_ReadBox_sample_mp4s, MP4_FreeBox_Common, 0 },
/* XXX there is 2 box where we could find this entry stbl and tref*/
- { ATOM_hint, MP4_ReadBox_default, MP4_FreeBox_Common },
+ { ATOM_hint, MP4_ReadBox_default, MP4_FreeBox_Common, 0 },
/* found in tref box */
- { ATOM_dpnd, MP4_ReadBox_default, NULL },
- { ATOM_ipir, MP4_ReadBox_default, NULL },
- { ATOM_mpod, MP4_ReadBox_default, NULL },
- { ATOM_chap, MP4_ReadBox_tref_generic, MP4_FreeBox_tref_generic },
+ { ATOM_dpnd, MP4_ReadBox_default, NULL, 0 },
+ { ATOM_ipir, MP4_ReadBox_default, NULL, 0 },
+ { ATOM_mpod, MP4_ReadBox_default, NULL, 0 },
+ { ATOM_chap, MP4_ReadBox_tref_generic, MP4_FreeBox_tref_generic, 0 },
/* found in hnti */
- { ATOM_rtp, MP4_ReadBox_default, NULL },
-
- /* found in rmra */
- { ATOM_rdrf, MP4_ReadBox_rdrf, MP4_FreeBox_rdrf },
- { ATOM_rmdr, MP4_ReadBox_rmdr, MP4_FreeBox_Common },
- { ATOM_rmqu, MP4_ReadBox_rmqu, MP4_FreeBox_Common },
- { ATOM_rmvc, MP4_ReadBox_rmvc, MP4_FreeBox_Common },
-
- { ATOM_drms, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { ATOM_sinf, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { ATOM_schi, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { ATOM_user, MP4_ReadBox_drms, MP4_FreeBox_Common },
- { ATOM_key, MP4_ReadBox_drms, MP4_FreeBox_Common },
- { ATOM_iviv, MP4_ReadBox_drms, MP4_FreeBox_Common },
- { ATOM_priv, MP4_ReadBox_drms, MP4_FreeBox_Common },
- { ATOM_frma, MP4_ReadBox_frma, MP4_FreeBox_Common },
- { ATOM_skcr, MP4_ReadBox_skcr, MP4_FreeBox_Common },
+ { ATOM_rtp, MP4_ReadBox_default, NULL, 0 },
+
+ /* found in rmra/rmda */
+ { ATOM_rdrf, MP4_ReadBox_rdrf, MP4_FreeBox_rdrf , ATOM_rmda },
+ { ATOM_rmdr, MP4_ReadBox_rmdr, MP4_FreeBox_Common, ATOM_rmda },
+ { ATOM_rmqu, MP4_ReadBox_rmqu, MP4_FreeBox_Common, ATOM_rmda },
+ { ATOM_rmvc, MP4_ReadBox_rmvc, MP4_FreeBox_Common, ATOM_rmda },
+
+ { ATOM_drms, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun, 0 },
+ { ATOM_sinf, MP4_ReadBoxContainer, MP4_FreeBox_Common, 0 },
+ { ATOM_schi, MP4_ReadBoxContainer, MP4_FreeBox_Common, 0 },
+ { ATOM_user, MP4_ReadBox_drms, MP4_FreeBox_Common, 0 },
+ { ATOM_key, MP4_ReadBox_drms, MP4_FreeBox_Common, 0 },
+ { ATOM_iviv, MP4_ReadBox_drms, MP4_FreeBox_Common, 0 },
+ { ATOM_priv, MP4_ReadBox_drms, MP4_FreeBox_Common, 0 },
+ { ATOM_frma, MP4_ReadBox_frma, MP4_FreeBox_Common, ATOM_sinf }, /* and rinf */
+ { ATOM_frma, MP4_ReadBox_frma, MP4_FreeBox_Common, ATOM_wave }, /* flip4mac */
+ { ATOM_skcr, MP4_ReadBox_skcr, MP4_FreeBox_Common, 0 },
/* found in udta */
- { ATOM_0xa9nam, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9aut, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9cpy, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9swr, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9inf, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9ART, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9dir, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9cmt, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9req, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9day, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9des, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9fmt, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9prd, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9prf, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9src, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9alb, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9dis, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9enc, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9gen, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9trk, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9dsa, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9hst, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9url, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9ope, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9com, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9wrt, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9too, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9wrn, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9mak, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9mod, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9PRD, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9grp, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9lyr, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9gen, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9st3, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9ard, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9arg, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9cak, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9con, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9des, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9lnt, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9phg, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9pub, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9sne, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9sol, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9thx, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { ATOM_0xa9xpd, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
-
- { ATOM_chpl, MP4_ReadBox_chpl, MP4_FreeBox_chpl },
+ { ATOM_0xa9nam, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9aut, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9cpy, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9swr, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9inf, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9ART, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9dir, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9cmt, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9req, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9day, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9des, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9fmt, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9prd, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9prf, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9src, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9alb, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9dis, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9enc, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9gen, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9trk, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9dsa, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9hst, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9url, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9ope, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9com, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9wrt, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9too, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9wrn, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9mak, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9mod, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9PRD, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9grp, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9lyr, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9gen, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9st3, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9ard, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9arg, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9cak, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9con, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9des, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9lnt, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9phg, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9pub, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9sne, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9sol, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9thx, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_0xa9xpd, MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx, ATOM_ilst },
+ { ATOM_chpl, MP4_ReadBox_chpl, MP4_FreeBox_chpl, ATOM_udta },
+
+ { ATOM_gnre, MP4_ReadBox_gnre, MP4_FreeBox_Common, ATOM_ilst },
+ { ATOM_trkn, MP4_ReadBox_trkn, MP4_FreeBox_Common, ATOM_ilst },
/* iTunes/Quicktime meta info */
- { ATOM_meta, MP4_ReadBox_meta, MP4_FreeBox_Common },
- { ATOM_name, MP4_ReadBox_name, MP4_FreeBox_name },
- { ATOM_covr, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { ATOM_data, MP4_ReadBox_data, MP4_FreeBox_data },
+ { ATOM_meta, MP4_ReadBox_meta, MP4_FreeBox_Common, 0 },
+ { ATOM_name, MP4_ReadBox_name, MP4_FreeBox_name, 0 },
+ { ATOM_covr, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_ilst },
+ { ATOM_data, MP4_ReadBox_data, MP4_FreeBox_data, 0 },
/* found in smoothstreaming */
- { ATOM_traf, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { ATOM_mfra, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { ATOM_mfhd, MP4_ReadBox_mfhd, MP4_FreeBox_Common },
- { ATOM_sidx, MP4_ReadBox_sidx, MP4_FreeBox_sidx },
- { ATOM_tfhd, MP4_ReadBox_tfhd, MP4_FreeBox_Common },
- { ATOM_trun, MP4_ReadBox_trun, MP4_FreeBox_trun },
- { ATOM_trex, MP4_ReadBox_trex, MP4_FreeBox_Common },
- { ATOM_mehd, MP4_ReadBox_mehd, MP4_FreeBox_Common },
- { ATOM_sdtp, MP4_ReadBox_sdtp, MP4_FreeBox_sdtp },
- { ATOM_tfra, MP4_ReadBox_tfra, MP4_FreeBox_tfra },
- { ATOM_mfro, MP4_ReadBox_mfro, MP4_FreeBox_Common },
- { ATOM_uuid, MP4_ReadBox_uuid, MP4_FreeBox_uuid },
+ { ATOM_traf, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_moof },
+ { ATOM_mfra, MP4_ReadBoxContainer, MP4_FreeBox_Common, 0 },
+ { ATOM_mfhd, MP4_ReadBox_mfhd, MP4_FreeBox_Common, ATOM_moof },
+ { ATOM_sidx, MP4_ReadBox_sidx, MP4_FreeBox_sidx, 0 },
+ { ATOM_tfhd, MP4_ReadBox_tfhd, MP4_FreeBox_Common, ATOM_traf },
+ { ATOM_trun, MP4_ReadBox_trun, MP4_FreeBox_trun, ATOM_traf },
+ { ATOM_trex, MP4_ReadBox_trex, MP4_FreeBox_Common, ATOM_mvex },
+ { ATOM_mehd, MP4_ReadBox_mehd, MP4_FreeBox_Common, ATOM_mvex },
+ { ATOM_sdtp, MP4_ReadBox_sdtp, MP4_FreeBox_sdtp, 0 },
+ { ATOM_tfra, MP4_ReadBox_tfra, MP4_FreeBox_tfra, ATOM_mfra },
+ { ATOM_mfro, MP4_ReadBox_mfro, MP4_FreeBox_Common, ATOM_mfra },
+ { ATOM_uuid, MP4_ReadBox_uuid, MP4_FreeBox_uuid, 0 },
/* Last entry */
- { 0, MP4_ReadBox_default, NULL }
+ { 0, MP4_ReadBox_default, NULL, 0 }
};
/* Now search function to call */
for( i_index = 0; ; i_index++ )
{
+ if ( MP4_Box_Function[i_index].i_parent &&
+ p_box->p_father &&
+ p_box->p_father->i_type != MP4_Box_Function[i_index].i_parent )
+ continue;
+
if( ( MP4_Box_Function[i_index].i_type == p_box->i_type )||
( MP4_Box_Function[i_index].i_type == 0 ) )
{
return NULL;
}
+ p_box->pf_free = MP4_Box_Function[i_index].MP4_FreeBox_function;
+
return p_box;
}
*****************************************************************************/
void MP4_BoxFree( stream_t *s, MP4_Box_t *p_box )
{
- unsigned int i_index;
MP4_Box_t *p_child;
if( !p_box )
/* Now search function to call */
if( p_box->data.p_payload )
{
- for( i_index = 0; ; i_index++ )
- {
- if( ( MP4_Box_Function[i_index].i_type == p_box->i_type )||
- ( MP4_Box_Function[i_index].i_type == 0 ) )
- {
- break;
- }
- }
- if( MP4_Box_Function[i_index].MP4_FreeBox_function == NULL )
+ if (unlikely( p_box->pf_free == NULL ))
{
/* Should not happen */
if MP4_BOX_TYPE_ASCII()
}
else
{
- MP4_Box_Function[i_index].MP4_FreeBox_function( p_box );
+ p_box->pf_free( p_box );
}
free( p_box->data.p_payload );
}
}
if( MP4_BOX_TYPE_ASCII() )
snprintf( &str[i_level * 4], sizeof(str) - 4*i_level,
- "+ %4.4s size %"PRIu64" offset %ld",
- (char*)&p_box->i_type, p_box->i_size, p_box->i_pos );
+ "+ %4.4s size %"PRIu64" offset %ld%s",
+ (char*)&p_box->i_type, p_box->i_size, p_box->i_pos,
+ p_box->e_flags & BOX_FLAG_INCOMPLETE ? " (\?\?\?\?)" : "" );
else
snprintf( &str[i_level * 4], sizeof(str) - 4*i_level,
- "+ c%3.3s size %"PRIu64" offset %ld",
- (char*)&p_box->i_type+1, p_box->i_size, p_box->i_pos );
+ "+ c%3.3s size %"PRIu64" offset %ld%s",
+ (char*)&p_box->i_type+1, p_box->i_size, p_box->i_pos,
+ p_box->e_flags & BOX_FLAG_INCOMPLETE ? " (\?\?\?\?)" : "" );
msg_Dbg( s, "%s", str );
}
p_child = p_box->p_first;
projects / vlc / blobdiff