X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fmp4%2Flibmp4.c;h=d1a35bd88b64610ae9ccd6e567d9d1f328918145;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=dede2ec4c55d7ee86b34c5001b0c8a618f8b2ef1;hpb=1ab5a0f50befbb2eb20a8272ae6ddae1d04aeb1b;p=vlc diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c index dede2ec4c5..d1a35bd88b 100644 --- a/modules/demux/mp4/libmp4.c +++ b/modules/demux/mp4/libmp4.c @@ -1,9 +1,10 @@ /***************************************************************************** * libmp4.c : LibMP4 library for mp4 module for vlc ***************************************************************************** - * Copyright (C) 2001 VideoLAN - * $Id: libmp4.c,v 1.19 2003/04/16 16:20:25 fenrir Exp $ - * Authors: Laurent Aimar + * Copyright (C) 2001-2004 the VideoLAN team + * $Id$ + * + * Author: Laurent Aimar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,84 +18,72 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include /* malloc(), free() */ -#include -#include /* strdup() */ -#include -#include - #include -#include + + +#include #ifdef HAVE_ZLIB_H -# include /* for compressed moov */ +# include /* for compressed moov */ #endif #include "libmp4.h" +#include "drms.h" /***************************************************************************** * Here are defined some macro to make life simpler but before using it * *look* at the code. * - * XXX: All macro are written in capital letters - * *****************************************************************************/ -#define MP4_BOX_HEADERSIZE( p_box ) \ - ( 8 + ( p_box->i_shortsize == 1 ? 8 : 0 ) \ +#define MP4_BOX_HEADERSIZE( p_box ) \ + ( 8 + ( p_box->i_shortsize == 1 ? 8 : 0 ) \ + ( p_box->i_type == FOURCC_uuid ? 16 : 0 ) ) -#define MP4_BOX_DESCEND( p_box ) \ - MP4_SeekStream( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) ) - -#define MP4_GET1BYTE( dst ) \ - dst = *p_peek; p_peek++; i_read-- +#define MP4_GETX_PRIVATE(dst, code, size) do { \ + if( (i_read) >= (size) ) { dst = (code); p_peek += (size); } \ + else { dst = 0; } \ + i_read -= (size); \ + } while(0) -#define MP4_GET2BYTES( dst ) \ - dst = GetWBE( p_peek ); p_peek += 2; i_read -= 2 - -#define MP4_GET3BYTES( dst ) \ - dst = Get24bBE( p_peek ); p_peek += 3; i_read -= 3 - -#define MP4_GET4BYTES( dst ) \ - dst = GetDWBE( p_peek ); p_peek += 4; i_read -= 4 - -#define MP4_GETFOURCC( dst ) \ - dst = VLC_FOURCC( p_peek[0], p_peek[1], p_peek[2], p_peek[3] ); \ - p_peek += 4; i_read -= 4 - -#define MP4_GET8BYTES( dst ) \ - dst = GetQWBE( p_peek ); p_peek += 8; i_read -= 8 +#define MP4_GET1BYTE( dst ) MP4_GETX_PRIVATE( dst, *p_peek, 1 ) +#define MP4_GET2BYTES( dst ) MP4_GETX_PRIVATE( dst, GetWBE(p_peek), 2 ) +#define MP4_GET3BYTES( dst ) MP4_GETX_PRIVATE( dst, Get24bBE(p_peek), 3 ) +#define MP4_GET4BYTES( dst ) MP4_GETX_PRIVATE( dst, GetDWBE(p_peek), 4 ) +#define MP4_GET8BYTES( dst ) MP4_GETX_PRIVATE( dst, GetQWBE(p_peek), 8 ) +#define MP4_GETFOURCC( dst ) MP4_GETX_PRIVATE( dst, \ + VLC_FOURCC(p_peek[0],p_peek[1],p_peek[2],p_peek[3]), 4) #define MP4_GETVERSIONFLAGS( p_void ) \ MP4_GET1BYTE( p_void->i_version ); \ MP4_GET3BYTES( p_void->i_flags ) -#define MP4_GETSTRINGZ( p_str ) \ - if( ( i_read > 0 )&&(p_peek[0] ) ) \ - { \ - p_str = calloc( sizeof( char ), __MIN( strlen( p_peek ), i_read )+1);\ - memcpy( p_str, p_peek, __MIN( strlen( p_peek ), i_read ) ); \ - p_str[__MIN( strlen( p_peek ), i_read )] = 0; \ - p_peek += strlen( p_str ) + 1; \ - i_read -= strlen( p_str ) + 1; \ - } \ - else \ - { \ +#define MP4_GETSTRINGZ( p_str ) \ + if( (i_read > 0) && (p_peek[0]) ) \ + { \ + const int __i_copy__ = strnlen( (char*)p_peek, i_read-1 ); \ + p_str = calloc( sizeof(char), __i_copy__+1 ); \ + if( __i_copy__ > 0 ) memcpy( p_str, p_peek, __i_copy__ ); \ + p_str[__i_copy__] = 0; \ + p_peek += __i_copy__ + 1; \ + i_read -= __i_copy__ + 1; \ + } \ + else \ + { \ p_str = NULL; \ } - #define MP4_READBOX_ENTER( MP4_Box_data_TYPE_t ) \ int64_t i_read = p_box->i_size; \ uint8_t *p_peek, *p_buff; \ - i_read = p_box->i_size; \ + int i_actually_read; \ if( !( p_peek = p_buff = malloc( i_read ) ) ) \ { \ return( 0 ); \ } \ - if( !MP4_ReadStream( p_stream, p_peek, i_read ) )\ + i_actually_read = stream_Read( p_stream, p_peek, i_read ); \ + if( i_actually_read < 0 || (int64_t)i_actually_read < i_read )\ { \ free( p_buff ); \ return( 0 ); \ @@ -111,60 +100,24 @@ free( p_buff ); \ if( i_read < 0 ) \ { \ - msg_Warn( p_stream->p_input, "Not enougth data" ); \ + msg_Warn( p_stream, "Not enough data" ); \ } \ return( i_code ) -#define FREE( p ) \ - if( p ) {free( p ); p = NULL; } - - /* Some assumptions: * The input method HAVE to be seekable */ -/* Some functions to manipulate memory */ -static uint16_t GetWLE( uint8_t *p_buff ) -{ - return( (p_buff[0]) + ( p_buff[1] <<8 ) ); -} - -static uint32_t GetDWLE( uint8_t *p_buff ) -{ - return( p_buff[0] + ( p_buff[1] <<8 ) + - ( p_buff[2] <<16 ) + ( p_buff[3] <<24 ) ); -} - -static uint16_t GetWBE( uint8_t *p_buff ) -{ - return( (p_buff[0]<<8) + p_buff[1] ); -} - -static uint32_t Get24bBE( uint8_t *p_buff ) -{ - return( ( p_buff[0] <<16 ) + ( p_buff[1] <<8 ) + p_buff[2] ); -} - - -static uint32_t GetDWBE( uint8_t *p_buff ) -{ - return( (p_buff[0] << 24) + ( p_buff[1] <<16 ) + - ( p_buff[2] <<8 ) + p_buff[3] ); -} - -static uint64_t GetQWBE( uint8_t *p_buff ) +static uint32_t Get24bBE( const uint8_t *p ) { - return( ( (uint64_t)GetDWBE( p_buff ) << 32 )|( (uint64_t)GetDWBE( p_buff + 4 ) ) ); + return( ( p[0] <<16 ) + ( p[1] <<8 ) + p[2] ); } - -static void GetUUID( UUID_t *p_uuid, uint8_t *p_buff ) +static void GetUUID( UUID_t *p_uuid, const uint8_t *p_buff ) { - memcpy( p_uuid, - p_buff, - 16 ); + memcpy( p_uuid, p_buff, 16 ); } static void CreateUUID( UUID_t *p_uuid, uint32_t i_fourcc ) @@ -176,259 +129,27 @@ static void CreateUUID( UUID_t *p_uuid, uint32_t i_fourcc ) /* some functions for mp4 encoding of variables */ -void MP4_ConvertDate2Str( char *psz, uint64_t i_date ) +static void MP4_ConvertDate2Str( char *psz, uint64_t i_date ) { int i_day; int i_hour; int i_min; int i_sec; + /* date begin at 1 jan 1904 */ + i_date += ((I64C(1904) * 365) + 17) * 24 * 60 * 60; + i_day = i_date / ( 60*60*24); i_hour = ( i_date /( 60*60 ) ) % 60; i_min = ( i_date / 60 ) % 60; i_sec = i_date % 60; - /* FIXME do it correctly, date begin at 1 jan 1904 */ - sprintf( psz, "%dd-%2.2dh:%2.2dm:%2.2ds", - i_day, i_hour, i_min, i_sec ); -} - -#if 0 -static void DataDump( uint8_t *p_data, int i_data ) -{ - int i; - fprintf( stderr, "\nDumping %d bytes\n", i_data ); - for( i = 0; i < i_data; i++ ) - { - int c; - - c = p_data[i]; - if( c < 32 || c > 127 ) c = '.'; - fprintf( stderr, "%c", c ); - if( i % 60 == 59 ) fprintf( stderr, "\n" ); - } - fprintf( stderr, "\n" ); + sprintf( psz, "%dd-%2.2dh:%2.2dm:%2.2ds", i_day, i_hour, i_min, i_sec ); } -#endif /***************************************************************************** - * Some basic functions to manipulate stream more easily in vlc - * - * MP4_TellAbsolute get file position - * - * MP4_SeekAbsolute seek in the file - * - * MP4_ReadData read data from the file in a buffer - * + * Some prototypes. *****************************************************************************/ -off_t MP4_TellAbsolute( input_thread_t *p_input ) -{ - off_t i_pos; - - vlc_mutex_lock( &p_input->stream.stream_lock ); - - i_pos= p_input->stream.p_selected_area->i_tell; -// ( p_input->p_last_data - p_input->p_current_data ); - - vlc_mutex_unlock( &p_input->stream.stream_lock ); - - return( i_pos ); -} - -int MP4_SeekAbsolute( input_thread_t *p_input, - off_t i_pos) -{ - off_t i_filepos; - - if( i_pos >= p_input->stream.p_selected_area->i_size ) - { - return( 0 ); - } - - i_filepos = MP4_TellAbsolute( p_input ); - if( i_pos != i_filepos ) - { - input_AccessReinit( p_input ); - p_input->pf_seek( p_input, i_pos ); - } - return( 1 ); -} - -/* return 1 if success, 0 if fail */ -int MP4_ReadData( input_thread_t *p_input, uint8_t *p_buff, int i_size ) -{ - data_packet_t *p_data; - - int i_read; - - - if( !i_size ) - { - return( 1 ); - } - - do - { - i_read = input_SplitBuffer(p_input, &p_data, __MIN( i_size, 1024 ) ); - if( i_read <= 0 ) - { - return( 0 ); - } - memcpy( p_buff, p_data->p_payload_start, i_read ); - input_DeletePacket( p_input->p_method_data, p_data ); - - p_buff += i_read; - i_size -= i_read; - - } while( i_size ); - - return( 1 ); -} - -/***************************************************************************** - * Some basic functions to manipulate MP4_Stream_t, an abstraction o p_input - * in the way that you can read from a memory buffer or from an input - * - *****************************************************************************/ - -/**** ------- First some function to make abstract from input -------- */ - -/**************************************************************************** - * MP4_InputStream create an stram with an input - * - ****************************************************************************/ -MP4_Stream_t *MP4_InputStream( input_thread_t *p_input ) -{ - MP4_Stream_t *p_stream; - - if( !( p_stream = malloc( sizeof( MP4_Stream_t ) ) ) ) - { - return( NULL ); - } - p_stream->b_memory = 0; - p_stream->p_input = p_input; - p_stream->i_start = 0; - p_stream->i_stop = 0; - p_stream->p_buffer = NULL; - return( p_stream ); -} - - -/**************************************************************************** - * MP4_MemoryStream create a memory stream - * if p_buffer == NULL, will allocate a buffer of i_size, else - * it uses p_buffer XXX you have to unallocate it yourself ! - * - ****************************************************************************/ -MP4_Stream_t *MP4_MemoryStream( input_thread_t *p_input, - int i_size, uint8_t *p_buffer ) -{ - MP4_Stream_t *p_stream; - - if( !( p_stream = malloc( sizeof( MP4_Stream_t ) ) ) ) - { - return( NULL ); - } - p_stream->b_memory = 1; - p_stream->p_input = p_input; - p_stream->i_start = 0; - p_stream->i_stop = i_size; - if( !p_buffer ) - { - if( !( p_stream->p_buffer = malloc( i_size ) ) ) - { - free( p_stream ); - return( NULL ); - } - } - else - { - p_stream->p_buffer = p_buffer; - } - - return( p_stream ); -} -/**************************************************************************** - * MP4_ReadStream read from a MP4_Stream_t - * - ****************************************************************************/ -int MP4_ReadStream( MP4_Stream_t *p_stream, uint8_t *p_buff, int i_size ) -{ - if( p_stream->b_memory ) - { - if( i_size > p_stream->i_stop - p_stream->i_start ) - { - return( 0 ); - } - memcpy( p_buff, - p_stream->p_buffer + p_stream->i_start, - i_size ); - p_stream->i_start += i_size; - return( 1 ); - } - else - { - return( MP4_ReadData( p_stream->p_input, p_buff, i_size ) ); - } -} - -/**************************************************************************** - * MP4_PeekStream peek from a MP4_Stream_t - * - ****************************************************************************/ -int MP4_PeekStream( MP4_Stream_t *p_stream, uint8_t **pp_peek, int i_size ) -{ - if( p_stream->b_memory ) - { - *pp_peek = p_stream->p_buffer + p_stream->i_start; - - return( __MIN(i_size,p_stream->i_stop - p_stream->i_start )); - } - else - { - return( input_Peek( p_stream->p_input, pp_peek, i_size ) ); - } -} - -/**************************************************************************** - * MP4_TellStream give absolute position in the stream - * XXX for a memory stream give position from begining of the buffer - ****************************************************************************/ -off_t MP4_TellStream( MP4_Stream_t *p_stream ) -{ - if( p_stream->b_memory ) - { - return( p_stream->i_start ); - } - else - { - return( MP4_TellAbsolute( p_stream->p_input ) ); - } -} - -/**************************************************************************** - * MP4_SeekStream seek in a MP4_Stream_t - * - ****************************************************************************/ -int MP4_SeekStream( MP4_Stream_t *p_stream, off_t i_pos) -{ - if( p_stream->b_memory ) - { - if( i_pos < p_stream->i_stop ) - { - p_stream->i_start = i_pos; - return( 1 ); - } - else - { - return( 0 ); - } - } - else - { - return( MP4_SeekAbsolute( p_stream->p_input, i_pos ) ); - } -} - +static MP4_Box_t *MP4_ReadBox( stream_t *p_stream, MP4_Box_t *p_father ); /***************************************************************************** @@ -439,16 +160,16 @@ int MP4_SeekStream( MP4_Stream_t *p_stream, off_t i_pos) * * RETURN : 0 if it fail, 1 otherwise *****************************************************************************/ -int MP4_ReadBoxCommon( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +int MP4_ReadBoxCommon( stream_t *p_stream, MP4_Box_t *p_box ) { - int i_read; - uint8_t *p_peek; + int i_read; + const uint8_t *p_peek; - if( ( ( i_read = MP4_PeekStream( p_stream, &p_peek, 32 ) ) < 8 ) ) + if( ( ( i_read = stream_Peek( p_stream, &p_peek, 32 ) ) < 8 ) ) { - return( 0 ); + return 0; } - p_box->i_pos = MP4_TellStream( p_stream ); + p_box->i_pos = stream_Tell( p_stream ); p_box->data.p_data = NULL; p_box->p_father = NULL; @@ -483,25 +204,22 @@ int MP4_ReadBoxCommon( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) CreateUUID( &p_box->i_uuid, p_box->i_type ); } #ifdef MP4_VERBOSE - /* FIXME how to write uint64_t ??? */ if( p_box->i_size ) { - msg_Dbg( p_stream->p_input, "Found Box: %4.4s size %d", - (char*)&p_box->i_type, - (uint32_t)p_box->i_size ); + msg_Dbg( p_stream, "found Box: %4.4s size "I64Fd, + (char*)&p_box->i_type, p_box->i_size ); } #endif - return( 1 ); + return 1; } - /***************************************************************************** - * MP4_MP4_NextBox : Go to the next box + * MP4_NextBox : Go to the next box ***************************************************************************** - * if p_box == NULL, go to the next box in witch we are( at the begining ). + * if p_box == NULL, go to the next box in which we are( at the begining ). *****************************************************************************/ -int MP4_NextBox( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_NextBox( stream_t *p_stream, MP4_Box_t *p_box ) { MP4_Box_t box; @@ -513,30 +231,29 @@ int MP4_NextBox( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) if( !p_box->i_size ) { - return( 2 ); /* Box with infinite size */ + return 2; /* Box with infinite size */ } 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; + /* check if it's within p-father */ - if( p_box->i_size + p_box->i_pos >= - p_box->p_father->i_size + p_box->p_father->i_pos ) + if( i_box_end >= i_father_end ) { - return( 0 ); /* out of bound */ + if( i_box_end > i_father_end ) + msg_Dbg( p_stream, "out of bound child" ); + return 0; /* out of bound */ } } - return( MP4_SeekStream( p_stream, p_box->i_size + p_box->i_pos ) ); -} -/***************************************************************************** - * MP4_MP4_GotoBox : Go to this particular box - ***************************************************************************** - * RETURN : 0 if it fail, 1 otherwise - *****************************************************************************/ -int MP4_GotoBox( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) -{ - return( MP4_SeekStream( p_stream, p_box->i_pos ) ); -} + if( stream_Seek( p_stream, p_box->i_size + p_box->i_pos ) ) + { + return 0; + } + return 1; +} /***************************************************************************** * For all known box a loader is given, @@ -544,78 +261,89 @@ int MP4_GotoBox( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) * after called one of theses functions, file position is unknown * you need to call MP4_GotoBox to go where you want *****************************************************************************/ -int MP4_ReadBoxContainerRaw( MP4_Stream_t *p_stream, MP4_Box_t *p_container ) +static int MP4_ReadBoxContainerRaw( stream_t *p_stream, MP4_Box_t *p_container ) { MP4_Box_t *p_box; - if( MP4_TellStream( p_stream ) + 8 > - (off_t)(p_container->i_pos + p_container->i_size) ) + if( stream_Tell( p_stream ) + 8 > + (off_t)(p_container->i_pos + p_container->i_size) ) { /* there is no box to load */ - return( 0 ); + return 0; } do { - p_box = malloc( sizeof( MP4_Box_t ) ); + if( ( p_box = MP4_ReadBox( p_stream, p_container ) ) == NULL ) break; - if( MP4_ReadBox( p_stream, p_box , p_container ) ) - { - /* chain this box with the father and the other at same level */ - if( !p_container->p_first ) - { - p_container->p_first = p_box; - } - else - { - p_container->p_last->p_next = p_box; - } - p_container->p_last = p_box; - } - else - { - /* free memory */ - free( p_box ); - break; - } + /* chain this box with the father and the other at same level */ + if( !p_container->p_first ) p_container->p_first = p_box; + else p_container->p_last->p_next = p_box; + p_container->p_last = p_box; - }while( MP4_NextBox( p_stream, p_box ) == 1 ); + } while( MP4_NextBox( p_stream, p_box ) == 1 ); - return( 1 ); + return 1; } - -int MP4_ReadBoxContainer( MP4_Stream_t *p_stream, MP4_Box_t *p_container ) +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 ) { /* container is empty, 8 stand for the first header in this box */ - return( 1 ); + return 1; } /* enter box */ - MP4_BOX_DESCEND( p_container ); + stream_Seek( p_stream, p_container->i_pos + + MP4_BOX_HEADERSIZE( p_container ) ); - return( MP4_ReadBoxContainerRaw( p_stream, p_container ) ); + return MP4_ReadBoxContainerRaw( p_stream, p_container ); } -void MP4_FreeBox_Common( input_thread_t *p_input, MP4_Box_t *p_box ) +static void MP4_FreeBox_Common( MP4_Box_t *p_box ) { /* Up to now do nothing */ } -int MP4_ReadBoxSkip( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBoxSkip( stream_t *p_stream, MP4_Box_t *p_box ) { + /* 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 ) + { + const uint8_t *p_peek; + int i_read; + vlc_fourcc_t i_fcc; + + 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; + + 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 ) + { + msg_Warn( p_stream, "detected moov hidden in a free box ..." ); + + p_box->i_type = FOURCC_foov; + return MP4_ReadBoxContainer( p_stream, p_box ); + } + } + } + /* Nothing to do */ #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, "Skip box: \"%4.4s\"", - (char*)&p_box->i_type ); + msg_Dbg( p_stream, "skip box: \"%4.4s\"", (char*)&p_box->i_type ); #endif - return( 1 ); + return 1; } -int MP4_ReadBox_ftyp( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_ftyp( stream_t *p_stream, MP4_Box_t *p_box ) { MP4_READBOX_ENTER( MP4_Box_data_ftyp_t ); @@ -641,13 +369,13 @@ int MP4_ReadBox_ftyp( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) MP4_READBOX_EXIT( 1 ); } -void MP4_FreeBox_ftyp( input_thread_t *p_input, MP4_Box_t *p_box ) +static void MP4_FreeBox_ftyp( MP4_Box_t *p_box ) { - FREE( p_box->data.p_ftyp->i_compatible_brands ); + FREENULL( p_box->data.p_ftyp->i_compatible_brands ); } -int MP4_ReadBox_mvhd( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_mvhd( stream_t *p_stream, MP4_Box_t *p_box ) { unsigned int i; #ifdef MP4_VERBOSE @@ -707,7 +435,7 @@ int MP4_ReadBox_mvhd( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) { s_duration[0] = 0; } - msg_Dbg( p_stream->p_input, "Read Box: \"mvhd\" creation %s modification %s time scale %d duration %s rate %f volume %f next track id %d", + msg_Dbg( p_stream, "read box: \"mvhd\" creation %s modification %s time scale %d duration %s rate %f volume %f next track id %d", s_creation_time, s_modification_time, (uint32_t)p_box->data.p_mvhd->i_timescale, @@ -719,7 +447,7 @@ int MP4_ReadBox_mvhd( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) MP4_READBOX_EXIT( 1 ); } -int MP4_ReadBox_tkhd( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_tkhd( stream_t *p_stream, MP4_Box_t *p_box ) { unsigned int i; #ifdef MP4_VERBOSE @@ -769,7 +497,7 @@ int MP4_ReadBox_tkhd( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) MP4_ConvertDate2Str( s_modification_time, p_box->data.p_mvhd->i_modification_time ); MP4_ConvertDate2Str( s_duration, p_box->data.p_mvhd->i_duration ); - msg_Dbg( p_stream->p_input, "Read Box: \"tkhd\" creation %s modification %s duration %s track ID %d layer %d volume %f width %f height %f", + msg_Dbg( p_stream, "read box: \"tkhd\" creation %s modification %s duration %s track ID %d layer %d volume %f width %f height %f", s_creation_time, s_modification_time, s_duration, @@ -782,32 +510,8 @@ int MP4_ReadBox_tkhd( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) MP4_READBOX_EXIT( 1 ); } -int MP4_ReadBox_tref( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) -{ - - if( p_box->i_size < (size_t)MP4_BOX_HEADERSIZE(p_box ) + 8 ) - { - /* container is empty, 8 stand for the first header in this box */ - return( 1 ); - } - - if( !MP4_SeekStream( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) ) ) - { - return( 0 ); - } - - MP4_ReadBoxContainerRaw( p_stream, p_box ); - -#ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, "Read Box: \"tref\" " ); - -#endif - return( 1 ); -} - - -int MP4_ReadBox_mdhd( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_mdhd( stream_t *p_stream, MP4_Box_t *p_box ) { unsigned int i; uint16_t i_language; @@ -847,7 +551,7 @@ int MP4_ReadBox_mdhd( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) MP4_ConvertDate2Str( s_creation_time, p_box->data.p_mdhd->i_creation_time ); MP4_ConvertDate2Str( s_modification_time, p_box->data.p_mdhd->i_modification_time ); MP4_ConvertDate2Str( s_duration, p_box->data.p_mdhd->i_duration ); - msg_Dbg( p_stream->p_input, "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 %c%c%c", s_creation_time, s_modification_time, (uint32_t)p_box->data.p_mdhd->i_timescale, @@ -860,20 +564,47 @@ int MP4_ReadBox_mdhd( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) } -int MP4_ReadBox_hdlr( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_hdlr( stream_t *p_stream, MP4_Box_t *p_box ) { + int32_t i_reserved; + MP4_READBOX_ENTER( MP4_Box_data_hdlr_t ); MP4_GETVERSIONFLAGS( p_box->data.p_hdlr ); - MP4_GET4BYTES( p_box->data.p_hdlr->i_predefined ); + MP4_GETFOURCC( p_box->data.p_hdlr->i_predefined ); MP4_GETFOURCC( p_box->data.p_hdlr->i_handler_type ); - p_box->data.p_hdlr->psz_name = calloc( sizeof( char ), i_read + 1 ); - memcpy( p_box->data.p_hdlr->psz_name, p_peek, i_read ); + MP4_GET4BYTES( i_reserved ); + MP4_GET4BYTES( i_reserved ); + MP4_GET4BYTES( i_reserved ); + p_box->data.p_hdlr->psz_name = NULL; + + if( i_read > 0 ) + { + p_box->data.p_hdlr->psz_name = calloc( sizeof( char ), i_read + 1 ); + + /* Yes, I love .mp4 :( */ + if( p_box->data.p_hdlr->i_predefined == VLC_FOURCC( 'm', 'h', 'l', 'r' ) ) + { + uint8_t i_len; + int i_copy; + + MP4_GET1BYTE( i_len ); + i_copy = __MIN( i_read, i_len ); + + memcpy( p_box->data.p_hdlr->psz_name, p_peek, i_copy ); + p_box->data.p_hdlr->psz_name[i_copy] = '\0'; + } + else + { + memcpy( p_box->data.p_hdlr->psz_name, p_peek, i_read ); + p_box->data.p_hdlr->psz_name[i_read] = '\0'; + } + } #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, "Read Box: \"hdlr\" hanler 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 ); @@ -881,12 +612,12 @@ int MP4_ReadBox_hdlr( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) MP4_READBOX_EXIT( 1 ); } -void MP4_FreeBox_hdlr( input_thread_t *p_input, MP4_Box_t *p_box ) +static void MP4_FreeBox_hdlr( MP4_Box_t *p_box ) { - FREE( p_box->data.p_hdlr->psz_name ); + FREENULL( p_box->data.p_hdlr->psz_name ); } -int MP4_ReadBox_vmhd( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_vmhd( stream_t *p_stream, MP4_Box_t *p_box ) { unsigned int i; @@ -901,7 +632,7 @@ int MP4_ReadBox_vmhd( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) } #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, "Read Box: \"vmhd\" graphics-mode %d opcolor (%d, %d, %d)", + msg_Dbg( p_stream, "read box: \"vmhd\" graphics-mode %d opcolor (%d, %d, %d)", p_box->data.p_vmhd->i_graphics_mode, p_box->data.p_vmhd->i_opcolor[0], p_box->data.p_vmhd->i_opcolor[1], @@ -910,7 +641,7 @@ int MP4_ReadBox_vmhd( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) MP4_READBOX_EXIT( 1 ); } -int MP4_ReadBox_smhd( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_smhd( stream_t *p_stream, MP4_Box_t *p_box ) { MP4_READBOX_ENTER( MP4_Box_data_smhd_t ); @@ -923,14 +654,14 @@ int MP4_ReadBox_smhd( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) MP4_GET2BYTES( p_box->data.p_smhd->i_reserved ); #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, "Read Box: \"smhd\" balance %f", + msg_Dbg( p_stream, "read box: \"smhd\" balance %f", (float)p_box->data.p_smhd->i_balance / 256 ); #endif MP4_READBOX_EXIT( 1 ); } -int MP4_ReadBox_hmhd( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_hmhd( stream_t *p_stream, MP4_Box_t *p_box ) { MP4_READBOX_ENTER( MP4_Box_data_hmhd_t ); @@ -945,7 +676,7 @@ int MP4_ReadBox_hmhd( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) MP4_GET4BYTES( p_box->data.p_hmhd->i_reserved ); #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, "Read Box: \"hmhd\" maxPDU-size %d avgPDU-size %d max-bitrate %d avg-bitrate %d", + msg_Dbg( p_stream, "read box: \"hmhd\" maxPDU-size %d avgPDU-size %d max-bitrate %d avg-bitrate %d", p_box->data.p_hmhd->i_max_PDU_size, p_box->data.p_hmhd->i_avg_PDU_size, p_box->data.p_hmhd->i_max_bitrate, @@ -954,7 +685,7 @@ int MP4_ReadBox_hmhd( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) MP4_READBOX_EXIT( 1 ); } -int MP4_ReadBox_url( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_url( stream_t *p_stream, MP4_Box_t *p_box ) { MP4_READBOX_ENTER( MP4_Box_data_url_t ); @@ -962,7 +693,7 @@ int MP4_ReadBox_url( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) MP4_GETSTRINGZ( p_box->data.p_url->psz_location ); #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, "Read Box: \"url\" url: %s", + msg_Dbg( p_stream, "read box: \"url\" url: %s", p_box->data.p_url->psz_location ); #endif @@ -970,12 +701,12 @@ int MP4_ReadBox_url( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) } -void MP4_FreeBox_url( input_thread_t *p_input, MP4_Box_t *p_box ) +static void MP4_FreeBox_url( MP4_Box_t *p_box ) { - FREE( p_box->data.p_url->psz_location ) + FREENULL( p_box->data.p_url->psz_location ) } -int MP4_ReadBox_urn( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_urn( stream_t *p_stream, MP4_Box_t *p_box ) { MP4_READBOX_ENTER( MP4_Box_data_urn_t ); @@ -985,20 +716,20 @@ int MP4_ReadBox_urn( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) MP4_GETSTRINGZ( p_box->data.p_urn->psz_location ); #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, "Read Box: \"urn\" name %s location %s", + msg_Dbg( p_stream, "read box: \"urn\" name %s location %s", p_box->data.p_urn->psz_name, p_box->data.p_urn->psz_location ); #endif MP4_READBOX_EXIT( 1 ); } -void MP4_FreeBox_urn( input_thread_t *p_input, MP4_Box_t *p_box ) +static void MP4_FreeBox_urn( MP4_Box_t *p_box ) { - FREE( p_box->data.p_urn->psz_name ); - FREE( p_box->data.p_urn->psz_location ); + FREENULL( p_box->data.p_urn->psz_name ); + FREENULL( p_box->data.p_urn->psz_location ); } -int MP4_ReadBox_dref( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_dref( stream_t *p_stream, MP4_Box_t *p_box ) { MP4_READBOX_ENTER( MP4_Box_data_dref_t ); @@ -1006,11 +737,11 @@ int MP4_ReadBox_dref( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) MP4_GET4BYTES( p_box->data.p_dref->i_entry_count ); - MP4_SeekStream( 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 - msg_Dbg( p_stream->p_input, "Read Box: \"dref\" entry-count %d", + msg_Dbg( p_stream, "read box: \"dref\" entry-count %d", p_box->data.p_dref->i_entry_count ); #endif @@ -1018,7 +749,7 @@ int MP4_ReadBox_dref( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) } -int MP4_ReadBox_stts( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_stts( stream_t *p_stream, MP4_Box_t *p_box ) { unsigned int i; MP4_READBOX_ENTER( MP4_Box_data_stts_t ); @@ -1038,20 +769,20 @@ int MP4_ReadBox_stts( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) } #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, "Read Box: \"stts\" entry-count %d", + msg_Dbg( p_stream, "read box: \"stts\" entry-count %d", p_box->data.p_stts->i_entry_count ); #endif MP4_READBOX_EXIT( 1 ); } -void MP4_FreeBox_stts( input_thread_t *p_input, MP4_Box_t *p_box ) +static void MP4_FreeBox_stts( MP4_Box_t *p_box ) { - FREE( p_box->data.p_stts->i_sample_count ); - FREE( p_box->data.p_stts->i_sample_delta ); + FREENULL( p_box->data.p_stts->i_sample_count ); + FREENULL( p_box->data.p_stts->i_sample_delta ); } -int MP4_ReadBox_ctts( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_ctts( stream_t *p_stream, MP4_Box_t *p_box ) { unsigned int i; MP4_READBOX_ENTER( MP4_Box_data_ctts_t ); @@ -1072,17 +803,17 @@ int MP4_ReadBox_ctts( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) } #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, "Read Box: \"ctts\" entry-count %d", + msg_Dbg( p_stream, "read box: \"ctts\" entry-count %d", p_box->data.p_ctts->i_entry_count ); #endif MP4_READBOX_EXIT( 1 ); } -void MP4_FreeBox_ctts( input_thread_t *p_input, MP4_Box_t *p_box ) +static void MP4_FreeBox_ctts( MP4_Box_t *p_box ) { - FREE( p_box->data.p_ctts->i_sample_count ); - FREE( p_box->data.p_ctts->i_sample_offset ); + FREENULL( p_box->data.p_ctts->i_sample_count ); + FREENULL( p_box->data.p_ctts->i_sample_offset ); } static int MP4_ReadLengthDescriptor( uint8_t **pp_peek, int64_t *i_read ) @@ -1100,7 +831,7 @@ static int MP4_ReadLengthDescriptor( uint8_t **pp_peek, int64_t *i_read ) return( i_len ); } -int MP4_ReadBox_esds( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_esds( stream_t *p_stream, MP4_Box_t *p_box ) { #define es_descriptor p_box->data.p_esds->es_descriptor unsigned int i_len; @@ -1117,6 +848,11 @@ int MP4_ReadBox_esds( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) { i_len = MP4_ReadLengthDescriptor( &p_peek, &i_read ); +#ifdef MP4_VERBOSE + msg_Dbg( p_stream, "found esds MPEG4ESDescr (%dBytes)", + i_len ); +#endif + MP4_GET2BYTES( es_descriptor.i_ES_ID ); MP4_GET1BYTE( i_flags ); es_descriptor.b_stream_dependence = ( (i_flags&0x80) != 0); @@ -1152,11 +888,17 @@ int MP4_ReadBox_esds( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) if( i_type != 0x04)/* MP4DecConfigDescrTag */ { - es_descriptor.p_decConfigDescr = NULL; - MP4_READBOX_EXIT( 1 ); /* rest isn't interesting up to now */ + es_descriptor.p_decConfigDescr = NULL; + MP4_READBOX_EXIT( 1 ); /* rest isn't interesting up to now */ } i_len = MP4_ReadLengthDescriptor( &p_peek, &i_read ); + +#ifdef MP4_VERBOSE + msg_Dbg( p_stream, "found esds MP4DecConfigDescr (%dBytes)", + i_len ); +#endif + es_descriptor.p_decConfigDescr = malloc( sizeof( MP4_descriptor_decoder_config_t )); @@ -1176,6 +918,12 @@ int MP4_ReadBox_esds( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) } i_len = MP4_ReadLengthDescriptor( &p_peek, &i_read ); + +#ifdef MP4_VERBOSE + msg_Dbg( p_stream, "found esds MP4DecSpecificDescr (%dBytes)", + i_len ); +#endif + es_descriptor.p_decConfigDescr->i_decoder_specific_info_len = i_len; es_descriptor.p_decConfigDescr->p_decoder_specific_info = malloc( i_len ); memcpy( es_descriptor.p_decConfigDescr->p_decoder_specific_info, @@ -1186,21 +934,131 @@ int MP4_ReadBox_esds( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) #undef es_descriptor } -void MP4_FreeBox_esds( input_thread_t *p_input, MP4_Box_t *p_box ) +static void MP4_FreeBox_esds( MP4_Box_t *p_box ) { - FREE( p_box->data.p_esds->es_descriptor.psz_URL ); + FREENULL( p_box->data.p_esds->es_descriptor.psz_URL ); if( p_box->data.p_esds->es_descriptor.p_decConfigDescr ) { - FREE( p_box->data.p_esds->es_descriptor.p_decConfigDescr->p_decoder_specific_info ); + FREENULL( p_box->data.p_esds->es_descriptor.p_decConfigDescr->p_decoder_specific_info ); } - FREE( p_box->data.p_esds->es_descriptor.p_decConfigDescr ); + FREENULL( p_box->data.p_esds->es_descriptor.p_decConfigDescr ); } -int MP4_ReadBox_sample_soun( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_avcC( stream_t *p_stream, MP4_Box_t *p_box ) +{ + MP4_Box_data_avcC_t *p_avcC; + int i; + + MP4_READBOX_ENTER( MP4_Box_data_avcC_t ); + p_avcC = p_box->data.p_avcC; + + p_avcC->i_avcC = i_read; + if( p_avcC->i_avcC > 0 ) + { + p_avcC->p_avcC = malloc( p_avcC->i_avcC ); + memcpy( p_avcC->p_avcC, p_peek, i_read ); + } + + MP4_GET1BYTE( p_avcC->i_version ); + MP4_GET1BYTE( p_avcC->i_profile ); + MP4_GET1BYTE( p_avcC->i_profile_compatibility ); + MP4_GET1BYTE( p_avcC->i_level ); + MP4_GET1BYTE( p_avcC->i_reserved1 ); + p_avcC->i_length_size = (p_avcC->i_reserved1&0x03) + 1; + p_avcC->i_reserved1 >>= 2; + + MP4_GET1BYTE( p_avcC->i_reserved2 ); + p_avcC->i_sps = p_avcC->i_reserved2&0x1f; + p_avcC->i_reserved2 >>= 5; + + 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* ) ); + + 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] ); + + 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* ) ); + + 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] ); + + p_peek += p_avcC->i_pps_length[i]; + i_read -= p_avcC->i_pps_length[i]; + } + } +#ifdef MP4_VERBOSE + msg_Dbg( p_stream, + "read box: \"avcC\" version=%d profile=0x%x level=0x%x length size=%d sps=%d pps=%d", + p_avcC->i_version, p_avcC->i_profile, p_avcC->i_level, + p_avcC->i_length_size, + p_avcC->i_sps, p_avcC->i_pps ); + for( i = 0; i < p_avcC->i_sps; i++ ) + { + msg_Dbg( p_stream, " - sps[%d] length=%d", + i, p_avcC->i_sps_length[i] ); + } + for( i = 0; i < p_avcC->i_pps; i++ ) + { + msg_Dbg( p_stream, " - pps[%d] length=%d", + i, p_avcC->i_pps_length[i] ); + } + +#endif + MP4_READBOX_EXIT( 1 ); +} + +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 ); + + 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 ); +} + +static int MP4_ReadBox_sample_soun( stream_t *p_stream, MP4_Box_t *p_box ) { unsigned int i; MP4_READBOX_ENTER( MP4_Box_data_sample_soun_t ); + p_box->data.p_sample_soun->p_qt_description = NULL; + + /* Sanity check needed because the "wave" box does also contain an + * "mp4a" box that we don't understand. */ + if( i_read < 28 ) + { + i_read -= 30; + MP4_READBOX_EXIT( 1 ); + } for( i = 0; i < 6 ; i++ ) { @@ -1209,17 +1067,25 @@ int MP4_ReadBox_sample_soun( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) MP4_GET2BYTES( p_box->data.p_sample_soun->i_data_reference_index ); + /* + * XXX hack -> produce a copy of the nearly complete chunk + */ + if( i_read > 0 ) + { + p_box->data.p_sample_soun->i_qt_description = i_read; + p_box->data.p_sample_soun->p_qt_description = malloc( 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; + } + MP4_GET2BYTES( p_box->data.p_sample_soun->i_qt_version ); MP4_GET2BYTES( p_box->data.p_sample_soun->i_qt_revision_level ); MP4_GET4BYTES( p_box->data.p_sample_soun->i_qt_vendor ); -#if 0 - for( i = 0; i < 2 ; i++ ) - { - MP4_GET4BYTES( p_box->data.p_sample_soun->i_reserved2[i] ); - } -#endif - 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 ); @@ -1227,22 +1093,49 @@ int MP4_ReadBox_sample_soun( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) MP4_GET2BYTES( p_box->data.p_sample_soun->i_sampleratehi ); MP4_GET2BYTES( p_box->data.p_sample_soun->i_sampleratelo ); - if( p_box->data.p_sample_soun->i_qt_version == 1 && - i_read >= 16 ) + if( p_box->data.p_sample_soun->i_qt_version == 1 && i_read >= 16 ) { - /* qt3+ */ + /* SoundDescriptionV1 */ MP4_GET4BYTES( p_box->data.p_sample_soun->i_sample_per_packet ); MP4_GET4BYTES( p_box->data.p_sample_soun->i_bytes_per_packet ); MP4_GET4BYTES( p_box->data.p_sample_soun->i_bytes_per_frame ); MP4_GET4BYTES( p_box->data.p_sample_soun->i_bytes_per_sample ); #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, - "Read Box: \"soun\" qt3+ sample/packet=%d bytes/packet=%d bytes/frame=%d bytes/sample=%d", - p_box->data.p_sample_soun->i_sample_per_packet, p_box->data.p_sample_soun->i_bytes_per_packet, - p_box->data.p_sample_soun->i_bytes_per_frame, p_box->data.p_sample_soun->i_bytes_per_sample ); + msg_Dbg( p_stream, + "read box: \"soun\" qt3+ sample/packet=%d bytes/packet=%d " + "bytes/frame=%d bytes/sample=%d", + p_box->data.p_sample_soun->i_sample_per_packet, + p_box->data.p_sample_soun->i_bytes_per_packet, + p_box->data.p_sample_soun->i_bytes_per_frame, + 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 ); + } + else if( p_box->data.p_sample_soun->i_qt_version == 2 && i_read >= 36 ) + { + /* SoundDescriptionV2 */ + double f_sample_rate; + 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 ); + + 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_sampleratelo = f_sample_rate / 65536; + + MP4_GET4BYTES( i_channel ); + p_box->data.p_sample_soun->i_channelcount = i_channel; + +#ifdef MP4_VERBOSE + msg_Dbg( p_stream, "read box: \"soun\" V2" ); #endif - MP4_SeekStream( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) + 44 ); + stream_Seek( p_stream, p_box->i_pos + + MP4_BOX_HEADERSIZE( p_box ) + 28 + 36 ); } else { @@ -1251,114 +1144,240 @@ int MP4_ReadBox_sample_soun( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) 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->p_input, "Read Box: \"soun\" mp4 or qt1/2 (rest=%d)", i_read ); - MP4_SeekStream( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) + 28 ); + msg_Dbg( p_stream, "read box: \"soun\" mp4 or qt1/2 (rest="I64Fd")", + 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 ) + { + msg_Err( p_stream, "drms_alloc() failed" ); + } + } + + if( p_box->i_type == FOURCC_samr || p_box->i_type == FOURCC_sawb ) + { + /* Ignore channelcount for AMR (3gpp AMRSpecificBox) */ + p_box->data.p_sample_soun->i_channelcount = 1; + } + + if( p_box->i_type == FOURCC_alac ) + { + if( p_box->data.p_sample_soun->p_qt_description ) + free( p_box->data.p_sample_soun->p_qt_description ); + + p_box->data.p_sample_soun->p_qt_description = malloc( i_read ); + 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 */ #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, "Read Box: \"soun\" in stsd channel %d sample size %d sampl rate %f", - p_box->data.p_sample_soun->i_channelcount, - p_box->data.p_sample_soun->i_samplesize, - (float)p_box->data.p_sample_soun->i_sampleratehi + - (float)p_box->data.p_sample_soun->i_sampleratelo / 65536 ); + msg_Dbg( p_stream, "read box: \"soun\" in stsd channel %d " + "sample size %d sample rate %f", + p_box->data.p_sample_soun->i_channelcount, + p_box->data.p_sample_soun->i_samplesize, + (float)p_box->data.p_sample_soun->i_sampleratehi + + (float)p_box->data.p_sample_soun->i_sampleratelo / 65536 ); #endif MP4_READBOX_EXIT( 1 ); } -#if 0 -int MP4_ReadBox_sample_mp4a( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) + +static void MP4_FreeBox_sample_soun( MP4_Box_t *p_box ) +{ + FREENULL( p_box->data.p_sample_soun->p_qt_description ); + + if( p_box->i_type == FOURCC_drms ) + { + if( p_box->data.p_sample_soun->p_drms ) + { + drms_free( p_box->data.p_sample_soun->p_drms ); + } + } +} + + +int MP4_ReadBox_sample_vide( stream_t *p_stream, MP4_Box_t *p_box ) { unsigned int i; - MP4_READBOX_ENTER( MP4_Box_data_sample_mp4a_t ); + MP4_READBOX_ENTER( MP4_Box_data_sample_vide_t ); for( i = 0; i < 6 ; i++ ) { - MP4_GET1BYTE( p_box->data.p_sample_mp4a->i_reserved1[i] ); + MP4_GET1BYTE( p_box->data.p_sample_vide->i_reserved1[i] ); } - MP4_GET2BYTES( p_box->data.p_sample_mp4a->i_data_reference_index ); + MP4_GET2BYTES( p_box->data.p_sample_vide->i_data_reference_index ); - for( i = 0; i < 2 ; i++ ) + /* + * XXX hack -> produce a copy of the nearly complete chunk + */ + if( i_read > 0 ) { - MP4_GET4BYTES( p_box->data.p_sample_mp4a->i_reserved2[i] ); + p_box->data.p_sample_vide->i_qt_image_description = i_read; + p_box->data.p_sample_vide->p_qt_image_description = malloc( i_read ); + memcpy( p_box->data.p_sample_vide->p_qt_image_description, + p_peek, i_read ); } + else + { + p_box->data.p_sample_vide->i_qt_image_description = 0; + p_box->data.p_sample_vide->p_qt_image_description = NULL; + } + + MP4_GET2BYTES( p_box->data.p_sample_vide->i_qt_version ); + MP4_GET2BYTES( p_box->data.p_sample_vide->i_qt_revision_level ); + MP4_GET4BYTES( p_box->data.p_sample_vide->i_qt_vendor ); + + MP4_GET4BYTES( p_box->data.p_sample_vide->i_qt_temporal_quality ); + MP4_GET4BYTES( p_box->data.p_sample_vide->i_qt_spatial_quality ); + + MP4_GET2BYTES( p_box->data.p_sample_vide->i_width ); + MP4_GET2BYTES( p_box->data.p_sample_vide->i_height ); + + MP4_GET4BYTES( p_box->data.p_sample_vide->i_horizresolution ); + MP4_GET4BYTES( p_box->data.p_sample_vide->i_vertresolution ); + + MP4_GET4BYTES( p_box->data.p_sample_vide->i_qt_data_size ); + MP4_GET2BYTES( p_box->data.p_sample_vide->i_qt_frame_count ); + + memcpy( &p_box->data.p_sample_vide->i_compressorname, p_peek, 32 ); + p_peek += 32; i_read -= 32; - MP4_GET2BYTES( p_box->data.p_sample_mp4a->i_channelcount ); - MP4_GET2BYTES( p_box->data.p_sample_mp4a->i_samplesize ); - MP4_GET2BYTES( p_box->data.p_sample_mp4a->i_predefined ); - MP4_GET2BYTES( p_box->data.p_sample_mp4a->i_reserved3 ); - MP4_GET2BYTES( p_box->data.p_sample_mp4a->i_sampleratehi ); - MP4_GET2BYTES( p_box->data.p_sample_mp4a->i_sampleratelo ); + MP4_GET2BYTES( p_box->data.p_sample_vide->i_depth ); + MP4_GET2BYTES( p_box->data.p_sample_vide->i_qt_color_table ); - MP4_SeekStream( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) + 28 ); - MP4_ReadBoxContainerRaw( p_stream, p_box ); /* esds */ + stream_Seek( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) + 78); + MP4_ReadBoxContainerRaw( p_stream, p_box ); #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, "Read Box: \"mp4a\" in stsd channel %d sample size %d sampl rate %f", - p_box->data.p_sample_mp4a->i_channelcount, - p_box->data.p_sample_mp4a->i_samplesize, - (float)p_box->data.p_sample_mp4a->i_sampleratehi + - (float)p_box->data.p_sample_mp4a->i_sampleratelo / 65536 ); + msg_Dbg( p_stream, "read box: \"vide\" in stsd %dx%d depth %d", + p_box->data.p_sample_vide->i_width, + p_box->data.p_sample_vide->i_height, + p_box->data.p_sample_vide->i_depth ); #endif MP4_READBOX_EXIT( 1 ); } -#endif -int MP4_ReadBox_sample_vide( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) + +void MP4_FreeBox_sample_vide( MP4_Box_t *p_box ) { - unsigned int i; + FREENULL( p_box->data.p_sample_vide->p_qt_image_description ); +} - MP4_READBOX_ENTER( MP4_Box_data_sample_vide_t ); +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 ); + MP4_ReadBoxContainerRaw( p_stream, p_box ); + return 1; +} - for( i = 0; i < 6 ; i++ ) - { - MP4_GET1BYTE( p_box->data.p_sample_vide->i_reserved1[i] ); - } +static int MP4_ReadBox_sample_text( stream_t *p_stream, MP4_Box_t *p_box ) +{ + int32_t t; - MP4_GET2BYTES( p_box->data.p_sample_vide->i_data_reference_index ); + MP4_READBOX_ENTER( MP4_Box_data_sample_text_t ); + + MP4_GET4BYTES( p_box->data.p_sample_text->i_reserved1 ); + MP4_GET2BYTES( p_box->data.p_sample_text->i_reserved2 ); - MP4_GET2BYTES( p_box->data.p_sample_vide->i_predefined1 ); - MP4_GET2BYTES( p_box->data.p_sample_vide->i_reserved2 ); + MP4_GET2BYTES( p_box->data.p_sample_text->i_data_reference_index ); - for( i = 0; i < 3 ; i++ ) + MP4_GET4BYTES( p_box->data.p_sample_text->i_display_flags ); + + MP4_GET4BYTES( t ); + switch( t ) { - MP4_GET4BYTES( p_box->data.p_sample_vide->i_predefined2[i] ); + /* FIXME search right signification */ + case 1: // Center + p_box->data.p_sample_text->i_justification_horizontal = 1; + p_box->data.p_sample_text->i_justification_vertical = 1; + break; + case -1: // Flush Right + p_box->data.p_sample_text->i_justification_horizontal = -1; + p_box->data.p_sample_text->i_justification_vertical = -1; + break; + case -2: // Flush Left + p_box->data.p_sample_text->i_justification_horizontal = 0; + p_box->data.p_sample_text->i_justification_vertical = 0; + break; + case 0: // Flush Default + default: + p_box->data.p_sample_text->i_justification_horizontal = 1; + p_box->data.p_sample_text->i_justification_vertical = -1; + break; } - MP4_GET2BYTES( p_box->data.p_sample_vide->i_width ); - MP4_GET2BYTES( p_box->data.p_sample_vide->i_height ); + MP4_GET2BYTES( p_box->data.p_sample_text->i_background_color[0] ); + MP4_GET2BYTES( p_box->data.p_sample_text->i_background_color[1] ); + MP4_GET2BYTES( p_box->data.p_sample_text->i_background_color[2] ); + p_box->data.p_sample_text->i_background_color[3] = 0; + + MP4_GET2BYTES( p_box->data.p_sample_text->i_text_box_top ); + MP4_GET2BYTES( p_box->data.p_sample_text->i_text_box_left ); + MP4_GET2BYTES( p_box->data.p_sample_text->i_text_box_bottom ); + 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" ); +#endif + MP4_READBOX_EXIT( 1 ); +} + +static int MP4_ReadBox_sample_tx3g( stream_t *p_stream, MP4_Box_t *p_box ) +{ + MP4_READBOX_ENTER( MP4_Box_data_sample_text_t ); + + MP4_GET4BYTES( p_box->data.p_sample_text->i_reserved1 ); + MP4_GET2BYTES( p_box->data.p_sample_text->i_reserved2 ); - MP4_GET4BYTES( p_box->data.p_sample_vide->i_horizresolution ); - MP4_GET4BYTES( p_box->data.p_sample_vide->i_vertresolution ); + MP4_GET2BYTES( p_box->data.p_sample_text->i_data_reference_index ); - MP4_GET4BYTES( p_box->data.p_sample_vide->i_reserved3 ); - MP4_GET2BYTES( p_box->data.p_sample_vide->i_predefined3 ); + MP4_GET4BYTES( p_box->data.p_sample_text->i_display_flags ); - memcpy( &p_box->data.p_sample_vide->i_compressorname, p_peek, 32 ); - p_peek += 32; i_read -= 32; + MP4_GET1BYTE ( p_box->data.p_sample_text->i_justification_horizontal ); + MP4_GET1BYTE ( p_box->data.p_sample_text->i_justification_vertical ); - MP4_GET2BYTES( p_box->data.p_sample_vide->i_depth ); - MP4_GET2BYTES( p_box->data.p_sample_vide->i_predefined4 ); + MP4_GET1BYTE ( p_box->data.p_sample_text->i_background_color[0] ); + MP4_GET1BYTE ( p_box->data.p_sample_text->i_background_color[1] ); + MP4_GET1BYTE ( p_box->data.p_sample_text->i_background_color[2] ); + MP4_GET1BYTE ( p_box->data.p_sample_text->i_background_color[3] ); - MP4_SeekStream( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) + 78); - MP4_ReadBoxContainerRaw( p_stream, p_box ); + MP4_GET2BYTES( p_box->data.p_sample_text->i_text_box_top ); + MP4_GET2BYTES( p_box->data.p_sample_text->i_text_box_left ); + MP4_GET2BYTES( p_box->data.p_sample_text->i_text_box_bottom ); + MP4_GET2BYTES( p_box->data.p_sample_text->i_text_box_right ); #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, "Read Box: \"vide\" in stsd %dx%d depth %d", - p_box->data.p_sample_vide->i_width, - p_box->data.p_sample_vide->i_height, - p_box->data.p_sample_vide->i_depth ); - + msg_Dbg( p_stream, "read box: \"text\" in stsd text" ); #endif MP4_READBOX_EXIT( 1 ); } -int MP4_ReadBox_stsd( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +#if 0 +/* We can't easily call it, and anyway ~ 20 bytes lost isn't a real problem */ +static void MP4_FreeBox_sample_text( MP4_Box_t *p_box ) +{ + FREENULL( p_box->data.p_sample_text->psz_text_name ); +} +#endif + + +static int MP4_ReadBox_stsd( stream_t *p_stream, MP4_Box_t *p_box ) { MP4_READBOX_ENTER( MP4_Box_data_stsd_t ); @@ -1367,12 +1386,12 @@ int MP4_ReadBox_stsd( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) MP4_GET4BYTES( p_box->data.p_stsd->i_entry_count ); - MP4_SeekStream( 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 - msg_Dbg( p_stream->p_input, "Read Box: \"stsd\" entry-count %d", + msg_Dbg( p_stream, "read box: \"stsd\" entry-count %d", p_box->data.p_stsd->i_entry_count ); #endif @@ -1380,7 +1399,7 @@ int MP4_ReadBox_stsd( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) } -int MP4_ReadBox_stsz( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_stsz( stream_t *p_stream, MP4_Box_t *p_box ) { unsigned int i; @@ -1404,7 +1423,7 @@ int MP4_ReadBox_stsz( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) } #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, "Read Box: \"stsz\" sample-size %d sample-count %d", + msg_Dbg( p_stream, "read box: \"stsz\" sample-size %d sample-count %d", p_box->data.p_stsz->i_sample_size, p_box->data.p_stsz->i_sample_count ); @@ -1412,12 +1431,12 @@ int MP4_ReadBox_stsz( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) MP4_READBOX_EXIT( 1 ); } -void MP4_FreeBox_stsz( input_thread_t *p_input, MP4_Box_t *p_box ) +static void MP4_FreeBox_stsz( MP4_Box_t *p_box ) { - FREE( p_box->data.p_stsz->i_entry_size ); + FREENULL( p_box->data.p_stsz->i_entry_size ); } -int MP4_ReadBox_stsc( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_stsc( stream_t *p_stream, MP4_Box_t *p_box ) { unsigned int i; @@ -1442,21 +1461,21 @@ int MP4_ReadBox_stsc( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) } #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, "Read Box: \"stsc\" entry-count %d", + msg_Dbg( p_stream, "read box: \"stsc\" entry-count %d", p_box->data.p_stsc->i_entry_count ); #endif MP4_READBOX_EXIT( 1 ); } -void MP4_FreeBox_stsc( input_thread_t *p_input, MP4_Box_t *p_box ) +static void MP4_FreeBox_stsc( MP4_Box_t *p_box ) { - FREE( p_box->data.p_stsc->i_first_chunk ); - FREE( p_box->data.p_stsc->i_samples_per_chunk ); - FREE( p_box->data.p_stsc->i_sample_description_index ); + FREENULL( p_box->data.p_stsc->i_first_chunk ); + FREENULL( p_box->data.p_stsc->i_samples_per_chunk ); + FREENULL( p_box->data.p_stsc->i_sample_description_index ); } -int MP4_ReadBox_stco_co64( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_stco_co64( stream_t *p_stream, MP4_Box_t *p_box ) { unsigned int i; @@ -1490,19 +1509,19 @@ int MP4_ReadBox_stco_co64( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) } #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, "Read Box: \"co64\" entry-count %d", + msg_Dbg( p_stream, "read box: \"co64\" entry-count %d", p_box->data.p_co64->i_entry_count ); #endif MP4_READBOX_EXIT( 1 ); } -void MP4_FreeBox_stco_co64( input_thread_t *p_input, MP4_Box_t *p_box ) +static void MP4_FreeBox_stco_co64( MP4_Box_t *p_box ) { - FREE( p_box->data.p_co64->i_chunk_offset ); + FREENULL( p_box->data.p_co64->i_chunk_offset ); } -int MP4_ReadBox_stss( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_stss( stream_t *p_stream, MP4_Box_t *p_box ) { unsigned int i; @@ -1524,19 +1543,19 @@ int MP4_ReadBox_stss( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) } #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, "Read Box: \"stss\" entry-count %d", + msg_Dbg( p_stream, "read box: \"stss\" entry-count %d", p_box->data.p_stss->i_entry_count ); #endif MP4_READBOX_EXIT( 1 ); } -void MP4_FreeBox_stss( input_thread_t *p_input, MP4_Box_t *p_box ) +static void MP4_FreeBox_stss( MP4_Box_t *p_box ) { - FREE( p_box->data.p_stss->i_sample_number ) + FREENULL( p_box->data.p_stss->i_sample_number ) } -int MP4_ReadBox_stsh( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_stsh( stream_t *p_stream, MP4_Box_t *p_box ) { unsigned int i; @@ -1562,20 +1581,20 @@ int MP4_ReadBox_stsh( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) } #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, "Read Box: \"stsh\" entry-count %d", + msg_Dbg( p_stream, "read box: \"stsh\" entry-count %d", p_box->data.p_stsh->i_entry_count ); #endif MP4_READBOX_EXIT( 1 ); } -void MP4_FreeBox_stsh( input_thread_t *p_input, MP4_Box_t *p_box ) +static void MP4_FreeBox_stsh( MP4_Box_t *p_box ) { - FREE( p_box->data.p_stsh->i_shadowed_sample_number ) - FREE( p_box->data.p_stsh->i_sync_sample_number ) + FREENULL( p_box->data.p_stsh->i_shadowed_sample_number ) + FREENULL( p_box->data.p_stsh->i_sync_sample_number ) } -int MP4_ReadBox_stdp( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_stdp( stream_t *p_stream, MP4_Box_t *p_box ) { unsigned int i; @@ -1593,19 +1612,19 @@ int MP4_ReadBox_stdp( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) } #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, "Read Box: \"stdp\" entry-count "I64Fd, + msg_Dbg( p_stream, "read box: \"stdp\" entry-count "I64Fd, i_read / 2 ); #endif MP4_READBOX_EXIT( 1 ); } -void MP4_FreeBox_stdp( input_thread_t *p_input, MP4_Box_t *p_box ) +static void MP4_FreeBox_stdp( MP4_Box_t *p_box ) { - FREE( p_box->data.p_stdp->i_priority ) + FREENULL( p_box->data.p_stdp->i_priority ) } -int MP4_ReadBox_padb( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_padb( stream_t *p_stream, MP4_Box_t *p_box ) { unsigned int i; @@ -1637,26 +1656,26 @@ int MP4_ReadBox_padb( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) } #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, "Read Box: \"stdp\" entry-count "I64Fd, + msg_Dbg( p_stream, "read box: \"stdp\" entry-count "I64Fd, i_read / 2 ); #endif MP4_READBOX_EXIT( 1 ); } -void MP4_FreeBox_padb( input_thread_t *p_input, MP4_Box_t *p_box ) +static void MP4_FreeBox_padb( MP4_Box_t *p_box ) { - FREE( p_box->data.p_padb->i_reserved1 ); - FREE( p_box->data.p_padb->i_pad2 ); - FREE( p_box->data.p_padb->i_reserved2 ); - FREE( p_box->data.p_padb->i_pad1 ); + FREENULL( p_box->data.p_padb->i_reserved1 ); + FREENULL( p_box->data.p_padb->i_pad2 ); + FREENULL( p_box->data.p_padb->i_reserved2 ); + FREENULL( p_box->data.p_padb->i_pad1 ); } -int MP4_ReadBox_elst( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_elst( stream_t *p_stream, MP4_Box_t *p_box ) { unsigned int i; - MP4_READBOX_ENTER( MP4_Box_data_padb_t ); + MP4_READBOX_ENTER( MP4_Box_data_elst_t ); MP4_GETVERSIONFLAGS( p_box->data.p_elst ); @@ -1666,7 +1685,7 @@ int MP4_ReadBox_elst( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) p_box->data.p_elst->i_segment_duration = calloc( sizeof( uint64_t ), p_box->data.p_elst->i_entry_count ); p_box->data.p_elst->i_media_time = - calloc( sizeof( uint64_t ), p_box->data.p_elst->i_entry_count ); + calloc( sizeof( int64_t ), p_box->data.p_elst->i_entry_count ); p_box->data.p_elst->i_media_rate_integer = calloc( sizeof( uint16_t ), p_box->data.p_elst->i_entry_count ); p_box->data.p_elst->i_media_rate_fraction= @@ -1688,6 +1707,7 @@ int MP4_ReadBox_elst( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) MP4_GET4BYTES( p_box->data.p_elst->i_segment_duration[i] ); MP4_GET4BYTES( p_box->data.p_elst->i_media_time[i] ); + p_box->data.p_elst->i_media_time[i] = (int32_t)p_box->data.p_elst->i_media_time[i]; } MP4_GET2BYTES( p_box->data.p_elst->i_media_rate_integer[i] ); @@ -1695,22 +1715,21 @@ int MP4_ReadBox_elst( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) } #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, "Read Box: \"elst\" entry-count "I64Fd, - i_read / 2 ); - + msg_Dbg( p_stream, "read box: \"elst\" entry-count %lu", + (unsigned long)p_box->data.p_elst->i_entry_count ); #endif MP4_READBOX_EXIT( 1 ); } -void MP4_FreeBox_elst( input_thread_t *p_input, MP4_Box_t *p_box ) +static void MP4_FreeBox_elst( MP4_Box_t *p_box ) { - FREE( p_box->data.p_elst->i_segment_duration ); - FREE( p_box->data.p_elst->i_media_time ); - FREE( p_box->data.p_elst->i_media_rate_integer ); - FREE( p_box->data.p_elst->i_media_rate_fraction ); + FREENULL( p_box->data.p_elst->i_segment_duration ); + FREENULL( p_box->data.p_elst->i_media_time ); + FREENULL( p_box->data.p_elst->i_media_rate_integer ); + FREENULL( p_box->data.p_elst->i_media_rate_fraction ); } -int MP4_ReadBox_cprt( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_cprt( stream_t *p_stream, MP4_Box_t *p_box ) { unsigned int i_language; unsigned int i; @@ -1729,7 +1748,7 @@ int MP4_ReadBox_cprt( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) MP4_GETSTRINGZ( p_box->data.p_cprt->psz_notice ); #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, "Read Box: \"cprt\" language %c%c%c notice %s", + 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], @@ -1739,26 +1758,26 @@ int MP4_ReadBox_cprt( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) MP4_READBOX_EXIT( 1 ); } -void MP4_FreeBox_cprt( input_thread_t *p_input, MP4_Box_t *p_box ) +static void MP4_FreeBox_cprt( MP4_Box_t *p_box ) { - FREE( p_box->data.p_cprt->psz_notice ); + FREENULL( p_box->data.p_cprt->psz_notice ); } -int MP4_ReadBox_dcom( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_dcom( stream_t *p_stream, MP4_Box_t *p_box ) { MP4_READBOX_ENTER( MP4_Box_data_dcom_t ); MP4_GETFOURCC( p_box->data.p_dcom->i_algorithm ); #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, - "Read Box: \"dcom\" compression algorithm : %4.4s", + msg_Dbg( p_stream, + "read box: \"dcom\" compression algorithm : %4.4s", (char*)&p_box->data.p_dcom->i_algorithm ); #endif MP4_READBOX_EXIT( 1 ); } -int MP4_ReadBox_cmvd( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_cmvd( stream_t *p_stream, MP4_Box_t *p_box ) { MP4_READBOX_ENTER( MP4_Box_data_cmvd_t ); @@ -1768,7 +1787,7 @@ int MP4_ReadBox_cmvd( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) if( !( p_box->data.p_cmvd->p_data = malloc( i_read ) ) ) { - msg_Dbg( p_stream->p_input, "Read Box: \"cmvd\" not enough memory to load data" ); + msg_Dbg( p_stream, "read box: \"cmvd\" not enough memory to load data" ); return( 1 ); } @@ -1780,78 +1799,77 @@ int MP4_ReadBox_cmvd( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) p_box->data.p_cmvd->b_compressed = 1; #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, "Read Box: \"cmvd\" compressed data size %d", + msg_Dbg( p_stream, "read box: \"cmvd\" compressed data size %d", p_box->data.p_cmvd->i_compressed_size ); #endif MP4_READBOX_EXIT( 1 ); } -void MP4_FreeBox_cmvd( input_thread_t *p_input, MP4_Box_t *p_box ) +static void MP4_FreeBox_cmvd( MP4_Box_t *p_box ) { - FREE( p_box->data.p_cmvd->p_data ); + FREENULL( p_box->data.p_cmvd->p_data ); } -int MP4_ReadBox_cmov( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_cmov( stream_t *p_stream, MP4_Box_t *p_box ) { - MP4_Stream_t *p_stream_memory; - MP4_Box_t *p_umov; - MP4_Box_t *p_dcom; MP4_Box_t *p_cmvd; + #ifdef HAVE_ZLIB_H - z_stream z_data; -#endif + stream_t *p_stream_memory; + z_stream z_data; uint8_t *p_data; - int i_result; +#endif if( !( p_box->data.p_cmov = malloc( sizeof( MP4_Box_data_cmov_t ) ) ) ) { - msg_Err( p_stream->p_input, "out of memory" ); - return( 0 ); + 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 ) ) + if( !p_box->p_father || + ( p_box->p_father->i_type != FOURCC_moov && + p_box->p_father->i_type != FOURCC_foov ) ) { - msg_Warn( p_stream->p_input, "Read box: \"cmov\" box alone" ); - return( 1 ); + msg_Warn( p_stream, "Read box: \"cmov\" box alone" ); + return 1; } - if( !(i_result = MP4_ReadBoxContainer( p_stream, p_box ) ) ) + if( !MP4_ReadBoxContainer( p_stream, p_box ) ) { - return( 0 ); + return 0; } - if( !( p_dcom = MP4_FindBox( p_box, FOURCC_dcom ) )|| - !( p_cmvd = MP4_FindBox( p_box, FOURCC_cmvd ) )|| - !( p_cmvd->data.p_cmvd->p_data ) ) + if( ( p_dcom = MP4_BoxGet( p_box, "dcom" ) ) == NULL || + ( p_cmvd = MP4_BoxGet( p_box, "cmvd" ) ) == NULL || + p_cmvd->data.p_cmvd->p_data == NULL ) { - msg_Warn( p_stream->p_input, "Read Box: \"cmov\" incomplete" ); - return( 1 ); + msg_Warn( p_stream, "read box: \"cmov\" incomplete" ); + return 1; } if( p_dcom->data.p_dcom->i_algorithm != FOURCC_zlib ) { - msg_Dbg( p_stream->p_input, "Read Box: \"cmov\" compression algorithm : %4.4s not supported", - (char*)&p_dcom->data.p_dcom->i_algorithm ); - return( 1 ); + msg_Dbg( p_stream, "read box: \"cmov\" compression algorithm : %4.4s " + "not supported", (char*)&p_dcom->data.p_dcom->i_algorithm ); + return 1; } #ifndef HAVE_ZLIB_H - msg_Dbg( p_stream->p_input, - "Read Box: \"cmov\" zlib unsupported" ); - return( 1 ); + msg_Dbg( p_stream, "read box: \"cmov\" zlib unsupported" ); + return 1; + #else /* decompress data */ /* allocate a new buffer */ if( !( p_data = malloc( p_cmvd->data.p_cmvd->i_uncompressed_size ) ) ) { - msg_Err( p_stream->p_input, - "Read Box: \"cmov\" not enough memory to uncompress data" ); - return( 1 ); + msg_Err( p_stream, "read box: \"cmov\" not enough memory to " + "uncompress data" ); + return 1; } /* init default structures */ z_data.next_in = p_cmvd->data.p_cmvd->p_data; @@ -1863,72 +1881,61 @@ int MP4_ReadBox_cmov( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) z_data.opaque = (voidpf)Z_NULL; /* init zlib */ - if( ( i_result = inflateInit( &z_data ) ) != Z_OK ) + if( inflateInit( &z_data ) != Z_OK ) { - msg_Err( p_stream->p_input, - "Read Box: \"cmov\" error while uncompressing data" ); + msg_Err( p_stream, "read box: \"cmov\" error while uncompressing" ); free( p_data ); - return( 1 ); + return 1; } /* uncompress */ i_result = inflate( &z_data, Z_NO_FLUSH ); - if( ( i_result != Z_OK )&&( i_result != Z_STREAM_END ) ) + if( i_result != Z_OK && i_result != Z_STREAM_END ) { - msg_Err( p_stream->p_input, - "Read Box: \"cmov\" error while uncompressing data" ); + msg_Err( p_stream, "read box: \"cmov\" error while uncompressing" ); free( p_data ); - return( 1 ); + return 1; } if( p_cmvd->data.p_cmvd->i_uncompressed_size != z_data.total_out ) { - msg_Warn( p_stream->p_input, - "Read Box: \"cmov\" uncompressing data size mismatch" ); + msg_Warn( p_stream, "read box: \"cmov\" uncompressing data size " + "mismatch" ); } p_cmvd->data.p_cmvd->i_uncompressed_size = z_data.total_out; /* close zlib */ - i_result = inflateEnd( &z_data ); - if( i_result != Z_OK ) + if( inflateEnd( &z_data ) != Z_OK ) { - msg_Warn( p_stream->p_input, - "Read Box: \"cmov\" error while uncompressing data (ignored)" ); + msg_Warn( p_stream, "read box: \"cmov\" error while uncompressing " + "data (ignored)" ); } - free( p_cmvd->data.p_cmvd->p_data ); p_cmvd->data.p_cmvd->p_data = p_data; p_cmvd->data.p_cmvd->b_compressed = 0; - msg_Dbg( p_stream->p_input, - "Read Box: \"cmov\" box succesfully uncompressed" ); + msg_Dbg( p_stream, "read box: \"cmov\" box succesfully uncompressed" ); - //DataDump( p_data, p_cmvd->data.p_cmvd->i_uncompressed_size ); /* now create a memory stream */ - p_stream_memory = MP4_MemoryStream( p_stream->p_input, - p_cmvd->data.p_cmvd->i_uncompressed_size, - p_cmvd->data.p_cmvd->p_data ); - - //DataDump( p_stream_memory->p_buffer, p_stream_memory->i_stop ); + 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 ); /* and read uncompressd moov */ - p_umov = malloc( sizeof( MP4_Box_t ) ); + p_box->data.p_cmov->p_moov = MP4_ReadBox( p_stream_memory, NULL ); - i_result = MP4_ReadBox( p_stream_memory, p_umov, NULL ); - - p_box->data.p_cmov->p_moov = p_umov; - free( p_stream_memory ); + stream_Delete( p_stream_memory ); #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, - "Read Box: \"cmov\" compressed movie header completed" ); + msg_Dbg( p_stream, "read box: \"cmov\" compressed movie header completed"); #endif - return( i_result ); + + return p_box->data.p_cmov->p_moov ? 1 : 0; #endif /* HAVE_ZLIB_H */ } -int MP4_ReadBox_rdrf( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_rdrf( stream_t *p_stream, MP4_Box_t *p_box ) { uint32_t i_len; MP4_READBOX_ENTER( MP4_Box_data_rdrf_t ); @@ -1939,7 +1946,7 @@ int MP4_ReadBox_rdrf( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) if( i_len > 0 ) { uint32_t i; - p_box->data.p_rdrf->psz_ref = malloc( i_len ); + p_box->data.p_rdrf->psz_ref = malloc( i_len + 1); for( i = 0; i < i_len; i++ ) { MP4_GET1BYTE( p_box->data.p_rdrf->psz_ref[i] ); @@ -1952,21 +1959,22 @@ int MP4_ReadBox_rdrf( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) } #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, - "Read Box: \"rdrf\" type:%4.4s ref %s", + msg_Dbg( p_stream, + "read box: \"rdrf\" type:%4.4s ref %s", (char*)&p_box->data.p_rdrf->i_ref_type, p_box->data.p_rdrf->psz_ref ); #endif MP4_READBOX_EXIT( 1 ); } -void MP4_FreeBox_rdrf( input_thread_t *p_input, MP4_Box_t *p_box ) + +static void MP4_FreeBox_rdrf( MP4_Box_t *p_box ) { - FREE( p_box->data.p_rdrf->psz_ref ) + FREENULL( p_box->data.p_rdrf->psz_ref ) } -int MP4_ReadBox_rmdr( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_rmdr( stream_t *p_stream, MP4_Box_t *p_box ) { MP4_READBOX_ENTER( MP4_Box_data_rmdr_t ); @@ -1975,28 +1983,28 @@ int MP4_ReadBox_rmdr( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) MP4_GET4BYTES( p_box->data.p_rmdr->i_rate ); #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, - "Read Box: \"rmdr\" rate:%d", + msg_Dbg( p_stream, + "read box: \"rmdr\" rate:%d", p_box->data.p_rmdr->i_rate ); #endif MP4_READBOX_EXIT( 1 ); } -int MP4_ReadBox_rmqu( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_rmqu( stream_t *p_stream, MP4_Box_t *p_box ) { MP4_READBOX_ENTER( MP4_Box_data_rmqu_t ); MP4_GET4BYTES( p_box->data.p_rmqu->i_quality ); #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, - "Read Box: \"rmqu\" quality:%d", + msg_Dbg( p_stream, + "read box: \"rmqu\" quality:%d", p_box->data.p_rmqu->i_quality ); #endif MP4_READBOX_EXIT( 1 ); } -int MP4_ReadBox_rmvc( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) +static int MP4_ReadBox_rmvc( stream_t *p_stream, MP4_Box_t *p_box ) { MP4_READBOX_ENTER( MP4_Box_data_rmvc_t ); MP4_GETVERSIONFLAGS( p_box->data.p_rmvc ); @@ -2007,8 +2015,8 @@ int MP4_ReadBox_rmvc( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) MP4_GET2BYTES( p_box->data.p_rmvc->i_checkType ); #ifdef MP4_VERBOSE - msg_Dbg( p_stream->p_input, - "Read Box: \"rmvc\" gestaltType:%4.4s val1:0x%x val2:0x%x checkType:0x%x", + msg_Dbg( p_stream, + "read box: \"rmvc\" gestaltType:%4.4s val1:0x%x val2:0x%x checkType:0x%x", (char*)&p_box->data.p_rmvc->i_gestaltType, p_box->data.p_rmvc->i_val1,p_box->data.p_rmvc->i_val2, p_box->data.p_rmvc->i_checkType ); @@ -2017,6 +2025,290 @@ int MP4_ReadBox_rmvc( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) 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; + + 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 ); + + if( p_drms_box && p_drms_box->data.p_sample_soun->p_drms ) + { + int i_ret; + if( config_GetInt( p_stream, "france" ) ) + { + i_ret = -7; + } + else + { + i_ret= drms_init( p_drms_box->data.p_sample_soun->p_drms, + p_box->i_type, p_peek, i_read ); + } + if( i_ret ) + { + const char *psz_error; + + switch( i_ret ) + { + case -1: psz_error = "unimplemented"; break; + case -2: psz_error = "invalid argument"; break; + case -3: psz_error = "could not get system key"; break; + case -4: psz_error = "could not get SCI data"; break; + case -5: psz_error = "no user key found in SCI data"; break; + case -6: psz_error = "invalid user key"; break; + case -7: psz_error = "you live in France"; break; + default: psz_error = "unknown error"; break; + } + + msg_Err( p_stream, "drms_init(%4.4s) failed (%s)", + (char *)&p_box->i_type, psz_error ); + + drms_free( p_drms_box->data.p_sample_soun->p_drms ); + p_drms_box->data.p_sample_soun->p_drms = NULL; + } + } + + MP4_READBOX_EXIT( 1 ); +} + +static int MP4_ReadBox_0xa9xxx( stream_t *p_stream, MP4_Box_t *p_box ) +{ + uint16_t i_length, i_dummy; + + MP4_READBOX_ENTER( MP4_Box_data_0xa9xxx_t ); + + p_box->data.p_0xa9xxx->psz_text = NULL; + + MP4_GET2BYTES( i_length ); + + if( i_length > 0 ) + { + MP4_GET2BYTES( i_dummy ); + if( i_length > i_read ) i_length = i_read; + + p_box->data.p_0xa9xxx->psz_text = malloc( i_length + 1 ); + + memcpy( p_box->data.p_0xa9xxx->psz_text, + p_peek, i_length ); + p_box->data.p_0xa9xxx->psz_text[i_length] = '\0'; + +#ifdef MP4_VERBOSE + msg_Dbg( p_stream, + "read box: \"c%3.3s\" text=`%s'", + ((char*)&p_box->i_type + 1), + p_box->data.p_0xa9xxx->psz_text ); +#endif + } + else + { + /* try iTune/Quicktime format, rewind to start */ + p_peek -= 2; i_read += 2; + // we are expecting a 'data' box + uint32_t i_data_len; + uint32_t i_data_tag; + + 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')) ) + { + /* data box contains a version/flags field */ + uint32_t i_version; + uint32_t i_reserved; + MP4_GET4BYTES( i_version ); + MP4_GET4BYTES( i_reserved ); + // version should be 0, flags should be 1 for text, 0 for data + if( i_version == 0x00000001 ) + { + // the rest is the text + i_data_len -= 12; + p_box->data.p_0xa9xxx->psz_text = malloc( i_data_len + 1 ); + + memcpy( p_box->data.p_0xa9xxx->psz_text, + p_peek, i_data_len ); + p_box->data.p_0xa9xxx->psz_text[i_data_len] = '\0'; +#ifdef MP4_VERBOSE + msg_Dbg( p_stream, + "read box: \"c%3.3s\" text=`%s'", + ((char*)&p_box->i_type+1), + p_box->data.p_0xa9xxx->psz_text ); +#endif + } + else + { + // TODO: handle data values for ID3 tag values, track num or cover art,etc... + } + } + } + + MP4_READBOX_EXIT( 1 ); +} +static void MP4_FreeBox_0xa9xxx( MP4_Box_t *p_box ) +{ + FREENULL( p_box->data.p_0xa9xxx->psz_text ); +} + +/* Chapter support */ +static int MP4_ReadBox_chpl( stream_t *p_stream, MP4_Box_t *p_box ) +{ + MP4_Box_data_chpl_t *p_chpl; + uint32_t i_dummy; + int i; + MP4_READBOX_ENTER( MP4_Box_data_chpl_t ); + + p_chpl = p_box->data.p_chpl; + + MP4_GETVERSIONFLAGS( p_chpl ); + + MP4_GET4BYTES( i_dummy ); + + MP4_GET1BYTE( p_chpl->i_chapter ); + + for( i = 0; i < p_chpl->i_chapter; i++ ) + { + uint64_t i_start; + uint8_t i_len; + int i_copy; + MP4_GET8BYTES( i_start ); + MP4_GET1BYTE( i_len ); + + p_chpl->chapter[i].psz_name = malloc( i_len + 1 ); + i_copy = __MIN( i_len, i_read ); + if( i_copy > 0 ) + memcpy( p_chpl->chapter[i].psz_name, p_peek, i_copy ); + p_chpl->chapter[i].psz_name[i_copy] = '\0'; + p_chpl->chapter[i].i_start = i_start; + + p_peek += i_copy; + i_read -= i_copy; + } + /* Bubble sort by increasing start date */ + do + { + for( i = 0; i < p_chpl->i_chapter - 1; i++ ) + { + if( p_chpl->chapter[i].i_start > p_chpl->chapter[i+1].i_start ) + { + char *psz = p_chpl->chapter[i+1].psz_name; + int64_t i64 = p_chpl->chapter[i+1].i_start; + + p_chpl->chapter[i+1].psz_name = p_chpl->chapter[i].psz_name; + p_chpl->chapter[i+1].i_start = p_chpl->chapter[i].i_start; + + p_chpl->chapter[i].psz_name = psz; + p_chpl->chapter[i].i_start = i64; + + i = -1; + break; + } + } + } while( i == -1 ); + +#ifdef MP4_VERBOSE + msg_Dbg( p_stream, "read box: \"chpl\" %d chapters", + 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 ); +} + +static int MP4_ReadBox_tref_generic( stream_t *p_stream, MP4_Box_t *p_box ) +{ + unsigned int i; + MP4_READBOX_ENTER( MP4_Box_data_tref_generic_t ); + + p_box->data.p_tref_generic->i_track_ID = NULL; + p_box->data.p_tref_generic->i_entry_count = i_read / sizeof(uint32_t); + if( p_box->data.p_tref_generic->i_entry_count > 0 ) + p_box->data.p_tref_generic->i_track_ID = malloc( p_box->data.p_tref_generic->i_entry_count * sizeof(uint32_t) ); + + for( i = 0; i < p_box->data.p_tref_generic->i_entry_count; i++ ) + { + MP4_GET4BYTES( p_box->data.p_tref_generic->i_track_ID[i] ); + } +#ifdef MP4_VERBOSE + msg_Dbg( p_stream, "read box: \"chap\" %d references", + p_box->data.p_tref_generic->i_entry_count ); +#endif + + MP4_READBOX_EXIT( 1 ); +} +static void MP4_FreeBox_tref_generic( MP4_Box_t *p_box ) +{ + FREENULL( p_box->data.p_tref_generic->i_track_ID ); +} + +static int MP4_ReadBox_meta( stream_t *p_stream, MP4_Box_t *p_box ) +{ + uint8_t meta_data[8]; + int i_actually_read; + + // skip over box header + i_actually_read = stream_Read( p_stream, meta_data, 8 ); + if( i_actually_read < 8 ) + return 0; + + /* meta content starts with a 4 byte version/flags value (should be 0) */ + i_actually_read = stream_Read( p_stream, meta_data, 4 ); + if( i_actually_read < 4 ) + return 0; + + /* then it behaves like a container */ + return MP4_ReadBoxContainerRaw( p_stream, p_box ); +} + +/* For generic */ +static int MP4_ReadBox_default( stream_t *p_stream, MP4_Box_t *p_box ) +{ + if( !p_box->p_father ) + { + goto unknown; + } + if( p_box->p_father->i_type == FOURCC_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 || + (p_hdlr = MP4_BoxGet( p_mdia, "hdlr" )) == NULL ) + { + goto unknown; + } + switch( p_hdlr->data.p_hdlr->i_handler_type ) + { + case FOURCC_soun: + return MP4_ReadBox_sample_soun( p_stream, p_box ); + case FOURCC_vide: + return MP4_ReadBox_sample_vide( p_stream, p_box ); + case FOURCC_text: + return MP4_ReadBox_sample_text( p_stream, p_box ); + case FOURCC_tx3g: + return MP4_ReadBox_sample_tx3g( p_stream, p_box ); + default: + msg_Warn( p_stream, + "unknown handler type in stsd (uncompletetly loaded)" ); + return 1; + } + } + +unknown: + msg_Warn( p_stream, + "unknown box type %4.4s (uncompletetly loaded)", + (char*)&p_box->i_type ); + + return 1; +} + /**** ------------------------------------------------------------------- ****/ /**** "Higher level" Functions ****/ /**** ------------------------------------------------------------------- ****/ @@ -2024,8 +2316,8 @@ int MP4_ReadBox_rmvc( MP4_Stream_t *p_stream, MP4_Box_t *p_box ) static struct { uint32_t i_type; - int (*MP4_ReadBox_function )( MP4_Stream_t *p_stream, MP4_Box_t *p_box ); - void (*MP4_FreeBox_function )( input_thread_t *p_input, MP4_Box_t *p_box ); + int (*MP4_ReadBox_function )( stream_t *p_stream, MP4_Box_t *p_box ); + void (*MP4_FreeBox_function )( MP4_Box_t *p_box ); } MP4_Box_Function [] = { /* Containers */ @@ -2042,13 +2334,16 @@ static struct { 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 }, /* 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_tref, MP4_ReadBox_tref, 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 }, @@ -2073,6 +2368,7 @@ static struct { 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 }, /* Nothing to do with this box */ { FOURCC_mdat, MP4_ReadBoxSkip, MP4_FreeBox_Common }, @@ -2081,61 +2377,82 @@ static struct { FOURCC_wide, MP4_ReadBoxSkip, MP4_FreeBox_Common }, /* for codecs */ - { FOURCC_soun, MP4_ReadBox_sample_soun, MP4_FreeBox_Common }, - { FOURCC_ms02, MP4_ReadBox_sample_soun, MP4_FreeBox_Common }, - { FOURCC_ms11, MP4_ReadBox_sample_soun, MP4_FreeBox_Common }, - { FOURCC_ms55, MP4_ReadBox_sample_soun, MP4_FreeBox_Common }, - { FOURCC__mp3, MP4_ReadBox_sample_soun, MP4_FreeBox_Common }, - { FOURCC_mp4a, MP4_ReadBox_sample_soun, MP4_FreeBox_Common }, - { FOURCC_twos, MP4_ReadBox_sample_soun, MP4_FreeBox_Common }, - { FOURCC_sowt, MP4_ReadBox_sample_soun, MP4_FreeBox_Common }, - { FOURCC_QDMC, MP4_ReadBox_sample_soun, MP4_FreeBox_Common }, - { FOURCC_QDM2, MP4_ReadBox_sample_soun, MP4_FreeBox_Common }, - { FOURCC_ima4, MP4_ReadBox_sample_soun, MP4_FreeBox_Common }, - { FOURCC_IMA4, MP4_ReadBox_sample_soun, MP4_FreeBox_Common }, - { FOURCC_dvi, MP4_ReadBox_sample_soun, MP4_FreeBox_Common }, - { FOURCC_alaw, MP4_ReadBox_sample_soun, MP4_FreeBox_Common }, - { FOURCC_ulaw, MP4_ReadBox_sample_soun, MP4_FreeBox_Common }, - { FOURCC_raw, MP4_ReadBox_sample_soun, MP4_FreeBox_Common }, - { FOURCC_MAC3, MP4_ReadBox_sample_soun, MP4_FreeBox_Common }, - { FOURCC_MAC6, MP4_ReadBox_sample_soun, MP4_FreeBox_Common }, - - { FOURCC_vide, MP4_ReadBox_sample_vide, MP4_FreeBox_Common }, - { FOURCC_mp4v, MP4_ReadBox_sample_vide, MP4_FreeBox_Common }, - { FOURCC_SVQ1, MP4_ReadBox_sample_vide, MP4_FreeBox_Common }, - { FOURCC_SVQ3, MP4_ReadBox_sample_vide, MP4_FreeBox_Common }, - { FOURCC_DIVX, MP4_ReadBox_sample_vide, MP4_FreeBox_Common }, - { FOURCC_h263, MP4_ReadBox_sample_vide, MP4_FreeBox_Common }, - { FOURCC_cvid, MP4_ReadBox_sample_vide, MP4_FreeBox_Common }, - { FOURCC_3IV1, MP4_ReadBox_sample_vide, MP4_FreeBox_Common }, - { FOURCC_3iv1, MP4_ReadBox_sample_vide, MP4_FreeBox_Common }, - { FOURCC_3IV2, MP4_ReadBox_sample_vide, MP4_FreeBox_Common }, - { FOURCC_3iv2, MP4_ReadBox_sample_vide, MP4_FreeBox_Common }, - { FOURCC_3IVD, MP4_ReadBox_sample_vide, MP4_FreeBox_Common }, - { FOURCC_3ivd, MP4_ReadBox_sample_vide, MP4_FreeBox_Common }, - { FOURCC_3VID, MP4_ReadBox_sample_vide, MP4_FreeBox_Common }, - { FOURCC_3vid, MP4_ReadBox_sample_vide, MP4_FreeBox_Common }, - { FOURCC_mjpa, MP4_ReadBox_sample_vide, MP4_FreeBox_Common }, - { FOURCC_mjpb, MP4_ReadBox_sample_vide, MP4_FreeBox_Common }, - { FOURCC_mjqt, NULL, NULL }, /* found in mjpa/b */ - { FOURCC_mjht, NULL, NULL }, - { FOURCC_dvc, MP4_ReadBox_sample_vide, MP4_FreeBox_Common }, - { FOURCC_dvp, MP4_ReadBox_sample_vide, MP4_FreeBox_Common }, - - { FOURCC_jpeg, MP4_ReadBox_sample_vide, MP4_FreeBox_Common }, - - { FOURCC_mp4s, NULL, MP4_FreeBox_Common }, + { 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_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 }, /* XXX there is 2 box where we could find this entry stbl and tref*/ - { FOURCC_hint, NULL, MP4_FreeBox_Common }, + { FOURCC_hint, MP4_ReadBox_default, MP4_FreeBox_Common }, /* found in tref box */ - { FOURCC_dpnd, NULL, NULL }, - { FOURCC_ipir, NULL, NULL }, - { FOURCC_mpod, NULL, NULL }, + { 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 }, /* found in hnti */ - { FOURCC_rtp, NULL, NULL }, + { FOURCC_rtp, MP4_ReadBox_default, NULL }, /* found in rmra */ { FOURCC_rdrf, MP4_ReadBox_rdrf, MP4_FreeBox_rdrf }, @@ -2143,8 +2460,49 @@ static struct { 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 }, + + /* 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 }, + + /* iTunes/Quicktime meta info */ + { FOURCC_meta, MP4_ReadBox_meta, MP4_FreeBox_Common }, + /* Last entry */ - { 0, NULL, NULL } + { 0, MP4_ReadBox_default, NULL } }; @@ -2153,20 +2511,22 @@ static struct * MP4_ReadBox : parse the actual box and the children * XXX : Do not go to the next box *****************************************************************************/ -int MP4_ReadBox( MP4_Stream_t *p_stream, MP4_Box_t *p_box, MP4_Box_t *p_father ) +static MP4_Box_t *MP4_ReadBox( stream_t *p_stream, MP4_Box_t *p_father ) { - int i_result; + MP4_Box_t *p_box = malloc( sizeof( MP4_Box_t ) ); unsigned int i_index; if( !MP4_ReadBoxCommon( p_stream, p_box ) ) { - msg_Warn( p_stream->p_input, "Cannot read one box" ); - return( 0 ); + msg_Warn( p_stream, "cannot read one box" ); + free( p_box ); + return NULL; } if( !p_box->i_size ) { - msg_Dbg( p_stream->p_input, "Found an empty box (null size)" ); - return( 0 ); + msg_Dbg( p_stream, "found an empty box (null size)" ); + free( p_box ); + return NULL; } p_box->p_father = p_father; @@ -2179,154 +2539,36 @@ int MP4_ReadBox( MP4_Stream_t *p_stream, MP4_Box_t *p_box, MP4_Box_t *p_father ) break; } } - if( MP4_Box_Function[i_index].MP4_ReadBox_function == NULL ) - { - msg_Warn( p_stream->p_input, - "Unknown box type %4.4s (uncompletetly loaded)", - (char*)&p_box->i_type ); - return( 1 ); - } - else - { - i_result = - (MP4_Box_Function[i_index].MP4_ReadBox_function)( p_stream, p_box ); - } - - if( !MP4_GotoBox( p_stream, p_box ) ) - { - return( 0 ); - } - return( i_result ); -} -#if 0 -/***************************************************************************** - * MP4_CountBox: given a box, count how many child have the requested type - * FIXME : support GUUID - *****************************************************************************/ -int MP4_CountBox( MP4_Box_t *p_box, uint32_t i_type ) -{ - unsigned int i_count; - MP4_Box_t *p_child; - - if( !p_box ) - { - return( 0 ); - } - - i_count = 0; - p_child = p_box->p_first; - while( p_child ) - { - if( p_child->i_type == i_type ) - { - i_count++; - } - p_child = p_child->p_next; - } - - return( i_count ); -} -#endif - -/***************************************************************************** - * MP4_FindBox: find first box with i_type child of p_box - * return NULL if not found - *****************************************************************************/ - -MP4_Box_t *MP4_FindBox( MP4_Box_t *p_box, uint32_t i_type ) -{ - MP4_Box_t *p_child; - - if( !p_box ) - { - return( NULL ); - } - - p_child = p_box->p_first; - while( p_child ) - { - if( p_child->i_type == i_type ) - { - return( p_child ); - } - p_child = p_child->p_next; - } - - return( NULL ); -} - - -#if 0 -/***************************************************************************** - * MP4_FindNextBox: find next box with thesame type and at the same level - * than p_box - *****************************************************************************/ -MP4_Box_t *MP4_FindNextBox( MP4_Box_t *p_box ) -{ - MP4_Box_t *p_next; - - if( !p_box ) - { - return( NULL ); - } - - p_next = p_box->p_next; - while( p_next ) - { - if( p_next->i_type == p_box->i_type ) - { - return( p_next ); - } - p_next = p_next->p_next; - } - return( NULL ); -} -/***************************************************************************** - * MP4_FindNbBox: find the box i_number - *****************************************************************************/ -MP4_Box_t *MP4_FindNbBox( MP4_Box_t *p_box, uint32_t i_number ) -{ - MP4_Box_t *p_child = p_box->p_first; - if( !p_child ) + if( !(MP4_Box_Function[i_index].MP4_ReadBox_function)( p_stream, p_box ) ) { - return( NULL ); + free( p_box ); + return NULL; } - while( i_number ) - { - if( !( p_child = p_child->p_next ) ) - { - return( NULL ); - } - i_number--; - } - return( p_child ); + return p_box; } -#endif /***************************************************************************** * MP4_FreeBox : free memory after read with MP4_ReadBox and all * the children *****************************************************************************/ -void MP4_BoxFree( input_thread_t *p_input, MP4_Box_t *p_box ) +void MP4_BoxFree( stream_t *s, MP4_Box_t *p_box ) { unsigned int i_index; - - MP4_Box_t *p_child; - MP4_Box_t *p_next; + MP4_Box_t *p_child; if( !p_box ) { return; /* hehe */ } - p_child = p_box->p_first; - while( p_child ) + + for( p_child = p_box->p_first; p_child != NULL; ) { + MP4_Box_t *p_next; + p_next = p_child->p_next; - MP4_BoxFree( p_input, p_child ); - /* MP4_FreeBoxChildren have free all data expect p_child itself */ - free( p_child ); + MP4_BoxFree( s, p_child ); p_child = p_next; } @@ -2344,22 +2586,19 @@ void MP4_BoxFree( input_thread_t *p_input, MP4_Box_t *p_box ) if( MP4_Box_Function[i_index].MP4_FreeBox_function == NULL ) { /* Should not happen */ - msg_Warn( p_input, + msg_Warn( s, "cannot free box %4.4s, type unknown", (char*)&p_box->i_type ); } else { - MP4_Box_Function[i_index].MP4_FreeBox_function( p_input, p_box ); + MP4_Box_Function[i_index].MP4_FreeBox_function( p_box ); } free( p_box->data.p_data ); - p_box->data.p_data = NULL; } - p_box->p_first = NULL; - p_box->p_last = NULL; - + free( p_box ); } /***************************************************************************** @@ -2368,16 +2607,17 @@ void MP4_BoxFree( input_thread_t *p_input, MP4_Box_t *p_box ) * The first box is a virtual box "root" and is the father for all first * level boxes for the file, a sort of virtual contener *****************************************************************************/ -int MP4_BoxGetRoot( input_thread_t *p_input, MP4_Box_t *p_root ) +MP4_Box_t *MP4_BoxGetRoot( stream_t *s ) { - MP4_Stream_t *p_stream; + MP4_Box_t *p_root; + stream_t *p_stream; int i_result; - MP4_SeekAbsolute( p_input, 0 ); /* Go to the begining */ + p_root = malloc( sizeof( MP4_Box_t ) ); p_root->i_pos = 0; p_root->i_type = VLC_FOURCC( 'r', 'o', 'o', 't' ); p_root->i_shortsize = 1; - p_root->i_size = p_input->stream.p_selected_area->i_size; + p_root->i_size = stream_Size( s ); CreateUUID( &p_root->i_uuid, p_root->i_type ); p_root->data.p_data = NULL; @@ -2386,12 +2626,10 @@ int MP4_BoxGetRoot( input_thread_t *p_input, MP4_Box_t *p_root ) p_root->p_last = NULL; p_root->p_next = NULL; - p_stream = MP4_InputStream( p_input ); + p_stream = s; i_result = MP4_ReadBoxContainerRaw( p_stream, p_root ); - free( p_stream ); - if( i_result ) { MP4_Box_t *p_child; @@ -2400,8 +2638,10 @@ int MP4_BoxGetRoot( input_thread_t *p_input, MP4_Box_t *p_root ) /* check if there is a cmov, if so replace compressed moov by uncompressed one */ - if( ( p_moov = MP4_FindBox( p_root, FOURCC_moov ) )&& - ( p_cmov = MP4_FindBox( p_moov, FOURCC_cmov ) ) ) + if( ( ( p_moov = MP4_BoxGet( p_root, "moov" ) ) && + ( p_cmov = MP4_BoxGet( p_root, "moov/cmov" ) ) ) || + ( ( p_moov = MP4_BoxGet( p_root, "foov" ) ) && + ( p_cmov = MP4_BoxGet( p_root, "foov/cmov" ) ) ) ) { /* rename the compressed moov as a box to skip */ p_moov->i_type = FOURCC_skip; @@ -2418,18 +2658,19 @@ int MP4_BoxGetRoot( input_thread_t *p_input, MP4_Box_t *p_root ) p_root->p_first = p_moov; } } - return( i_result ); + + return p_root; } -static void __MP4_BoxDumpStructure( input_thread_t *p_input, +static void __MP4_BoxDumpStructure( stream_t *s, MP4_Box_t *p_box, unsigned int i_level ) { MP4_Box_t *p_child; if( !i_level ) { - msg_Dbg( p_input, "Dumping root Box \"%4.4s\"", + msg_Dbg( s, "dumping root Box \"%4.4s\"", (char*)&p_box->i_type ); } else @@ -2445,19 +2686,19 @@ static void __MP4_BoxDumpStructure( input_thread_t *p_input, (char*)&p_box->i_type, (uint32_t)p_box->i_size ); - msg_Dbg( p_input, "%s", str ); + msg_Dbg( s, "%s", str ); } p_child = p_box->p_first; while( p_child ) { - __MP4_BoxDumpStructure( p_input, p_child, i_level + 1 ); + __MP4_BoxDumpStructure( s, p_child, i_level + 1 ); p_child = p_child->p_next; } } -void MP4_BoxDumpStructure( input_thread_t *p_input, MP4_Box_t *p_box ) +void MP4_BoxDumpStructure( stream_t *s, MP4_Box_t *p_box ) { - __MP4_BoxDumpStructure( p_input, p_box, 0 ); + __MP4_BoxDumpStructure( s, p_box, 0 ); } @@ -2520,12 +2761,10 @@ static void __get_token( char **ppsz_path, char **ppsz_token, int *pi_number ) } static void __MP4_BoxGet( MP4_Box_t **pp_result, - MP4_Box_t *p_box, char *psz_fmt, va_list args) + MP4_Box_t *p_box, const char *psz_fmt, va_list args) { + char *psz_dup; char *psz_path; -#if !defined(HAVE_VASPRINTF) || defined(SYS_DARWIN) - size_t i_size; -#endif if( !p_box ) { @@ -2533,24 +2772,17 @@ static void __MP4_BoxGet( MP4_Box_t **pp_result, return; } -#if defined(HAVE_VASPRINTF) && !defined(SYS_DARWIN) vasprintf( &psz_path, psz_fmt, args ); -#else - i_size = strlen( psz_fmt ) + 1024; - psz_path = calloc( i_size, sizeof( char ) ); - vsnprintf( psz_path, i_size, psz_fmt, args ); - psz_path[i_size - 1] = 0; -#endif if( !psz_path || !psz_path[0] ) { - FREE( psz_path ); + FREENULL( psz_path ); *pp_result = NULL; return; } // fprintf( stderr, "path:'%s'\n", psz_path ); - psz_fmt = psz_path; /* keep this pointer, as it need to be unallocated */ + psz_dup = psz_path; /* keep this pointer, as it need to be unallocated */ for( ; ; ) { char *psz_token; @@ -2561,8 +2793,8 @@ static void __MP4_BoxGet( MP4_Box_t **pp_result, // psz_path,psz_token,i_number ); if( !psz_token ) { - FREE( psz_token ); - free( psz_fmt ); + FREENULL( psz_token ); + free( psz_dup ); *pp_result = p_box; return; } @@ -2577,7 +2809,7 @@ static void __MP4_BoxGet( MP4_Box_t **pp_result, if( !p_box ) { free( psz_token ); - free( psz_fmt ); + free( psz_dup ); *pp_result = NULL; return; } @@ -2594,7 +2826,7 @@ static void __MP4_BoxGet( MP4_Box_t **pp_result, if( !p_box ) { free( psz_token ); - free( psz_fmt ); + free( psz_dup ); *pp_result = NULL; return; } @@ -2611,7 +2843,7 @@ static void __MP4_BoxGet( MP4_Box_t **pp_result, if( !p_box ) { free( psz_token ); - free( psz_fmt ); + free( psz_dup ); *pp_result = NULL; return; } @@ -2635,7 +2867,7 @@ static void __MP4_BoxGet( MP4_Box_t **pp_result, if( !p_box ) { free( psz_token ); - free( psz_fmt ); + free( psz_dup ); *pp_result = NULL; return; } @@ -2650,8 +2882,8 @@ static void __MP4_BoxGet( MP4_Box_t **pp_result, else { // fprintf( stderr, "Argg malformed token \"%s\"",psz_token ); - FREE( psz_token ); - free( psz_fmt ); + FREENULL( psz_token ); + free( psz_dup ); *pp_result = NULL; return; } @@ -2669,7 +2901,7 @@ static void __MP4_BoxGet( MP4_Box_t **pp_result, * ex: /moov/trak[12] * ../mdia *****************************************************************************/ -MP4_Box_t *MP4_BoxGet( MP4_Box_t *p_box, char *psz_fmt, ... ) +MP4_Box_t *MP4_BoxGet( MP4_Box_t *p_box, const char *psz_fmt, ... ) { va_list args; MP4_Box_t *p_result; @@ -2690,7 +2922,7 @@ MP4_Box_t *MP4_BoxGet( MP4_Box_t *p_box, char *psz_fmt, ... ) * ex: /moov/trak[12] * ../mdia *****************************************************************************/ -int MP4_BoxCount( MP4_Box_t *p_box, char *psz_fmt, ... ) +int MP4_BoxCount( MP4_Box_t *p_box, const char *psz_fmt, ... ) { va_list args; int i_count; @@ -2714,4 +2946,3 @@ int MP4_BoxCount( MP4_Box_t *p_box, char *psz_fmt, ... ) } return( i_count ); } -