/*****************************************************************************
* libmp4.c : LibMP4 library for mp4 module for vlc
*****************************************************************************
- * Copyright (C) 2001-2004 the VideoLAN team
- * $Id$
+ * Copyright (C) 2001-2004, 2010 the VideoLAN team
*
* Author: Laurent Aimar <fenrir@via.ecp.fr>
*
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include <vlc/vlc.h>
-
-
+#include <vlc_common.h>
#include <vlc_demux.h>
#ifdef HAVE_ZLIB_H
/*****************************************************************************
* Here are defined some macro to make life simpler but before using it
- * *look* at the code.
+ * *look* at the code.
*
*****************************************************************************/
-#define MP4_BOX_HEADERSIZE( p_box ) \
- ( 8 + ( p_box->i_shortsize == 1 ? 8 : 0 ) \
- + ( p_box->i_type == FOURCC_uuid ? 16 : 0 ) )
+
+static inline size_t mp4_box_headersize( MP4_Box_t *p_box )
+{
+ return 8
+ + ( p_box->i_shortsize == 1 ? 8 : 0 )
+ + ( p_box->i_type == ATOM_uuid ? 16 : 0 );
+}
#define MP4_GETX_PRIVATE(dst, code, size) do { \
if( (i_read) >= (size) ) { dst = (code); p_peek += (size); } \
free( p_buff ); \
return( 0 ); \
} \
- p_peek += MP4_BOX_HEADERSIZE( p_box ); \
- i_read -= MP4_BOX_HEADERSIZE( p_box ); \
- if( !( p_box->data.p_data = malloc( sizeof( MP4_Box_data_TYPE_t ) ) ) ) \
+ p_peek += mp4_box_headersize( p_box ); \
+ i_read -= mp4_box_headersize( p_box ); \
+ if( !( p_box->data.p_data = calloc( 1, sizeof( MP4_Box_data_TYPE_t ) ) ) ) \
{ \
- free( p_buff ); \
- return( 0 ); \
+ free( p_buff ); \
+ return( 0 ); \
}
#define MP4_READBOX_EXIT( i_code ) \
/* Some assumptions:
- * The input method HAVE to be seekable
+ * The input method HAS to be seekable
*/
}
/* some functions for mp4 encoding of variables */
-
+#ifdef MP4_VERBOSE
static void MP4_ConvertDate2Str( char *psz, uint64_t i_date )
{
int i_day;
int i_sec;
/* date begin at 1 jan 1904 */
- i_date += ((I64C(1904) * 365) + 17) * 24 * 60 * 60;
+ i_date += ((INT64_C(1904) * 365) + 17) * 24 * 60 * 60;
i_day = i_date / ( 60*60*24);
i_hour = ( i_date /( 60*60 ) ) % 60;
i_sec = i_date % 60;
sprintf( psz, "%dd-%2.2dh:%2.2dm:%2.2ds", i_day, i_hour, i_min, i_sec );
}
+#endif
/*****************************************************************************
* Some prototypes.
/* XXX size of 0 means that the box extends to end of file */
}
- if( p_box->i_type == FOURCC_uuid )
+ if( p_box->i_type == ATOM_uuid )
{
/* get extented type on 16 bytes */
GetUUID( &p_box->i_uuid, p_peek );
if( p_box->i_size )
{
if MP4_BOX_TYPE_ASCII()
- msg_Dbg( p_stream, "found Box: %4.4s size "I64Fd,
+ msg_Dbg( p_stream, "found Box: %4.4s size %"PRId64,
(char*)&p_box->i_type, p_box->i_size );
else
- msg_Dbg( p_stream, "found Box: c%3.3s size "I64Fd,
+ msg_Dbg( p_stream, "found Box: c%3.3s size %"PRId64,
(char*)&p_box->i_type+1, p_box->i_size );
}
#endif
if( p_box->p_father )
{
- const int i_box_end = p_box->i_size + p_box->i_pos;
- const int i_father_end = p_box->p_father->i_size + p_box->p_father->i_pos;
+ const off_t i_box_end = p_box->i_size + p_box->i_pos;
+ const off_t i_father_end = p_box->p_father->i_size + p_box->p_father->i_pos;
/* check if it's within p-father */
if( i_box_end >= i_father_end )
static int MP4_ReadBoxContainer( stream_t *p_stream, MP4_Box_t *p_container )
{
- if( p_container->i_size <= (size_t)MP4_BOX_HEADERSIZE(p_container ) + 8 )
+ if( p_container->i_size <= (size_t)mp4_box_headersize(p_container ) + 8 )
{
/* container is empty, 8 stand for the first header in this box */
return 1;
/* enter box */
stream_Seek( p_stream, p_container->i_pos +
- MP4_BOX_HEADERSIZE( p_container ) );
+ mp4_box_headersize( p_container ) );
return MP4_ReadBoxContainerRaw( p_stream, p_container );
}
{
/* XXX sometime moov is hiden in a free box */
if( p_box->p_father &&
- p_box->p_father->i_type == VLC_FOURCC( 'r', 'o', 'o', 't' ) &&
- p_box->i_type == FOURCC_free )
+ p_box->p_father->i_type == ATOM_root &&
+ p_box->i_type == ATOM_free )
{
const uint8_t *p_peek;
int i_read;
i_read = stream_Peek( p_stream, &p_peek, 44 );
- p_peek += MP4_BOX_HEADERSIZE( p_box ) + 4;
- i_read -= MP4_BOX_HEADERSIZE( p_box ) + 4;
+ p_peek += mp4_box_headersize( p_box ) + 4;
+ i_read -= mp4_box_headersize( p_box ) + 4;
if( i_read >= 8 )
{
i_fcc = VLC_FOURCC( p_peek[0], p_peek[1], p_peek[2], p_peek[3] );
- if( i_fcc == FOURCC_cmov || i_fcc == FOURCC_mvhd )
+ if( i_fcc == ATOM_cmov || i_fcc == ATOM_mvhd )
{
msg_Warn( p_stream, "detected moov hidden in a free box ..." );
- p_box->i_type = FOURCC_foov;
+ p_box->i_type = ATOM_foov;
return MP4_ReadBoxContainer( p_stream, p_box );
}
}
MP4_READBOX_EXIT( 1 );
}
+static int MP4_ReadBox_mfhd( stream_t *p_stream, MP4_Box_t *p_box )
+{
+ MP4_READBOX_ENTER( MP4_Box_data_mfhd_t );
+
+ MP4_GET4BYTES( p_box->data.p_mfhd->i_sequence_number );
+
+#ifdef MP4_VERBOSE
+ msg_Dbg( p_stream, "read box: \"mfhd\" sequence number %d",
+ p_box->data.p_mfhd->i_sequence_number );
+#endif
+ MP4_READBOX_EXIT( 1 );
+}
+
+static int MP4_ReadBox_tfhd( stream_t *p_stream, MP4_Box_t *p_box )
+{
+ MP4_READBOX_ENTER( MP4_Box_data_tfhd_t );
+
+ MP4_GETVERSIONFLAGS( p_box->data.p_tfhd );
+
+ MP4_GET4BYTES( p_box->data.p_tfhd->i_track_ID );
+
+ if( p_box->data.p_tfhd->i_version == 0 )
+ {
+ if( p_box->data.p_tfhd->i_flags & MP4_TFHD_BASE_DATA_OFFSET )
+ MP4_GET8BYTES( p_box->data.p_tfhd->i_base_data_offset );
+ if( p_box->data.p_tfhd->i_flags & MP4_TFHD_SAMPLE_DESC_INDEX )
+ MP4_GET4BYTES( p_box->data.p_tfhd->i_sample_description_index );
+ if( p_box->data.p_tfhd->i_flags & MP4_TFHD_DFLT_SAMPLE_DURATION )
+ MP4_GET4BYTES( p_box->data.p_tfhd->i_default_sample_duration );
+ if( p_box->data.p_tfhd->i_flags & MP4_TFHD_DFLT_SAMPLE_SIZE )
+ MP4_GET4BYTES( p_box->data.p_tfhd->i_default_sample_size );
+ if( p_box->data.p_tfhd->i_flags & MP4_TFHD_DFLT_SAMPLE_FLAGS )
+ MP4_GET4BYTES( p_box->data.p_tfhd->i_default_sample_flags );
+
+#ifdef MP4_VERBOSE
+ char psz_base[128] = "\0";
+ char psz_desc[128] = "\0";
+ char psz_dura[128] = "\0";
+ char psz_size[128] = "\0";
+ char psz_flag[128] = "\0";
+ if( p_box->data.p_tfhd->i_flags & MP4_TFHD_BASE_DATA_OFFSET )
+ snprintf(psz_base, sizeof(psz_base), "base offset %"PRId64, p_box->data.p_tfhd->i_base_data_offset);
+ if( p_box->data.p_tfhd->i_flags & MP4_TFHD_SAMPLE_DESC_INDEX )
+ snprintf(psz_desc, sizeof(psz_desc), "sample description index %d", p_box->data.p_tfhd->i_sample_description_index);
+ if( p_box->data.p_tfhd->i_flags & MP4_TFHD_DFLT_SAMPLE_DURATION )
+ snprintf(psz_dura, sizeof(psz_dura), "sample duration %d", p_box->data.p_tfhd->i_default_sample_duration);
+ if( p_box->data.p_tfhd->i_flags & MP4_TFHD_DFLT_SAMPLE_SIZE )
+ snprintf(psz_size, sizeof(psz_size), "sample size %d", p_box->data.p_tfhd->i_default_sample_size);
+ if( p_box->data.p_tfhd->i_flags & MP4_TFHD_DFLT_SAMPLE_FLAGS )
+ snprintf(psz_flag, sizeof(psz_flag), "sample flags 0x%x", p_box->data.p_tfhd->i_default_sample_flags);
+
+ msg_Dbg( p_stream, "read box: \"tfhd\" version %d flags 0x%x track ID %d %s %s %s %s %s",
+ p_box->data.p_tfhd->i_version,
+ p_box->data.p_tfhd->i_flags,
+ p_box->data.p_tfhd->i_track_ID,
+ psz_base, psz_desc, psz_dura, psz_size, psz_flag );
+#endif
+ }
+
+ MP4_READBOX_EXIT( 1 );
+}
+
+static int MP4_ReadBox_trun( stream_t *p_stream, MP4_Box_t *p_box )
+{
+ MP4_READBOX_ENTER( MP4_Box_data_trun_t );
+
+ MP4_GETVERSIONFLAGS( p_box->data.p_trun );
+
+ MP4_GET4BYTES( p_box->data.p_trun->i_sample_count );
+
+ if( p_box->data.p_trun->i_flags & MP4_TRUN_DATA_OFFSET )
+ MP4_GET4BYTES( p_box->data.p_trun->i_data_offset );
+ if( p_box->data.p_trun->i_flags & MP4_TRUN_FIRST_FLAGS )
+ MP4_GET4BYTES( p_box->data.p_trun->i_first_sample_flags );
+
+ p_box->data.p_trun->p_samples =
+ calloc( p_box->data.p_trun->i_sample_count, sizeof(MP4_descriptor_trun_sample_t) );
+ if ( p_box->data.p_trun->p_samples == NULL )
+ MP4_READBOX_EXIT( 0 );
+
+ for( unsigned int i = 0; i<p_box->data.p_trun->i_sample_count; i++ )
+ {
+ MP4_descriptor_trun_sample_t *p_sample = &p_box->data.p_trun->p_samples[i];
+ if( p_box->data.p_trun->i_flags & MP4_TRUN_SAMPLE_DURATION )
+ MP4_GET4BYTES( p_sample->i_duration );
+ if( p_box->data.p_trun->i_flags & MP4_TRUN_SAMPLE_SIZE )
+ MP4_GET4BYTES( p_sample->i_size );
+ if( p_box->data.p_trun->i_flags & MP4_TRUN_SAMPLE_FLAGS )
+ MP4_GET4BYTES( p_sample->i_flags );
+ if( p_box->data.p_trun->i_flags & MP4_TRUN_SAMPLE_TIME_OFFSET )
+ MP4_GET4BYTES( p_sample->i_composition_time_offset );
+ }
+
+#ifdef MP4_VERBOSE
+ msg_Dbg( p_stream, "read box: \"trun\" version %d flags 0x%x sample count %d",
+ p_box->data.p_trun->i_version,
+ p_box->data.p_trun->i_flags,
+ p_box->data.p_trun->i_sample_count );
+
+ for( unsigned int i = 0; i<p_box->data.p_trun->i_sample_count; i++ )
+ {
+ MP4_descriptor_trun_sample_t *p_sample = &p_box->data.p_trun->p_samples[i];
+ msg_Dbg( p_stream, "read box: \"trun\" sample %4.4d flags 0x%x duration %d size %d composition time offset %d",
+ i, p_sample->i_flags, p_sample->i_duration,
+ p_sample->i_size, p_sample->i_composition_time_offset );
+ }
+#endif
+
+ MP4_READBOX_EXIT( 1 );
+}
+
+static void MP4_FreeBox_trun( MP4_Box_t *p_box )
+{
+ FREENULL( p_box->data.p_trun->p_samples );
+}
+
+
+
static int MP4_ReadBox_tkhd( stream_t *p_stream, MP4_Box_t *p_box )
{
unsigned int i;
MP4_GET4BYTES( p_box->data.p_mdhd->i_timescale );
MP4_GET4BYTES( p_box->data.p_mdhd->i_duration );
}
- i_language = GetWBE( p_peek );
+ p_box->data.p_mdhd->i_language_code = i_language = GetWBE( p_peek );
for( i = 0; i < 3; i++ )
{
p_box->data.p_mdhd->i_language[i] =
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream, "read box: \"hdlr\" handler type %4.4s name %s",
+ msg_Dbg( p_stream, "read box: \"hdlr\" handler type: \"%4.4s\" name: \"%s\"",
(char*)&p_box->data.p_hdlr->i_handler_type,
p_box->data.p_hdlr->psz_name );
MP4_GET4BYTES( p_box->data.p_dref->i_entry_count );
- stream_Seek( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) + 8 );
+ stream_Seek( p_stream, p_box->i_pos + mp4_box_headersize( p_box ) + 8 );
MP4_ReadBoxContainerRaw( p_stream, p_box );
#ifdef MP4_VERBOSE
if( p_box->data.p_stts->i_sample_count == NULL
|| p_box->data.p_stts->i_sample_delta == NULL )
{
- MP4_FreeBox_stts( p_box );
MP4_READBOX_EXIT( 0 );
}
if( ( p_box->data.p_ctts->i_sample_count == NULL )
|| ( p_box->data.p_ctts->i_sample_offset == NULL ) )
{
- MP4_FreeBox_ctts( p_box );
MP4_READBOX_EXIT( 0 );
}
unsigned int i_len;
unsigned int i_flags;
unsigned int i_type;
- unsigned int code = 0;
MP4_READBOX_ENTER( MP4_Box_data_esds_t );
#endif
es_descriptor.p_decConfigDescr =
- malloc( sizeof( MP4_descriptor_decoder_config_t ));
+ calloc( 1, sizeof( MP4_descriptor_decoder_config_t ));
if( es_descriptor.p_decConfigDescr == NULL )
- {
- free( es_descriptor.psz_URL );
- goto error;
- }
+ MP4_READBOX_EXIT( 0 );
MP4_GET1BYTE( es_descriptor.p_decConfigDescr->i_objectTypeIndication );
MP4_GET1BYTE( i_flags );
msg_Dbg( p_stream, "found esds MP4DecSpecificDescr (%dBytes)",
i_len );
#endif
+ if( i_len > i_read )
+ MP4_READBOX_EXIT( 0 );
es_descriptor.p_decConfigDescr->i_decoder_specific_info_len = i_len;
es_descriptor.p_decConfigDescr->p_decoder_specific_info = malloc( i_len );
if( es_descriptor.p_decConfigDescr->p_decoder_specific_info == NULL )
- {
- MP4_FreeBox_esds( p_box );
- goto error;
- }
+ MP4_READBOX_EXIT( 0 );
+
memcpy( es_descriptor.p_decConfigDescr->p_decoder_specific_info,
p_peek, i_len );
- code = 1;
-
-error:
- MP4_READBOX_EXIT( code );
+ MP4_READBOX_EXIT( 1 );
#undef es_descriptor
}
+static void MP4_FreeBox_avcC( MP4_Box_t *p_box )
+{
+ MP4_Box_data_avcC_t *p_avcC = p_box->data.p_avcC;
+ int i;
+
+ if( p_avcC->i_avcC > 0 ) FREENULL( p_avcC->p_avcC );
+
+ if( p_avcC->sps )
+ {
+ for( i = 0; i < p_avcC->i_sps; i++ )
+ FREENULL( p_avcC->sps[i] );
+ }
+ if( p_avcC->pps )
+ {
+ for( i = 0; i < p_avcC->i_pps; i++ )
+ FREENULL( p_avcC->pps[i] );
+ }
+ if( p_avcC->i_sps > 0 ) FREENULL( p_avcC->sps );
+ if( p_avcC->i_sps > 0 ) FREENULL( p_avcC->i_sps_length );
+ if( p_avcC->i_pps > 0 ) FREENULL( p_avcC->pps );
+ if( p_avcC->i_pps > 0 ) FREENULL( p_avcC->i_pps_length );
+}
static int MP4_ReadBox_avcC( stream_t *p_stream, MP4_Box_t *p_box )
{
if( p_avcC->i_sps > 0 )
{
- p_avcC->i_sps_length = malloc( p_avcC->i_sps * sizeof( uint16_t ) );
- p_avcC->sps = malloc( p_avcC->i_sps * sizeof( uint8_t* ) );
+ p_avcC->i_sps_length = calloc( p_avcC->i_sps, sizeof( uint16_t ) );
+ p_avcC->sps = calloc( p_avcC->i_sps, sizeof( uint8_t* ) );
+
+ if( !p_avcC->i_sps_length || !p_avcC->sps )
+ goto error;
for( i = 0; i < p_avcC->i_sps; i++ )
{
MP4_GET2BYTES( p_avcC->i_sps_length[i] );
p_avcC->sps[i] = malloc( p_avcC->i_sps_length[i] );
- memcpy( p_avcC->sps[i], p_peek, 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];
MP4_GET1BYTE( p_avcC->i_pps );
if( p_avcC->i_pps > 0 )
{
- p_avcC->i_pps_length = malloc( p_avcC->i_pps * sizeof( uint16_t ) );
- p_avcC->pps = malloc( p_avcC->i_pps * sizeof( uint8_t* ) );
+ p_avcC->i_pps_length = calloc( p_avcC->i_pps, sizeof( uint16_t ) );
+ p_avcC->pps = calloc( p_avcC->i_pps, sizeof( uint8_t* ) );
+
+ if( !p_avcC->i_pps_length || !p_avcC->pps )
+ goto error;
for( i = 0; i < p_avcC->i_pps; i++ )
{
MP4_GET2BYTES( p_avcC->i_pps_length[i] );
p_avcC->pps[i] = malloc( p_avcC->i_pps_length[i] );
- memcpy( p_avcC->pps[i], p_peek, 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];
#endif
MP4_READBOX_EXIT( 1 );
+
+error:
+ MP4_READBOX_EXIT( 0 );
}
-static void MP4_FreeBox_avcC( MP4_Box_t *p_box )
+static int MP4_ReadBox_dac3( stream_t *p_stream, MP4_Box_t *p_box )
{
- MP4_Box_data_avcC_t *p_avcC = p_box->data.p_avcC;
- int i;
+ MP4_Box_data_dac3_t *p_dac3;
+ MP4_READBOX_ENTER( MP4_Box_data_dac3_t );
- if( p_avcC->i_avcC > 0 ) FREENULL( p_avcC->p_avcC );
+ p_dac3 = p_box->data.p_dac3;
- for( i = 0; i < p_avcC->i_sps; i++ )
- {
- FREENULL( p_avcC->sps[i] );
- }
- for( i = 0; i < p_avcC->i_pps; i++ )
+ unsigned i_header;
+ MP4_GET3BYTES( i_header );
+
+ p_dac3->i_fscod = ( i_header >> 22 ) & 0x03;
+ p_dac3->i_bsid = ( i_header >> 17 ) & 0x01f;
+ p_dac3->i_bsmod = ( i_header >> 14 ) & 0x07;
+ p_dac3->i_acmod = ( i_header >> 11 ) & 0x07;
+ p_dac3->i_lfeon = ( i_header >> 10 ) & 0x01;
+ p_dac3->i_bitrate_code = ( i_header >> 5) & 0x1f;
+
+#ifdef MP4_VERBOSE
+ msg_Dbg( p_stream,
+ "read box: \"dac3\" fscod=0x%x bsid=0x%x bsmod=0x%x acmod=0x%x lfeon=0x%x bitrate_code=0x%x",
+ p_dac3->i_fscod, p_dac3->i_bsid, p_dac3->i_bsmod, p_dac3->i_acmod, p_dac3->i_lfeon, p_dac3->i_bitrate_code );
+#endif
+ MP4_READBOX_EXIT( 1 );
+}
+
+static int MP4_ReadBox_enda( stream_t *p_stream, MP4_Box_t *p_box )
+{
+ MP4_Box_data_enda_t *p_enda;
+ MP4_READBOX_ENTER( MP4_Box_data_enda_t );
+
+ p_enda = p_box->data.p_enda;
+
+ MP4_GET2BYTES( p_enda->i_little_endian );
+
+#ifdef MP4_VERBOSE
+ msg_Dbg( p_stream,
+ "read box: \"enda\" little_endian=%d", p_enda->i_little_endian );
+#endif
+ MP4_READBOX_EXIT( 1 );
+}
+
+static int MP4_ReadBox_gnre( stream_t *p_stream, MP4_Box_t *p_box )
+{
+ MP4_Box_data_gnre_t *p_gnre;
+ MP4_READBOX_ENTER( MP4_Box_data_gnre_t );
+
+ p_gnre = p_box->data.p_gnre;
+
+ uint32_t i_data_len;
+ uint32_t i_data_tag;
+
+ MP4_GET4BYTES( i_data_len );
+ MP4_GETFOURCC( i_data_tag );
+ if( i_data_len < 10 || i_data_tag != ATOM_data )
+ MP4_READBOX_EXIT( 0 );
+
+ uint32_t i_version;
+ uint32_t i_reserved;
+ MP4_GET4BYTES( i_version );
+ MP4_GET4BYTES( i_reserved );
+ MP4_GET2BYTES( p_gnre->i_genre );
+ if( p_gnre->i_genre == 0 )
+ MP4_READBOX_EXIT( 0 );
+#ifdef MP4_VERBOSE
+ msg_Dbg( p_stream, "read box: \"gnre\" genre=%i", p_gnre->i_genre );
+#endif
+
+ MP4_READBOX_EXIT( 1 );
+}
+
+static int MP4_ReadBox_trkn( stream_t *p_stream, MP4_Box_t *p_box )
+{
+ MP4_Box_data_trkn_t *p_trkn;
+ MP4_READBOX_ENTER( MP4_Box_data_trkn_t );
+
+ p_trkn = p_box->data.p_trkn;
+
+ uint32_t i_data_len;
+ uint32_t i_data_tag;
+
+ MP4_GET4BYTES( i_data_len );
+ MP4_GETFOURCC( i_data_tag );
+ if( i_data_len < 12 || i_data_tag != ATOM_data )
+ MP4_READBOX_EXIT( 0 );
+
+ uint32_t i_version;
+ uint32_t i_reserved;
+ MP4_GET4BYTES( i_version );
+ MP4_GET4BYTES( i_reserved );
+ MP4_GET4BYTES( p_trkn->i_track_number );
+#ifdef MP4_VERBOSE
+ msg_Dbg( p_stream, "read box: \"trkn\" number=%i", p_trkn->i_track_number );
+#endif
+ if( i_data_len > 15 )
{
- FREENULL( p_avcC->pps[i] );
+ MP4_GET4BYTES( p_trkn->i_track_total );
+#ifdef MP4_VERBOSE
+ msg_Dbg( p_stream, "read box: \"trkn\" total=%i", p_trkn->i_track_total );
+#endif
}
- if( p_avcC->i_sps > 0 ) FREENULL( p_avcC->sps );
- if( p_avcC->i_sps > 0 ) FREENULL( p_avcC->i_sps_length );
- if( p_avcC->i_pps > 0 ) FREENULL( p_avcC->pps );
- if( p_avcC->i_pps > 0 ) FREENULL( p_avcC->i_pps_length );
+
+ MP4_READBOX_EXIT( 1 );
}
+
static int MP4_ReadBox_sample_soun( stream_t *p_stream, MP4_Box_t *p_box )
{
unsigned int i;
/*
* XXX hack -> produce a copy of the nearly complete chunk
*/
+ p_box->data.p_sample_soun->i_qt_description = 0;
+ p_box->data.p_sample_soun->p_qt_description = NULL;
if( i_read > 0 )
{
p_box->data.p_sample_soun->p_qt_description = malloc( i_read );
- if( p_box->data.p_sample_soun->p_qt_description == NULL )
- MP4_READBOX_EXIT( 0 );
- p_box->data.p_sample_soun->i_qt_description = i_read;
- memcpy( p_box->data.p_sample_soun->p_qt_description, p_peek, i_read );
- }
- else
- {
- p_box->data.p_sample_soun->i_qt_description = 0;
- p_box->data.p_sample_soun->p_qt_description = NULL;
+ if( p_box->data.p_sample_soun->p_qt_description )
+ {
+ p_box->data.p_sample_soun->i_qt_description = i_read;
+ memcpy( p_box->data.p_sample_soun->p_qt_description, p_peek, i_read );
+ }
}
MP4_GET2BYTES( p_box->data.p_sample_soun->i_qt_version );
p_box->data.p_sample_soun->i_bytes_per_sample );
#endif
stream_Seek( p_stream, p_box->i_pos +
- MP4_BOX_HEADERSIZE( p_box ) + 44 );
+ mp4_box_headersize( p_box ) + 44 );
}
else if( p_box->data.p_sample_soun->i_qt_version == 2 && i_read >= 36 )
{
/* SoundDescriptionV2 */
double f_sample_rate;
- int64_t dummy;
+ int64_t dummy;
uint32_t i_channel;
MP4_GET4BYTES( p_box->data.p_sample_soun->i_sample_per_packet );
MP4_GET8BYTES( dummy );
- memcpy( &f_sample_rate, &dummy, 8 );
+ memcpy( &f_sample_rate, &dummy, 8 );
msg_Dbg( p_stream, "read box: %f Hz", f_sample_rate );
p_box->data.p_sample_soun->i_sampleratehi = (int)f_sample_rate % 65536;
msg_Dbg( p_stream, "read box: \"soun\" V2" );
#endif
stream_Seek( p_stream, p_box->i_pos +
- MP4_BOX_HEADERSIZE( p_box ) + 28 + 36 );
+ mp4_box_headersize( p_box ) + 28 + 36 );
}
else
{
p_box->data.p_sample_soun->i_bytes_per_frame = 0;
p_box->data.p_sample_soun->i_bytes_per_sample = 0;
- msg_Dbg( p_stream, "read box: \"soun\" mp4 or qt1/2 (rest="I64Fd")",
+#ifdef MP4_VERBOSE
+ msg_Dbg( p_stream, "read box: \"soun\" mp4 or qt1/2 (rest=%"PRId64")",
i_read );
+#endif
stream_Seek( p_stream, p_box->i_pos +
- MP4_BOX_HEADERSIZE( p_box ) + 28 );
+ mp4_box_headersize( p_box ) + 28 );
}
- if( p_box->i_type == FOURCC_drms )
+ if( p_box->i_type == ATOM_drms )
{
- p_box->data.p_sample_soun->p_drms =
- drms_alloc( p_stream->p_libvlc->psz_homedir );
-
- if( p_box->data.p_sample_soun->p_drms == NULL )
+ char *home = config_GetUserDir( VLC_HOME_DIR );
+ if( home != NULL )
{
- msg_Err( p_stream, "drms_alloc() failed" );
+ p_box->data.p_sample_soun->p_drms = drms_alloc( home );
+ if( p_box->data.p_sample_soun->p_drms == NULL )
+ msg_Err( p_stream, "drms_alloc() failed" );
}
}
- if( p_box->i_type == FOURCC_samr || p_box->i_type == FOURCC_sawb )
+ if( p_box->i_type == ATOM_samr || p_box->i_type == ATOM_sawb )
{
/* Ignore channelcount for AMR (3gpp AMRSpecificBox) */
p_box->data.p_sample_soun->i_channelcount = 1;
}
- if( p_box->i_type == FOURCC_alac )
- {
- free( p_box->data.p_sample_soun->p_qt_description );
-
- p_box->data.p_sample_soun->p_qt_description = malloc( i_read );
- if( p_box->data.p_sample_soun->p_qt_description == NULL )
- MP4_READBOX_EXIT( 0 );
- p_box->data.p_sample_soun->i_qt_description = i_read;
- memcpy( p_box->data.p_sample_soun->p_qt_description, p_peek, i_read );
- }
- else
- {
- MP4_ReadBoxContainerRaw( p_stream, p_box ); /* esds */
- }
+ MP4_ReadBoxContainerRaw( p_stream, p_box ); /* esds/wave/... */
#ifdef MP4_VERBOSE
msg_Dbg( p_stream, "read box: \"soun\" in stsd channel %d "
{
FREENULL( p_box->data.p_sample_soun->p_qt_description );
- if( p_box->i_type == FOURCC_drms )
+ if( p_box->i_type == ATOM_drms )
{
if( p_box->data.p_sample_soun->p_drms )
{
MP4_GET2BYTES( p_box->data.p_sample_vide->i_depth );
MP4_GET2BYTES( p_box->data.p_sample_vide->i_qt_color_table );
- stream_Seek( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) + 78);
+ stream_Seek( p_stream, p_box->i_pos + mp4_box_headersize( p_box ) + 78);
+
+ if( p_box->i_type == ATOM_drmi )
+ {
+ char *home = config_GetUserDir( VLC_HOME_DIR );
+ if( home != NULL )
+ {
+ p_box->data.p_sample_vide->p_drms = drms_alloc( home );
+ if( p_box->data.p_sample_vide->p_drms == NULL )
+ msg_Err( p_stream, "drms_alloc() failed" );
+ }
+ }
+
MP4_ReadBoxContainerRaw( p_stream, p_box );
#ifdef MP4_VERBOSE
void MP4_FreeBox_sample_vide( MP4_Box_t *p_box )
{
FREENULL( p_box->data.p_sample_vide->p_qt_image_description );
+
+ if( p_box->i_type == ATOM_drmi )
+ {
+ if( p_box->data.p_sample_vide->p_drms )
+ {
+ drms_free( p_box->data.p_sample_vide->p_drms );
+ }
+ }
}
static int MP4_ReadBox_sample_mp4s( stream_t *p_stream, MP4_Box_t *p_box )
{
- stream_Seek( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) + 8 );
+ stream_Seek( p_stream, p_box->i_pos + mp4_box_headersize( p_box ) + 8 );
MP4_ReadBoxContainerRaw( p_stream, p_box );
return 1;
}
MP4_GET2BYTES( p_box->data.p_sample_text->i_text_box_right );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream, "read box: \"text\" in stsd text" );
+ msg_Dbg( p_stream, "read box: \"tx3g\" in stsd text" );
#endif
MP4_READBOX_EXIT( 1 );
}
MP4_GET4BYTES( p_box->data.p_stsd->i_entry_count );
- stream_Seek( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) + 8 );
+ stream_Seek( p_stream, p_box->i_pos + mp4_box_headersize( p_box ) + 8 );
MP4_ReadBoxContainerRaw( p_stream, p_box );
|| p_box->data.p_stsc->i_samples_per_chunk == NULL
|| p_box->data.p_stsc->i_sample_description_index == NULL )
{
- MP4_FreeBox_stsc( p_box );
MP4_READBOX_EXIT( 0 );
}
for( i = 0; i < p_box->data.p_co64->i_entry_count; i++ )
{
- if( p_box->i_type == FOURCC_stco )
+ if( p_box->i_type == ATOM_stco )
{
if( i_read < 4 )
{
if( p_box->data.p_stsh->i_shadowed_sample_number == NULL
|| p_box->data.p_stsh->i_sync_sample_number == NULL )
{
- MP4_FreeBox_stsh( p_box );
MP4_READBOX_EXIT( 0 );
}
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream, "read box: \"stdp\" entry-count "I64Fd,
+ msg_Dbg( p_stream, "read box: \"stdp\" entry-count %"PRId64,
i_read / 2 );
#endif
|| p_box->data.p_padb->i_reserved2 == NULL
|| p_box->data.p_padb->i_pad1 == NULL )
{
- MP4_FreeBox_padb( p_box );
MP4_READBOX_EXIT( 0 );
}
{
if( i >= count )
{
- MP4_FreeBox_padb( p_box );
MP4_READBOX_EXIT( 0 );
}
p_box->data.p_padb->i_reserved1[i] = ( (*p_peek) >> 7 )&0x01;
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream, "read box: \"stdp\" entry-count "I64Fd,
+ msg_Dbg( p_stream, "read box: \"stdp\" entry-count %"PRId64,
i_read / 2 );
#endif
|| p_box->data.p_elst->i_media_rate_integer == NULL
|| p_box->data.p_elst->i_media_rate_fraction == NULL )
{
- MP4_FreeBox_elst( p_box );
MP4_READBOX_EXIT( 0 );
}
p_box->data.p_cmvd->i_compressed_size = i_read;
if( !( p_box->data.p_cmvd->p_data = malloc( i_read ) ) )
- {
- msg_Dbg( p_stream, "read box: \"cmvd\" not enough memory to load data" );
return( 1 );
- }
/* now copy compressed data */
memcpy( p_box->data.p_cmvd->p_data,
#endif
if( !( p_box->data.p_cmov = malloc( sizeof( MP4_Box_data_cmov_t ) ) ) )
- {
- msg_Err( p_stream, "out of memory" );
return 0;
- }
memset( p_box->data.p_cmov, 0, sizeof( MP4_Box_data_cmov_t ) );
if( !p_box->p_father ||
- ( p_box->p_father->i_type != FOURCC_moov &&
- p_box->p_father->i_type != FOURCC_foov ) )
+ ( p_box->p_father->i_type != ATOM_moov &&
+ p_box->p_father->i_type != ATOM_foov ) )
{
msg_Warn( p_stream, "Read box: \"cmov\" box alone" );
return 1;
p_cmvd->data.p_cmvd->p_data == NULL )
{
msg_Warn( p_stream, "read box: \"cmov\" incomplete" );
- return 1;
+ return 0;
}
- if( p_dcom->data.p_dcom->i_algorithm != FOURCC_zlib )
+ if( p_dcom->data.p_dcom->i_algorithm != ATOM_zlib )
{
msg_Dbg( p_stream, "read box: \"cmov\" compression algorithm : %4.4s "
"not supported", (char*)&p_dcom->data.p_dcom->i_algorithm );
- return 1;
+ return 0;
}
#ifndef HAVE_ZLIB_H
msg_Dbg( p_stream, "read box: \"cmov\" zlib unsupported" );
- return 1;
+ return 0;
#else
/* decompress data */
/* allocate a new buffer */
if( !( p_data = malloc( p_cmvd->data.p_cmvd->i_uncompressed_size ) ) )
- {
- msg_Err( p_stream, "read box: \"cmov\" not enough memory to "
- "uncompress data" );
- return 1;
- }
+ return 0;
/* init default structures */
z_data.next_in = p_cmvd->data.p_cmvd->p_data;
z_data.avail_in = p_cmvd->data.p_cmvd->i_compressed_size;
{
msg_Err( p_stream, "read box: \"cmov\" error while uncompressing" );
free( p_data );
- return 1;
+ return 0;
}
/* uncompress */
{
msg_Err( p_stream, "read box: \"cmov\" error while uncompressing" );
free( p_data );
- return 1;
+ return 0;
}
if( p_cmvd->data.p_cmvd->i_uncompressed_size != z_data.total_out )
p_cmvd->data.p_cmvd->p_data = p_data;
p_cmvd->data.p_cmvd->b_compressed = 0;
- msg_Dbg( p_stream, "read box: \"cmov\" box succesfully uncompressed" );
+ msg_Dbg( p_stream, "read box: \"cmov\" box successfully uncompressed" );
/* now create a memory stream */
p_stream_memory =
MP4_READBOX_EXIT( 1 );
}
+static int MP4_ReadBox_frma( stream_t *p_stream, MP4_Box_t *p_box )
+{
+ MP4_READBOX_ENTER( MP4_Box_data_frma_t );
+
+ MP4_GETFOURCC( p_box->data.p_frma->i_type );
+
+#ifdef MP4_VERBOSE
+ msg_Dbg( p_stream, "read box: \"frma\" i_type:%4.4s",
+ (char *)&p_box->data.p_frma->i_type );
+#endif
+
+ MP4_READBOX_EXIT( 1 );
+}
+
+static int MP4_ReadBox_skcr( stream_t *p_stream, MP4_Box_t *p_box )
+{
+ MP4_READBOX_ENTER( MP4_Box_data_skcr_t );
+
+ MP4_GET4BYTES( p_box->data.p_skcr->i_init );
+ MP4_GET4BYTES( p_box->data.p_skcr->i_encr );
+ MP4_GET4BYTES( p_box->data.p_skcr->i_decr );
+
+#ifdef MP4_VERBOSE
+ msg_Dbg( p_stream, "read box: \"skcr\" i_init:%d i_encr:%d i_decr:%d",
+ p_box->data.p_skcr->i_init,
+ p_box->data.p_skcr->i_encr,
+ p_box->data.p_skcr->i_decr );
+#endif
+
+ MP4_READBOX_EXIT( 1 );
+}
+
static int MP4_ReadBox_drms( stream_t *p_stream, MP4_Box_t *p_box )
{
MP4_Box_t *p_drms_box = p_box;
+ void *p_drms = NULL;
MP4_READBOX_ENTER( uint8_t );
do
{
p_drms_box = p_drms_box->p_father;
- } while( p_drms_box && p_drms_box->i_type != FOURCC_drms );
+ } while( p_drms_box && p_drms_box->i_type != ATOM_drms
+ && p_drms_box->i_type != ATOM_drmi );
- if( p_drms_box && p_drms_box->data.p_sample_soun->p_drms )
+ if( p_drms_box && p_drms_box->i_type == ATOM_drms )
+ p_drms = p_drms_box->data.p_sample_soun->p_drms;
+ else if( p_drms_box && p_drms_box->i_type == ATOM_drmi )
+ p_drms = p_drms_box->data.p_sample_vide->p_drms;
+
+ if( p_drms_box && p_drms )
{
- int i_ret = drms_init( p_drms_box->data.p_sample_soun->p_drms,
- p_box->i_type, p_peek, i_read );
+ int i_ret = drms_init( p_drms, p_box->i_type, p_peek, i_read );
if( i_ret )
{
const char *psz_error;
msg_Err( p_stream, "drms_init(c%3.3s) failed (%s)",
(char *)&p_box->i_type+1, psz_error );
- drms_free( p_drms_box->data.p_sample_soun->p_drms );
- p_drms_box->data.p_sample_soun->p_drms = NULL;
+ drms_free( p_drms );
+
+ if( p_drms_box->i_type == ATOM_drms )
+ p_drms_box->data.p_sample_soun->p_drms = NULL;
+ else if( p_drms_box->i_type == ATOM_drmi )
+ p_drms_box->data.p_sample_vide->p_drms = NULL;
}
}
MP4_READBOX_EXIT( 1 );
}
+static int MP4_ReadBox_name( stream_t *p_stream, MP4_Box_t *p_box )
+{
+ MP4_READBOX_ENTER( MP4_Box_data_name_t );
+
+ p_box->data.p_name->psz_text = malloc( p_box->i_size + 1 - 8 ); /* +\0, -name, -size */
+ if( p_box->data.p_name->psz_text == NULL )
+ MP4_READBOX_EXIT( 0 );
+
+ memcpy( p_box->data.p_name->psz_text, p_peek, p_box->i_size - 8 );
+ p_box->data.p_name->psz_text[p_box->i_size - 8] = '\0';
+
+#ifdef MP4_VERBOSE
+ msg_Dbg( p_stream, "read box: \"name\" text=`%s'",
+ p_box->data.p_name->psz_text );
+#endif
+ MP4_READBOX_EXIT( 1 );
+}
+
+static void MP4_FreeBox_name( MP4_Box_t *p_box )
+{
+ FREENULL( p_box->data.p_name->psz_text );
+}
+
static int MP4_ReadBox_0xa9xxx( stream_t *p_stream, MP4_Box_t *p_box )
{
uint16_t i16;
- size_t i_length;
MP4_READBOX_ENTER( MP4_Box_data_0xa9xxx_t );
p_box->data.p_0xa9xxx->psz_text = NULL;
MP4_GET2BYTES( i16 );
- i_length = i16;
- if( i_length > 0 )
+ if( i16 > 0 )
{
+ int i_length = i16;
+
MP4_GET2BYTES( i16 );
if( i_length >= i_read ) i_length = i_read + 1;
MP4_GET4BYTES( i_data_len );
if( i_data_len > i_read ) i_data_len = i_read;
MP4_GETFOURCC( i_data_tag );
- if( (i_data_len > 0) && (i_data_tag == VLC_FOURCC('d', 'a', 't', 'a')) )
+ if( (i_data_len > 0) && (i_data_tag == ATOM_data) )
{
/* data box contains a version/flags field */
uint32_t i_version;
}
/* Chapter support */
+static void MP4_FreeBox_chpl( MP4_Box_t *p_box )
+{
+ MP4_Box_data_chpl_t *p_chpl = p_box->data.p_chpl;
+ int i;
+ for( i = 0; i < p_chpl->i_chapter; i++ )
+ free( p_chpl->chapter[i].psz_name );
+}
+
static int MP4_ReadBox_chpl( stream_t *p_stream, MP4_Box_t *p_box )
{
MP4_Box_data_chpl_t *p_chpl;
MP4_GET1BYTE( i_len );
p_chpl->chapter[i].psz_name = malloc( i_len + 1 );
+ if( !p_chpl->chapter[i].psz_name )
+ goto error;
+
i_copy = __MIN( i_len, i_read );
if( i_copy > 0 )
memcpy( p_chpl->chapter[i].psz_name, p_peek, i_copy );
p_chpl->i_chapter );
#endif
MP4_READBOX_EXIT( 1 );
-}
-static void MP4_FreeBox_chpl( MP4_Box_t *p_box )
-{
- MP4_Box_data_chpl_t *p_chpl = p_box->data.p_chpl;
- int i;
- for( i = 0; i < p_chpl->i_chapter; i++ )
- free( p_chpl->chapter[i].psz_name );
+
+error:
+ MP4_READBOX_EXIT( 0 );
}
static int MP4_ReadBox_tref_generic( stream_t *p_stream, MP4_Box_t *p_box )
return MP4_ReadBoxContainerRaw( p_stream, p_box );
}
+static int MP4_ReadBox_iods( stream_t *p_stream, MP4_Box_t *p_box )
+{
+ char i_unused;
+
+ MP4_READBOX_ENTER( MP4_Box_data_iods_t );
+ MP4_GETVERSIONFLAGS( p_box->data.p_iods );
+
+ MP4_GET1BYTE( i_unused ); /* tag */
+ MP4_GET1BYTE( i_unused ); /* length */
+
+ MP4_GET2BYTES( p_box->data.p_iods->i_object_descriptor ); /* 10bits, 6 other bits
+ are used for other flags */
+ MP4_GET1BYTE( p_box->data.p_iods->i_OD_profile_level );
+ MP4_GET1BYTE( p_box->data.p_iods->i_scene_profile_level );
+ MP4_GET1BYTE( p_box->data.p_iods->i_audio_profile_level );
+ MP4_GET1BYTE( p_box->data.p_iods->i_visual_profile_level );
+ MP4_GET1BYTE( p_box->data.p_iods->i_graphics_profile_level );
+
+#ifdef MP4_VERBOSE
+ msg_Dbg( p_stream,
+ "read box: \"iods\" objectDescriptorId: %i, OD: %i, scene: %i, audio: %i, "
+ "visual: %i, graphics: %i",
+ p_box->data.p_iods->i_object_descriptor >> 6,
+ p_box->data.p_iods->i_OD_profile_level,
+ p_box->data.p_iods->i_scene_profile_level,
+ p_box->data.p_iods->i_audio_profile_level,
+ p_box->data.p_iods->i_visual_profile_level,
+ p_box->data.p_iods->i_graphics_profile_level );
+#endif
+
+ MP4_READBOX_EXIT( 1 );
+}
+
+static int MP4_ReadBox_pasp( stream_t *p_stream, MP4_Box_t *p_box )
+{
+ MP4_READBOX_ENTER( MP4_Box_data_pasp_t );
+
+ MP4_GET4BYTES( p_box->data.p_pasp->i_horizontal_spacing );
+ MP4_GET4BYTES( p_box->data.p_pasp->i_vertical_spacing );
+
+#ifdef MP4_VERBOSE
+ msg_Dbg( p_stream,
+ "read box: \"paps\" %dx%d",
+ p_box->data.p_pasp->i_horizontal_spacing,
+ p_box->data.p_pasp->i_vertical_spacing);
+#endif
+
+ MP4_READBOX_EXIT( 1 );
+}
+
+
/* For generic */
static int MP4_ReadBox_default( stream_t *p_stream, MP4_Box_t *p_box )
{
{
goto unknown;
}
- if( p_box->p_father->i_type == FOURCC_stsd )
+ if( p_box->p_father->i_type == ATOM_stsd )
{
MP4_Box_t *p_mdia = MP4_BoxGet( p_box, "../../../.." );
MP4_Box_t *p_hdlr;
- if( p_mdia == NULL || p_mdia->i_type != FOURCC_mdia ||
+ if( p_mdia == NULL || p_mdia->i_type != ATOM_mdia ||
(p_hdlr = MP4_BoxGet( p_mdia, "hdlr" )) == NULL )
{
goto unknown;
}
switch( p_hdlr->data.p_hdlr->i_handler_type )
{
- case FOURCC_soun:
+ case ATOM_soun:
return MP4_ReadBox_sample_soun( p_stream, p_box );
- case FOURCC_vide:
+ case ATOM_vide:
return MP4_ReadBox_sample_vide( p_stream, p_box );
- case FOURCC_text:
+ case ATOM_text:
return MP4_ReadBox_sample_text( p_stream, p_box );
- case FOURCC_tx3g:
+ case ATOM_tx3g:
+ case ATOM_sbtl:
return MP4_ReadBox_sample_tx3g( p_stream, p_box );
default:
msg_Warn( p_stream,
} MP4_Box_Function [] =
{
/* Containers */
- { FOURCC_moov, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { FOURCC_trak, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { FOURCC_mdia, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { FOURCC_moof, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { FOURCC_minf, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { FOURCC_stbl, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { FOURCC_dinf, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { FOURCC_edts, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { FOURCC_udta, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { FOURCC_nmhd, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { FOURCC_hnti, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { FOURCC_rmra, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { FOURCC_rmda, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { FOURCC_tref, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { FOURCC_gmhd, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { FOURCC_wave, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { FOURCC_ilst, MP4_ReadBoxContainer, MP4_FreeBox_Common },
+ { 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 },
/* specific box */
- { FOURCC_ftyp, MP4_ReadBox_ftyp, MP4_FreeBox_ftyp },
- { FOURCC_cmov, MP4_ReadBox_cmov, MP4_FreeBox_Common },
- { FOURCC_mvhd, MP4_ReadBox_mvhd, MP4_FreeBox_Common },
- { FOURCC_tkhd, MP4_ReadBox_tkhd, MP4_FreeBox_Common },
- { FOURCC_mdhd, MP4_ReadBox_mdhd, MP4_FreeBox_Common },
- { FOURCC_hdlr, MP4_ReadBox_hdlr, MP4_FreeBox_hdlr },
- { FOURCC_vmhd, MP4_ReadBox_vmhd, MP4_FreeBox_Common },
- { FOURCC_smhd, MP4_ReadBox_smhd, MP4_FreeBox_Common },
- { FOURCC_hmhd, MP4_ReadBox_hmhd, MP4_FreeBox_Common },
- { FOURCC_url, MP4_ReadBox_url, MP4_FreeBox_url },
- { FOURCC_urn, MP4_ReadBox_urn, MP4_FreeBox_urn },
- { FOURCC_dref, MP4_ReadBox_dref, MP4_FreeBox_Common },
- { FOURCC_stts, MP4_ReadBox_stts, MP4_FreeBox_stts },
- { FOURCC_ctts, MP4_ReadBox_ctts, MP4_FreeBox_ctts },
- { FOURCC_stsd, MP4_ReadBox_stsd, MP4_FreeBox_Common },
- { FOURCC_stsz, MP4_ReadBox_stsz, MP4_FreeBox_stsz },
- { FOURCC_stsc, MP4_ReadBox_stsc, MP4_FreeBox_stsc },
- { FOURCC_stco, MP4_ReadBox_stco_co64, MP4_FreeBox_stco_co64 },
- { FOURCC_co64, MP4_ReadBox_stco_co64, MP4_FreeBox_stco_co64 },
- { FOURCC_stss, MP4_ReadBox_stss, MP4_FreeBox_stss },
- { FOURCC_stsh, MP4_ReadBox_stsh, MP4_FreeBox_stsh },
- { FOURCC_stdp, MP4_ReadBox_stdp, MP4_FreeBox_stdp },
- { FOURCC_padb, MP4_ReadBox_padb, MP4_FreeBox_padb },
- { FOURCC_elst, MP4_ReadBox_elst, MP4_FreeBox_elst },
- { FOURCC_cprt, MP4_ReadBox_cprt, MP4_FreeBox_cprt },
- { FOURCC_esds, MP4_ReadBox_esds, MP4_FreeBox_esds },
- { FOURCC_dcom, MP4_ReadBox_dcom, MP4_FreeBox_Common },
- { FOURCC_cmvd, MP4_ReadBox_cmvd, MP4_FreeBox_cmvd },
- { FOURCC_avcC, MP4_ReadBox_avcC, MP4_FreeBox_avcC },
+ { 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_dac3, MP4_ReadBox_dac3, 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 },
/* Nothing to do with this box */
- { FOURCC_mdat, MP4_ReadBoxSkip, MP4_FreeBox_Common },
- { FOURCC_skip, MP4_ReadBoxSkip, MP4_FreeBox_Common },
- { FOURCC_free, MP4_ReadBoxSkip, MP4_FreeBox_Common },
- { FOURCC_wide, MP4_ReadBoxSkip, MP4_FreeBox_Common },
+ { 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 },
/* for codecs */
- { FOURCC_soun, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { FOURCC_ms02, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { FOURCC_ms11, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { FOURCC_ms55, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { FOURCC__mp3, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { FOURCC_mp4a, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { FOURCC_twos, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { FOURCC_sowt, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { FOURCC_QDMC, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { FOURCC_QDM2, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { FOURCC_ima4, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { FOURCC_IMA4, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { FOURCC_dvi, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { FOURCC_alaw, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { FOURCC_ulaw, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { FOURCC_raw, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { FOURCC_MAC3, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { FOURCC_MAC6, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { FOURCC_Qclp, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { FOURCC_samr, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { FOURCC_sawb, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { FOURCC_OggS, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { FOURCC_alac, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
-
- { FOURCC_vide, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_mp4v, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_SVQ1, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_SVQ3, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_ZyGo, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_DIVX, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_XVID, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_h263, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_s263, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_cvid, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_3IV1, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_3iv1, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_3IV2, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_3iv2, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_3IVD, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_3ivd, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_3VID, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_3vid, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_mjpa, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_mjpb, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_qdrw, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_mp2v, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_hdv2, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
-
- { FOURCC_mjqt, MP4_ReadBox_default, NULL }, /* found in mjpa/b */
- { FOURCC_mjht, MP4_ReadBox_default, NULL },
-
- { FOURCC_dvc, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_dvp, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_dv5n, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_dv5p, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_VP31, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_vp31, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_h264, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
-
- { FOURCC_jpeg, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_avc1, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
-
- { FOURCC_yv12, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
- { FOURCC_yuv2, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
-
- { FOURCC_mp4s, MP4_ReadBox_sample_mp4s, MP4_FreeBox_Common },
+ { ATOM_soun, 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 },
/* XXX there is 2 box where we could find this entry stbl and tref*/
- { FOURCC_hint, MP4_ReadBox_default, MP4_FreeBox_Common },
+ { ATOM_hint, MP4_ReadBox_default, MP4_FreeBox_Common },
/* found in tref box */
- { FOURCC_dpnd, MP4_ReadBox_default, NULL },
- { FOURCC_ipir, MP4_ReadBox_default, NULL },
- { FOURCC_mpod, MP4_ReadBox_default, NULL },
- { FOURCC_chap, MP4_ReadBox_tref_generic, MP4_FreeBox_tref_generic },
+ { 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 },
/* found in hnti */
- { FOURCC_rtp, MP4_ReadBox_default, NULL },
+ { ATOM_rtp, MP4_ReadBox_default, NULL },
/* found in rmra */
- { FOURCC_rdrf, MP4_ReadBox_rdrf, MP4_FreeBox_rdrf },
- { FOURCC_rmdr, MP4_ReadBox_rmdr, MP4_FreeBox_Common },
- { FOURCC_rmqu, MP4_ReadBox_rmqu, MP4_FreeBox_Common },
- { FOURCC_rmvc, MP4_ReadBox_rmvc, MP4_FreeBox_Common },
-
- { FOURCC_drms, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
- { FOURCC_sinf, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { FOURCC_schi, MP4_ReadBoxContainer, MP4_FreeBox_Common },
- { FOURCC_user, MP4_ReadBox_drms, MP4_FreeBox_Common },
- { FOURCC_key, MP4_ReadBox_drms, MP4_FreeBox_Common },
- { FOURCC_iviv, MP4_ReadBox_drms, MP4_FreeBox_Common },
- { FOURCC_name, MP4_ReadBox_drms, MP4_FreeBox_Common },
- { FOURCC_priv, MP4_ReadBox_drms, MP4_FreeBox_Common },
+ { 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 },
/* found in udta */
- { FOURCC_0xa9nam,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { FOURCC_0xa9aut,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { FOURCC_0xa9cpy,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { FOURCC_0xa9swr,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { FOURCC_0xa9inf,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { FOURCC_0xa9ART,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { FOURCC_0xa9dir,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { FOURCC_0xa9cmt,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { FOURCC_0xa9req,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { FOURCC_0xa9day,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { FOURCC_0xa9des,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { FOURCC_0xa9fmt,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { FOURCC_0xa9prd,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { FOURCC_0xa9prf,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { FOURCC_0xa9src,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { FOURCC_0xa9alb,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { FOURCC_0xa9dis,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { FOURCC_0xa9enc,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { FOURCC_0xa9gen,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { FOURCC_0xa9trk,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { FOURCC_0xa9dsa,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { FOURCC_0xa9hst,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { FOURCC_0xa9url,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { FOURCC_0xa9ope,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
- { FOURCC_0xa9com,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
-
- { FOURCC_chpl, MP4_ReadBox_chpl, MP4_FreeBox_chpl },
+ { 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_chpl, MP4_ReadBox_chpl, MP4_FreeBox_chpl },
/* iTunes/Quicktime meta info */
- { FOURCC_meta, MP4_ReadBox_meta, MP4_FreeBox_Common },
+ { ATOM_meta, MP4_ReadBox_meta, MP4_FreeBox_Common },
+ { ATOM_name, MP4_ReadBox_name, MP4_FreeBox_name },
+
+ /* found in smoothstreaming */
+ { ATOM_traf, MP4_ReadBoxContainer, MP4_FreeBox_Common },
+ { ATOM_mfhd, MP4_ReadBox_mfhd, MP4_FreeBox_Common },
+ { ATOM_tfhd, MP4_ReadBox_tfhd, MP4_FreeBox_Common },
+ { ATOM_trun, MP4_ReadBox_trun, MP4_FreeBox_trun },
/* Last entry */
- { 0, MP4_ReadBox_default, NULL }
+ { 0, MP4_ReadBox_default, NULL }
};
-
/*****************************************************************************
* MP4_ReadBox : parse the actual box and the children
* XXX : Do not go to the next box
*****************************************************************************/
static MP4_Box_t *MP4_ReadBox( stream_t *p_stream, MP4_Box_t *p_father )
{
- MP4_Box_t *p_box = malloc( sizeof( MP4_Box_t ) );
+ MP4_Box_t *p_box = calloc( 1, sizeof( MP4_Box_t ) ); /* Needed to ensure simple on error handler */
unsigned int i_index;
if( p_box == NULL )
MP4_Box_t *p_child;
if( !p_box )
- {
return; /* hehe */
- }
for( p_child = p_box->p_first; p_child != NULL; )
{
{
MP4_Box_Function[i_index].MP4_FreeBox_function( p_box );
}
-
free( p_box->data.p_data );
}
-
free( p_box );
}
return NULL;
p_root->i_pos = 0;
- p_root->i_type = VLC_FOURCC( 'r', 'o', 'o', 't' );
+ p_root->i_type = ATOM_root;
p_root->i_shortsize = 1;
p_root->i_size = stream_Size( s );
CreateUUID( &p_root->i_uuid, p_root->i_type );
p_root->data.p_data = NULL;
- p_root->p_father = NULL;
- p_root->p_first = NULL;
- p_root->p_last = NULL;
- p_root->p_next = NULL;
+ p_root->p_father = NULL;
+ p_root->p_first = NULL;
+ p_root->p_last = NULL;
+ p_root->p_next = NULL;
p_stream = s;
if( i_result )
{
- MP4_Box_t *p_child;
MP4_Box_t *p_moov;
MP4_Box_t *p_cmov;
( p_cmov = MP4_BoxGet( p_root, "foov/cmov" ) ) ) )
{
/* rename the compressed moov as a box to skip */
- p_moov->i_type = FOURCC_skip;
+ p_moov->i_type = ATOM_skip;
/* get uncompressed p_moov */
p_moov = p_cmov->data.p_cmov->p_moov;
p_moov->p_father = p_root;
/* insert this new moov box as first child of p_root */
- p_moov->p_next = p_child = p_root->p_first;
+ p_moov->p_next = p_root->p_first;
p_root->p_first = p_moov;
}
}
}
-static void __MP4_BoxDumpStructure( stream_t *s,
+static void MP4_BoxDumpStructure_Internal( stream_t *s,
MP4_Box_t *p_box, unsigned int i_level )
{
MP4_Box_t *p_child;
}
else
{
- char str[512];
unsigned int i;
- memset( str, (uint8_t)' ', 512 );
+
+ char str[512];
+ if( i_level >= (sizeof(str) - 1)/4 )
+ return;
+
+ memset( str, ' ', sizeof(str) );
for( i = 0; i < i_level; i++ )
{
- str[i*5] = '|';
+ str[i*4] = '|';
}
- if MP4_BOX_TYPE_ASCII()
- sprintf( str + i_level * 5, "+ %4.4s size %d",
+ if( MP4_BOX_TYPE_ASCII() )
+ snprintf( &str[i_level * 4], sizeof(str) - 4*i_level,
+ "+ %4.4s size %d",
(char*)&p_box->i_type, (uint32_t)p_box->i_size );
else
- sprintf( str + i_level * 5, "+ c%3.3s size %d",
+ snprintf( &str[i_level * 4], sizeof(str) - 4*i_level,
+ "+ c%3.3s size %d",
(char*)&p_box->i_type+1, (uint32_t)p_box->i_size );
msg_Dbg( s, "%s", str );
}
p_child = p_box->p_first;
while( p_child )
{
- __MP4_BoxDumpStructure( s, p_child, i_level + 1 );
+ MP4_BoxDumpStructure_Internal( s, p_child, i_level + 1 );
p_child = p_child->p_next;
}
}
void MP4_BoxDumpStructure( stream_t *s, MP4_Box_t *p_box )
{
- __MP4_BoxDumpStructure( s, p_box, 0 );
+ MP4_BoxDumpStructure_Internal( s, p_box, 0 );
}
-
/*****************************************************************************
*****************************************************************************
**
**
*****************************************************************************
*****************************************************************************/
-static void __get_token( char **ppsz_path, char **ppsz_token, int *pi_number )
+static void get_token( char **ppsz_path, char **ppsz_token, int *pi_number )
{
size_t i_len ;
if( !*ppsz_path[0] )
*pi_number = 0;
return;
}
- i_len = 0;
- while( (*ppsz_path)[i_len] &&
- (*ppsz_path)[i_len] != '/' && (*ppsz_path)[i_len] != '[' )
- {
- i_len++;
- }
+ i_len = strcspn( *ppsz_path, "/[" );
if( !i_len && **ppsz_path == '/' )
{
i_len = 1;
}
- *ppsz_token = malloc( i_len + 1 );
+ *ppsz_token = xmalloc( i_len + 1 );
memcpy( *ppsz_token, *ppsz_path, i_len );
}
}
-static void __MP4_BoxGet( MP4_Box_t **pp_result,
+static void MP4_BoxGet_Internal( MP4_Box_t **pp_result,
MP4_Box_t *p_box, const char *psz_fmt, va_list args)
{
char *psz_dup;
- char *psz_path;
+ char *psz_path;
+ char *psz_token;
if( !p_box )
{
if( !psz_path || !psz_path[0] )
{
- FREENULL( psz_path );
+ free( psz_path );
*pp_result = NULL;
return;
}
psz_dup = psz_path; /* keep this pointer, as it need to be unallocated */
for( ; ; )
{
- char *psz_token;
int i_number;
- __get_token( &psz_path, &psz_token, &i_number );
+ get_token( &psz_path, &psz_token, &i_number );
// fprintf( stderr, "path:'%s', token:'%s' n:%d\n",
// psz_path,psz_token,i_number );
if( !psz_token )
{
- FREENULL( psz_token );
free( psz_dup );
*pp_result = p_box;
return;
if( !strcmp( psz_token, "/" ) )
{
/* Find root box */
- while( p_box && p_box->i_type != VLC_FOURCC( 'r', 'o', 'o', 't' ) )
+ while( p_box && p_box->i_type != ATOM_root )
{
p_box = p_box->p_father;
}
if( !p_box )
{
- free( psz_token );
- free( psz_dup );
- *pp_result = NULL;
- return;
+ goto error_box;
}
}
else
p_box = p_box->p_father;
if( !p_box )
{
- free( psz_token );
- free( psz_dup );
- *pp_result = NULL;
- return;
+ goto error_box;
}
}
else
{
if( !p_box )
{
- free( psz_token );
- free( psz_dup );
- *pp_result = NULL;
- return;
+ goto error_box;
}
if( p_box->i_type == i_fourcc )
{
}
}
else
- if( strlen( psz_token ) == 0 )
+ if( *psz_token == '\0' )
{
p_box = p_box->p_first;
for( ; ; )
{
if( !p_box )
{
- free( psz_token );
- free( psz_dup );
- *pp_result = NULL;
- return;
+ goto error_box;
}
if( !i_number )
{
else
{
// fprintf( stderr, "Argg malformed token \"%s\"",psz_token );
- FREENULL( psz_token );
- free( psz_dup );
- *pp_result = NULL;
- return;
+ goto error_box;
}
- free( psz_token );
+ FREENULL( psz_token );
}
+
+ return;
+
+error_box:
+ free( psz_token );
+ free( psz_dup );
+ *pp_result = NULL;
+ return;
}
/*****************************************************************************
MP4_Box_t *p_result;
va_start( args, psz_fmt );
- __MP4_BoxGet( &p_result, p_box, psz_fmt, args );
+ MP4_BoxGet_Internal( &p_result, p_box, psz_fmt, args );
va_end( args );
return( p_result );
MP4_Box_t *p_result, *p_next;
va_start( args, psz_fmt );
- __MP4_BoxGet( &p_result, p_box, psz_fmt, args );
+ MP4_BoxGet_Internal( &p_result, p_box, psz_fmt, args );
va_end( args );
if( !p_result )
{
projects / vlc / blobdiff