# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_demux.h>
} \
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 ) ) ) ) \
+ if( !( p_box->data.p_data = calloc( 1, sizeof( MP4_Box_data_TYPE_t ) ) ) ) \
{ \
free( p_buff ); \
return( 0 ); \
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;
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 )
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] =
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++ )
- {
- 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 );
+ 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_sample_soun( stream_t *p_stream, MP4_Box_t *p_box )
/*
* 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 );
{
/* 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;
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")",
+ msg_Dbg( p_stream, "read box: \"soun\" mp4 or qt1/2 (rest=%"PRId64")",
i_read );
stream_Seek( p_stream, p_box->i_pos +
MP4_BOX_HEADERSIZE( p_box ) + 28 );
if( p_box->i_type == FOURCC_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" );
}
}
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 "
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);
+
+ if( p_box->i_type == FOURCC_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 == FOURCC_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 )
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 );
}
|| 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 );
}
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_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 )
{
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 )
/* now create a memory stream */
p_stream_memory =
stream_MemoryNew( VLC_OBJECT(p_stream), p_cmvd->data.p_cmvd->p_data,
- p_cmvd->data.p_cmvd->i_uncompressed_size, VLC_TRUE );
+ p_cmvd->data.p_cmvd->i_uncompressed_size, true );
/* and read uncompressd moov */
p_box->data.p_cmov->p_moov = MP4_ReadBox( p_stream_memory, NULL );
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_frma_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 != FOURCC_drms
+ && p_drms_box->i_type != FOURCC_drmi );
+
+ if( p_drms_box && p_drms_box->i_type == FOURCC_drms )
+ p_drms = p_drms_box->data.p_sample_soun->p_drms;
+ else if( p_drms_box && p_drms_box->i_type == FOURCC_drmi )
+ p_drms = p_drms_box->data.p_sample_vide->p_drms;
- if( p_drms_box && p_drms_box->data.p_sample_soun->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 == FOURCC_drms )
+ p_drms_box->data.p_sample_soun->p_drms = NULL;
+ else if( p_drms_box->i_type == FOURCC_drmi )
+ p_drms_box->data.p_sample_vide->p_drms = NULL;
}
}
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 + 1;
- if( i_length > 0 )
+ if( i16 > 0 )
{
+ int i_length = i16;
+
MP4_GET2BYTES( i16 );
if( i_length >= i_read ) i_length = i_read + 1;
}
/* 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 )
case FOURCC_text:
return MP4_ReadBox_sample_text( p_stream, p_box );
case FOURCC_tx3g:
+ case FOURCC_sbtl:
return MP4_ReadBox_sample_tx3g( p_stream, p_box );
default:
msg_Warn( p_stream,
{ FOURCC_dcom, MP4_ReadBox_dcom, MP4_FreeBox_Common },
{ FOURCC_cmvd, MP4_ReadBox_cmvd, MP4_FreeBox_cmvd },
{ FOURCC_avcC, MP4_ReadBox_avcC, MP4_FreeBox_avcC },
+ { FOURCC_dac3, MP4_ReadBox_dac3, MP4_FreeBox_Common },
+ { FOURCC_enda, MP4_ReadBox_enda, MP4_FreeBox_Common },
/* Nothing to do with this box */
{ FOURCC_mdat, MP4_ReadBoxSkip, MP4_FreeBox_Common },
{ FOURCC_OggS, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
{ FOURCC_alac, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
+ { FOURCC_drmi, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
{ 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_iviv, MP4_ReadBox_drms, MP4_FreeBox_Common },
{ FOURCC_name, MP4_ReadBox_drms, MP4_FreeBox_Common },
{ FOURCC_priv, MP4_ReadBox_drms, MP4_FreeBox_Common },
+ { FOURCC_frma, MP4_ReadBox_frma, MP4_FreeBox_Common },
+ { FOURCC_skcr, MP4_ReadBox_skcr, MP4_FreeBox_Common },
/* found in udta */
{ FOURCC_0xa9nam,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
*****************************************************************************/
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 );
}
if( i_result )
{
- MP4_Box_t *p_child;
MP4_Box_t *p_moov;
MP4_Box_t *p_cmov;
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;
}
}
}
else
{
- char str[512];
unsigned int i;
- memset( str, (uint8_t)' ', 512 );
+
+ char str[512];
+ if( i_level >= (sizeof(str) - 1)/5 )
+ return;
+
+ memset( str, ' ', sizeof(str) );
for( i = 0; i < i_level; i++ )
{
str[i*5] = '|';
}
- if MP4_BOX_TYPE_ASCII()
- sprintf( str + i_level * 5, "+ %4.4s size %d",
+ if( MP4_BOX_TYPE_ASCII() )
+ snprintf( &str[i_level * 5], sizeof(str) - 5*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 * 5], sizeof(str) - 5*i_level,
+ "+ c%3.3s size %d",
(char*)&p_box->i_type+1, (uint32_t)p_box->i_size );
msg_Dbg( s, "%s", str );
}
MP4_Box_t *p_box, const char *psz_fmt, va_list args)
{
char *psz_dup;
- char *psz_path;
+ char *psz_path;
if( !p_box )
{
if( !psz_path || !psz_path[0] )
{
- FREENULL( psz_path );
+ free( psz_path );
*pp_result = NULL;
return;
}
// psz_path,psz_token,i_number );
if( !psz_token )
{
- FREENULL( psz_token );
free( psz_dup );
*pp_result = p_box;
return;
projects / vlc / blobdiff