/*****************************************************************************
* libmp4.c : LibMP4 library for mp4 module for vlc
*****************************************************************************
- * Copyright (C) 2001-2004 VideoLAN
+ * Copyright (C) 2001-2004 the VideoLAN team
* $Id$
*
* Author: Laurent Aimar <fenrir@via.ecp.fr>
*
* 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 <stdlib.h> /* malloc(), free() */
-
#include <vlc/vlc.h>
-#include <vlc/input.h>
+
+
+#include <vlc_demux.h>
#ifdef HAVE_ZLIB_H
# include <zlib.h> /* for compressed moov */
* *look* at the code.
*
*****************************************************************************/
-#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_GET1BYTE( dst ) \
- dst = *p_peek; p_peek++; i_read--
-
-#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_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_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( stream_Read( p_stream, p_peek, i_read ) < 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 ); \
} \
return( i_code )
-#define FREE( p ) \
- if( p ) {free( p ); p = NULL; }
-
-
/* Some assumptions:
* The input method HAVE to be seekable
*/
-static uint32_t Get24bBE( uint8_t *p )
+static uint32_t Get24bBE( const uint8_t *p )
{
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 );
}
i_hour = ( i_date /( 60*60 ) ) % 60;
i_min = ( i_date / 60 ) % 60;
i_sec = i_date % 60;
- sprintf( psz, "%dd-%2.2dh:%2.2dm:%2.2ds",
- i_day, i_hour, i_min, i_sec );
+ sprintf( psz, "%dd-%2.2dh:%2.2dm:%2.2ds", i_day, i_hour, i_min, i_sec );
}
/*****************************************************************************
int MP4_ReadBoxCommon( stream_t *p_stream, MP4_Box_t *p_box )
{
int i_read;
- uint8_t *p_peek;
+ const uint8_t *p_peek;
if( ( ( i_read = stream_Peek( p_stream, &p_peek, 32 ) ) < 8 ) )
{
- return( 0 );
+ return 0;
}
p_box->i_pos = stream_Tell( p_stream );
if( p_box->i_size )
{
msg_Dbg( p_stream, "found Box: %4.4s size "I64Fd,
- (char*)&p_box->i_type,
- p_box->i_size );
+ (char*)&p_box->i_type, p_box->i_size );
}
#endif
- return( 1 );
+ return 1;
}
-
/*****************************************************************************
* 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 ).
*****************************************************************************/
static int MP4_NextBox( 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 */
}
}
if( stream_Seek( p_stream, p_box->i_size + p_box->i_pos ) )
MP4_Box_t *p_box;
if( stream_Tell( p_stream ) + 8 >
- (off_t)(p_container->i_pos + p_container->i_size) )
+ (off_t)(p_container->i_pos + p_container->i_size) )
{
/* there is no box to load */
- return( 0 );
+ return 0;
}
do
{
- if( ( p_box = MP4_ReadBox( p_stream, p_container ) ) == NULL )
- {
- break;
- }
+ if( ( p_box = MP4_ReadBox( p_stream, p_container ) ) == NULL ) 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;
- }
+ 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 );
- return( 1 );
+ return 1;
}
-
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 */
- stream_Seek( p_stream, p_container->i_pos + MP4_BOX_HEADERSIZE( 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 );
}
static void MP4_FreeBox_Common( 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' )&&
+ if( p_box->p_father &&
+ p_box->p_father->i_type == VLC_FOURCC( 'r', 'o', 'o', 't' ) &&
p_box->i_type == FOURCC_free )
{
- uint8_t *p_peek;
+ const uint8_t *p_peek;
int i_read;
vlc_fourcc_t i_fcc;
}
}
}
+
/* Nothing to do */
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream, "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;
}
static int MP4_ReadBox_ftyp( stream_t *p_stream, 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 );
}
MP4_GET4BYTES( i_reserved );
MP4_GET4BYTES( i_reserved );
MP4_GET4BYTES( i_reserved );
+ p_box->data.p_hdlr->psz_name = NULL;
- 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' ) )
+ if( i_read > 0 )
{
- uint8_t i_len;
- int i_copy;
+ p_box->data.p_hdlr->psz_name = calloc( sizeof( char ), i_read + 1 );
- MP4_GET1BYTE( i_len );
- i_copy = __MIN( i_read, i_len );
+ /* 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;
- 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';
- }
+ 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, "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 );
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 );
}
static int MP4_ReadBox_vmhd( stream_t *p_stream, 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 )
}
static int MP4_ReadBox_urn( stream_t *p_stream, 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 );
}
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 );
}
static int MP4_ReadBox_ctts( stream_t *p_stream, 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 )
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 );
}
static int MP4_ReadBox_avcC( stream_t *p_stream, MP4_Box_t *p_box )
p_avcC = p_box->data.p_avcC;
p_avcC->i_avcC = i_read;
- p_avcC->p_avcC = malloc( p_avcC->i_avcC );
- memcpy( p_avcC->p_avcC, p_peek, 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 );
}
#ifdef MP4_VERBOSE
msg_Dbg( p_stream,
- "read box: \"avcC\" version=%d profile=0x%x level=0x%x lengh size=%d sps=%d pps=%d",
+ "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 );
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++ )
{
- FREE( p_avcC->sps[i] );
+ FREENULL( p_avcC->sps[i] );
}
for( i = 0; i < p_avcC->i_pps; i++ )
{
- FREE( p_avcC->pps[i] );
+ FREENULL( p_avcC->pps[i] );
}
- if( p_avcC->i_sps > 0 ) FREE( p_avcC->sps );
- if( p_avcC->i_pps > 0 ) FREE( p_avcC->pps );
+ 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 )
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 );
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
+ stream_Seek( p_stream, p_box->i_pos +
+ MP4_BOX_HEADERSIZE( p_box ) + 28 + 36 );
+ }
else
{
p_box->data.p_sample_soun->i_sample_per_packet = 0;
if( p_box->i_type == FOURCC_drms )
{
p_box->data.p_sample_soun->p_drms =
- drms_alloc( p_stream->p_vlc->psz_homedir );
+ drms_alloc( p_stream->p_libvlc->psz_homedir );
if( p_box->data.p_sample_soun->p_drms == NULL )
{
}
}
- MP4_ReadBoxContainerRaw( p_stream, p_box ); /* esds */
+ 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 */
+ }
#ifdef MP4_VERBOSE
msg_Dbg( p_stream, "read box: \"soun\" in stsd channel %d "
- "sample size %d sampl rate %f",
+ "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 +
static void MP4_FreeBox_sample_soun( MP4_Box_t *p_box )
{
- FREE( p_box->data.p_sample_soun->p_qt_description );
+ FREENULL( p_box->data.p_sample_soun->p_qt_description );
if( p_box->i_type == FOURCC_drms )
{
void MP4_FreeBox_sample_vide( MP4_Box_t *p_box )
{
- FREE( p_box->data.p_sample_vide->p_qt_image_description );
+ FREENULL( p_box->data.p_sample_vide->p_qt_image_description );
}
static int MP4_ReadBox_sample_mp4s( stream_t *p_stream, MP4_Box_t *p_box )
static int MP4_ReadBox_sample_text( stream_t *p_stream, MP4_Box_t *p_box )
{
- unsigned int i;
+ int32_t t;
MP4_READBOX_ENTER( MP4_Box_data_sample_text_t );
- for( i = 0; i < 6 ; i++ )
- {
- MP4_GET1BYTE( p_box->data.p_sample_text->i_reserved1[i] );
- }
+ 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_text->i_data_reference_index );
MP4_GET4BYTES( p_box->data.p_sample_text->i_display_flags );
- MP4_GET4BYTES( p_box->data.p_sample_text->i_justification );
+
+ MP4_GET4BYTES( t );
+ switch( t )
+ {
+ /* 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_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 );
+}
- MP4_GET8BYTES( p_box->data.p_sample_text->i_text_box );
- MP4_GET8BYTES( p_box->data.p_sample_text->i_reserved2 );
+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_GET2BYTES( p_box->data.p_sample_text->i_font_number );
- MP4_GET2BYTES( p_box->data.p_sample_text->i_font_face );
+ 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_text->i_reserved3 );
+ MP4_GET2BYTES( p_box->data.p_sample_text->i_data_reference_index );
- MP4_GET2BYTES( p_box->data.p_sample_text->i_foreground_color[0] );
- MP4_GET2BYTES( p_box->data.p_sample_text->i_foreground_color[1] );
- MP4_GET2BYTES( p_box->data.p_sample_text->i_foreground_color[2] );
+ MP4_GET4BYTES( p_box->data.p_sample_text->i_display_flags );
- MP4_GET1BYTE( i );
- p_box->data.p_sample_text->psz_text_name = malloc( i + 1 );
- memcpy( p_box->data.p_sample_text->psz_text_name, p_peek, i );
- p_box->data.p_sample_text->psz_text_name[i] = '\0';
+ MP4_GET1BYTE ( p_box->data.p_sample_text->i_justification_horizontal );
+ MP4_GET1BYTE ( p_box->data.p_sample_text->i_justification_vertical );
+
+ 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_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 name=%s",
- p_box->data.p_sample_text->psz_text_name );
+ msg_Dbg( p_stream, "read box: \"text\" in stsd text" );
#endif
MP4_READBOX_EXIT( 1 );
}
+
#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 )
{
- FREE( p_box->data.p_sample_text->psz_text_name );
+ FREENULL( p_box->data.p_sample_text->psz_text_name );
}
#endif
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 );
}
static int MP4_ReadBox_stsc( stream_t *p_stream, 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 );
}
static int MP4_ReadBox_stco_co64( stream_t *p_stream, 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 );
}
static int MP4_ReadBox_stss( stream_t *p_stream, 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 )
}
static int MP4_ReadBox_stsh( stream_t *p_stream, 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 )
}
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 )
}
static int MP4_ReadBox_padb( stream_t *p_stream, 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 );
}
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 );
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream, "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 );
}
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 );
}
static int MP4_ReadBox_cprt( stream_t *p_stream, 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 );
}
}
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 );
}
{
MP4_Box_t *p_dcom;
MP4_Box_t *p_cmvd;
+
#ifdef HAVE_ZLIB_H
stream_t *p_stream_memory;
- z_stream z_data;
+ z_stream z_data;
uint8_t *p_data;
-#endif
-
int i_result;
+#endif
if( !( p_box->data.p_cmov = malloc( sizeof( MP4_Box_data_cmov_t ) ) ) )
{
msg_Err( p_stream, "out of memory" );
- return( 0 );
+ return 0;
}
memset( p_box->data.p_cmov, 0, sizeof( MP4_Box_data_cmov_t ) );
if( !p_box->p_father ||
- ( p_box->p_father->i_type != FOURCC_moov && p_box->p_father->i_type != FOURCC_foov) )
+ ( p_box->p_father->i_type != FOURCC_moov &&
+ p_box->p_father->i_type != FOURCC_foov ) )
{
msg_Warn( p_stream, "Read box: \"cmov\" box alone" );
- return( 1 );
+ 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_BoxGet( p_box, "dcom" ) ) == NULL ||
p_cmvd->data.p_cmvd->p_data == NULL )
{
msg_Warn( p_stream, "read box: \"cmov\" incomplete" );
- return( 1 );
+ return 1;
}
if( p_dcom->data.p_dcom->i_algorithm != FOURCC_zlib )
{
- msg_Dbg( p_stream, "read box: \"cmov\" compression algorithm : %4.4s not supported",
- (char*)&p_dcom->data.p_dcom->i_algorithm );
- return( 1 );
+ 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,
- "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,
- "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;
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,
- "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,
- "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,
- "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,
- "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,
- "read box: \"cmov\" box succesfully uncompressed" );
+ msg_Dbg( p_stream, "read box: \"cmov\" box succesfully uncompressed" );
/* now create a memory stream */
- p_stream_memory = stream_MemoryNew( VLC_OBJECT(p_stream),
- p_cmvd->data.p_cmvd->p_data,
- p_cmvd->data.p_cmvd->i_uncompressed_size);
+ 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_box->data.p_cmov->p_moov = MP4_ReadBox( p_stream_memory, NULL );
- free( p_stream_memory );
+ stream_Delete( p_stream_memory );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream,
- "read box: \"cmov\" compressed movie header completed" );
+ msg_Dbg( p_stream, "read box: \"cmov\" compressed movie header completed");
#endif
- return( p_box->data.p_cmov->p_moov ? 1 : 0 );
+
+ return p_box->data.p_cmov->p_moov ? 1 : 0;
#endif /* HAVE_ZLIB_H */
}
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 )
}
if( p_drms_box && p_drms_box->data.p_sample_soun->p_drms )
{
- if( drms_init( p_drms_box->data.p_sample_soun->p_drms,
- p_box->i_type, p_peek, i_read ) )
+ 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 )
{
- msg_Err( p_stream, "drms_init( %4.4s ) failed",
- (char *)&p_box->i_type );
+ 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;
static int MP4_ReadBox_0xa9xxx( stream_t *p_stream, MP4_Box_t *p_box )
{
- int16_t i_length, i_dummy;
+ 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 );
- MP4_GET2BYTES( i_dummy );
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 );
#ifdef MP4_VERBOSE
msg_Dbg( p_stream,
- "read box: \"%4.4s\" text=`%s'",
- (char*)&p_box->i_type,
+ "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 )
{
- FREE( p_box->data.p_0xa9xxx->psz_text );
+ 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 */
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)" );
{ 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_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_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_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_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, MP4_ReadBox_default, NULL },
{ 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, MP4_ReadBox_default, NULL }
};
}
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( !p_box )
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;
// 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;
}
if( !p_box )
{
free( psz_token );
- free( psz_fmt );
+ free( psz_dup );
*pp_result = NULL;
return;
}
if( !p_box )
{
free( psz_token );
- free( psz_fmt );
+ free( psz_dup );
*pp_result = NULL;
return;
}
if( !p_box )
{
free( psz_token );
- free( psz_fmt );
+ free( psz_dup );
*pp_result = NULL;
return;
}
if( !p_box )
{
free( psz_token );
- free( psz_fmt );
+ free( psz_dup );
*pp_result = NULL;
return;
}
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;
}
* 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;
* 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;
projects / vlc / blobdiff