* libmp4.c : LibMP4 library for mp4 module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: libmp4.c,v 1.6 2002/09/18 23:34:28 fenrir Exp $
+ * $Id: libmp4.c,v 1.27 2003/05/10 11:05:52 hartman Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
- *
+ *
* 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#include "libmp4.h"
/*****************************************************************************
- * Here are defined some macro to make life simpler but before using it
- * *look* at the code.
+ * 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 ) \
+ ( 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_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_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 = NULL; \
}
-
+
#define MP4_READBOX_ENTER( MP4_Box_data_TYPE_t ) \
- s64 i_read = p_box->i_size; \
- u8 *p_peek, *p_buff; \
+ int64_t i_read = p_box->i_size; \
+ uint8_t *p_peek, *p_buff; \
i_read = p_box->i_size; \
if( !( p_peek = p_buff = malloc( i_read ) ) ) \
{ \
return( 0 ); \
} \
- if( !MP4_ReadStream( p_stream, p_peek, i_read ) )\
+ if( MP4_ReadStream( p_stream, p_peek, i_read ) )\
{ \
free( p_buff ); \
return( 0 ); \
{ \
free( p_buff ); \
return( 0 ); \
- }
-
+ }
+
#define MP4_READBOX_EXIT( i_code ) \
free( p_buff ); \
if( i_read < 0 ) \
#define FREE( p ) \
if( p ) {free( p ); p = NULL; }
-
-
+
+
/* Some assumptions:
- * The input method HAVE to be seekable
-
+ * The input method HAVE to be seekable
+
*/
/* Some functions to manipulate memory */
-static u16 GetWLE( u8 *p_buff )
+static uint16_t GetWLE( uint8_t *p_buff )
{
return( (p_buff[0]) + ( p_buff[1] <<8 ) );
}
-static u32 GetDWLE( u8 *p_buff )
+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 u16 GetWBE( u8 *p_buff )
+static uint16_t GetWBE( uint8_t *p_buff )
{
return( (p_buff[0]<<8) + p_buff[1] );
}
-static u32 Get24bBE( u8 *p_buff )
+static uint32_t Get24bBE( uint8_t *p_buff )
{
return( ( p_buff[0] <<16 ) + ( p_buff[1] <<8 ) + p_buff[2] );
}
-static u32 GetDWBE( u8 *p_buff )
+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 u64 GetQWBE( u8 *p_buff )
+static uint64_t GetQWBE( uint8_t *p_buff )
{
- return( ( (u64)GetDWBE( p_buff ) << 32 )|( (u64)GetDWBE( p_buff + 4 ) ) );
+ return( ( (uint64_t)GetDWBE( p_buff ) << 32 )|( (uint64_t)GetDWBE( p_buff + 4 ) ) );
}
-static void GetUUID( UUID_t *p_uuid, u8 *p_buff )
+static void GetUUID( UUID_t *p_uuid, uint8_t *p_buff )
{
- memcpy( p_uuid,
+ memcpy( p_uuid,
p_buff,
16 );
}
-static void CreateUUID( UUID_t *p_uuid, u32 i_fourcc )
+static void CreateUUID( UUID_t *p_uuid, uint32_t i_fourcc )
{
- /* made by 0xXXXXXXXX-0011-0010-8000-00aa00389b71
+ /* made by 0xXXXXXXXX-0011-0010-8000-00aa00389b71
where XXXXXXXX is the fourcc */
/* FIXME implement this */
}
/* some functions for mp4 encoding of variables */
-void MP4_ConvertDate2Str( char *psz, u64 i_date )
+void MP4_ConvertDate2Str( char *psz, uint64_t i_date )
{
int i_day;
int i_hour;
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 */
+ /* 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" );
+}
+#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
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 );
+
+ i_pos= p_input->stream.p_selected_area->i_tell;
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_pos)
{
off_t i_filepos;
- if( i_pos >= p_input->stream.p_selected_area->i_size )
+ //msg_Warn( p_input, "seek to %lld/%lld", i_pos, p_input->stream.p_selected_area->i_size );
+
+ if( p_input->stream.p_selected_area->i_size > 0 &&
+ i_pos >= p_input->stream.p_selected_area->i_size )
{
- return( 0 );
+ msg_Warn( p_input, "seek:after end of file" );
+ return VLC_EGENERIC;
}
-
+
i_filepos = MP4_TellAbsolute( p_input );
- if( i_pos != i_filepos )
+
+ if( i_filepos == i_pos )
+ {
+ return VLC_SUCCESS;
+ }
+
+ if( p_input->stream.b_seekable &&
+ ( p_input->stream.i_method == INPUT_METHOD_FILE ||
+ i_pos - i_filepos < 0 ||
+ i_pos - i_filepos > 1024 ) )
{
- p_input->pf_seek( p_input, i_pos );
input_AccessReinit( p_input );
+ p_input->pf_seek( p_input, i_pos );
+ return VLC_SUCCESS;
+ }
+ else if( i_pos - i_filepos > 0 )
+ {
+ data_packet_t *p_data;
+ int i_skip = i_pos - i_filepos;
+
+ msg_Warn( p_input, "will skip %d bytes, slow", i_skip );
+
+ while (i_skip > 0 )
+ {
+ int i_read;
+
+ i_read = input_SplitBuffer( p_input, &p_data,
+ __MIN( 4096, i_skip ) );
+ if( i_read < 0 )
+ {
+ msg_Warn( p_input, "seek:cannot read" );
+ return VLC_EGENERIC;
+ }
+ i_skip -= i_read;
+
+ input_DeletePacket( p_input->p_method_data, p_data );
+ if( i_read == 0 && i_skip > 0 )
+ {
+ msg_Warn( p_input, "seek:cannot read" );
+ return VLC_EGENERIC;
+ }
+ }
+ return VLC_SUCCESS;
+ }
+ else
+ {
+ msg_Warn( p_input, "seek:failed" );
+ return VLC_EGENERIC;
}
- return( 1 );
}
/* return 1 if success, 0 if fail */
-int MP4_ReadData( input_thread_t *p_input, u8 *p_buff, int i_size )
+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 );
+ return( VLC_SUCCESS );
}
do
i_read = input_SplitBuffer(p_input, &p_data, __MIN( i_size, 1024 ) );
if( i_read <= 0 )
{
- return( 0 );
+ return( VLC_EGENERIC );
}
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 );
+
+ return( VLC_SUCCESS );
}
/*****************************************************************************
/****************************************************************************
* MP4_MemoryStream create a memory stream
- * if p_buffer == NULL, will allocate a buffer of i_size, else
+ * 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, u8 *p_buffer )
+ int i_size, uint8_t *p_buffer )
{
MP4_Stream_t *p_stream;
p_stream->p_input = p_input;
p_stream->i_start = 0;
p_stream->i_stop = i_size;
- if( !p_stream->p_buffer )
+ if( !p_buffer )
{
if( !( p_stream->p_buffer = malloc( i_size ) ) )
{
* MP4_ReadStream read from a MP4_Stream_t
*
****************************************************************************/
-int MP4_ReadStream( MP4_Stream_t *p_stream, u8 *p_buff, int i_size )
+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 );
+ return( VLC_EGENERIC );
}
- memcpy( p_buff,
+ memcpy( p_buff,
p_stream->p_buffer + p_stream->i_start,
i_size );
p_stream->i_start += i_size;
- return( 1 );
+ return( VLC_SUCCESS );
}
else
{
* MP4_PeekStream peek from a MP4_Stream_t
*
****************************************************************************/
-int MP4_PeekStream( MP4_Stream_t *p_stream, u8 **pp_peek, int i_size )
+int MP4_PeekStream( MP4_Stream_t *p_stream, uint8_t **pp_peek, int i_size )
{
if( p_stream->b_memory )
{
}
else
{
+
+ if( p_stream->p_input->stream.p_selected_area->i_size > 0 )
+ {
+ int64_t i_max =
+ p_stream->p_input->stream.p_selected_area->i_size - MP4_TellAbsolute( p_stream->p_input );
+ if( i_size > i_max )
+ {
+ i_size = i_max;
+ }
+ }
return( input_Peek( p_stream->p_input, pp_peek, i_size ) );
}
}
if( i_pos < p_stream->i_stop )
{
p_stream->i_start = i_pos;
- return( 1 );
+ return( VLC_SUCCESS );
}
else
{
- return( 0 );
+ return( VLC_EGENERIC );
}
}
else
/*****************************************************************************
- * MP4_ReadBoxCommon : Load only common parameters for all boxes
+ * MP4_ReadBoxCommon : Load only common parameters for all boxes
*****************************************************************************
- * p_box need to be an already allocated MP4_Box_t, and all data
+ * p_box need to be an already allocated MP4_Box_t, and all data
* will only be peek not read
*
* RETURN : 0 if it fail, 1 otherwise
*****************************************************************************/
int MP4_ReadBoxCommon( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
{
- int i_read;
- u8 *p_peek;
-
+ int i_read;
+ uint8_t *p_peek;
+
if( ( ( i_read = MP4_PeekStream( p_stream, &p_peek, 32 ) ) < 8 ) )
{
return( 0 );
p_box->p_first = NULL;
p_box->p_last = NULL;
p_box->p_next = NULL;
-
+
MP4_GET4BYTES( p_box->i_shortsize );
MP4_GETFOURCC( p_box->i_type );
p_box->i_size = p_box->i_shortsize;
/* XXX size of 0 means that the box extends to end of file */
}
-
+
if( p_box->i_type == FOURCC_uuid )
{
/* get extented type on 16 bytes */
CreateUUID( &p_box->i_uuid, p_box->i_type );
}
#ifdef MP4_VERBOSE
- /* FIXME how to write u64 ??? */
if( p_box->i_size )
{
- msg_Dbg( p_stream->p_input, "Found Box: %c%c%c%c size %d",
- (p_box->i_type)&0xff, (p_box->i_type>>8)&0xff,
- (p_box->i_type>>16)&0xff, (p_box->i_type>>24)&0xff,
- (u32)p_box->i_size );
+ msg_Dbg( p_stream->p_input, "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_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->p_father )
{
/* check if it's within p-father */
- if( p_box->i_size + p_box->i_pos >=
+ if( p_box->i_size + p_box->i_pos >=
p_box->p_father->i_size + p_box->p_father->i_pos )
{
return( 0 ); /* out of bound */
}
}
- return( MP4_SeekStream( p_stream, p_box->i_size + p_box->i_pos ) );
+ return( MP4_SeekStream( p_stream, p_box->i_size + p_box->i_pos ) ? 0 : 1 );
}
/*****************************************************************************
- * MP4_MP4_GotoBox : Go to this particular box
+ * 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 ) );
+ return( MP4_SeekStream( p_stream, p_box->i_pos ) ? 0 : 1 );
}
/*****************************************************************************
- * For all known box a loader is given,
+ * For all known box a loader is given,
* XXX: all common struct have to be already read by MP4_ReadBoxCommon
* after called one of theses functions, file position is unknown
- * you need to call MP4_GotoBox to go where you want
+ * you need to call MP4_GotoBox to go where you want
*****************************************************************************/
int MP4_ReadBoxContainerRaw( MP4_Stream_t *p_stream, MP4_Box_t *p_container )
{
MP4_Box_t *p_box;
-
- if( MP4_TellStream( p_stream ) + 8 >
- p_container->i_pos + p_container->i_size )
+
+ if( MP4_TellStream( p_stream ) + 8 >
+ (off_t)(p_container->i_pos + p_container->i_size) )
{
/* there is no box to load */
return( 0 );
}
-
+
do
{
p_box = malloc( sizeof( MP4_Box_t ) );
free( p_box );
break;
}
-
+
}while( MP4_NextBox( p_stream, p_box ) == 1 );
-
+
return( 1 );
}
int MP4_ReadBoxContainer( MP4_Stream_t *p_stream, MP4_Box_t *p_container )
{
-
- if( p_container->i_size <= MP4_BOX_HEADERSIZE(p_container ) + 8 )
+ if( p_container->i_size <= (size_t)MP4_BOX_HEADERSIZE(p_container ) + 8 )
{
/* container is empty, 8 stand for the first header in this box */
return( 1 );
}
-
+
/* enter box */
- MP4_BOX_DESCEND( p_container );
+ MP4_SeekStream( p_stream, p_container->i_pos + MP4_BOX_HEADERSIZE( p_container ) );
return( MP4_ReadBoxContainerRaw( p_stream, p_container ) );
}
int MP4_ReadBoxSkip( MP4_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 )
+ {
+ uint8_t *p_peek;
+ int i_read;
+ vlc_fourcc_t i_fcc;
+
+ i_read = MP4_PeekStream( 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->p_input, "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: \"%c%c%c%c\"",
- (p_box->i_type)&0xff,
- (p_box->i_type>>8)&0xff,
- (p_box->i_type>>16)&0xff,
- (p_box->i_type>>24)&0xff );
+ msg_Dbg( p_stream->p_input, "Skip box: \"%4.4s\"",
+ (char*)&p_box->i_type );
#endif
return( 1 );
}
int MP4_ReadBox_ftyp( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
{
MP4_READBOX_ENTER( MP4_Box_data_ftyp_t );
-
+
MP4_GETFOURCC( p_box->data.p_ftyp->i_major_brand );
MP4_GET4BYTES( p_box->data.p_ftyp->i_minor_version );
-
+
if( ( p_box->data.p_ftyp->i_compatible_brands_count = i_read / 4 ) )
{
- int i;
- p_box->data.p_ftyp->i_compatible_brands =
- calloc( p_box->data.p_ftyp->i_compatible_brands_count, sizeof(u32));
+ unsigned int i;
+ p_box->data.p_ftyp->i_compatible_brands =
+ calloc( p_box->data.p_ftyp->i_compatible_brands_count, sizeof(uint32_t));
for( i =0; i < p_box->data.p_ftyp->i_compatible_brands_count; i++ )
{
int MP4_ReadBox_mvhd( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
{
- int i;
+ unsigned int i;
#ifdef MP4_VERBOSE
char s_creation_time[128];
char s_modification_time[128];
MP4_GET4BYTES( p_box->data.p_mvhd->i_timescale );
MP4_GET4BYTES( p_box->data.p_mvhd->i_duration );
}
- MP4_GET4BYTES( p_box->data.p_mvhd->i_rate );
- MP4_GET2BYTES( p_box->data.p_mvhd->i_volume );
+ MP4_GET4BYTES( p_box->data.p_mvhd->i_rate );
+ MP4_GET2BYTES( p_box->data.p_mvhd->i_volume );
MP4_GET2BYTES( p_box->data.p_mvhd->i_reserved1 );
-
+
for( i = 0; i < 2; i++ )
{
MP4_GET4BYTES( p_box->data.p_mvhd->i_reserved2[i] );
{
MP4_GET4BYTES( p_box->data.p_mvhd->i_predefined[i] );
}
-
+
MP4_GET4BYTES( p_box->data.p_mvhd->i_next_track_id );
-
-
+
+
#ifdef MP4_VERBOSE
MP4_ConvertDate2Str( s_creation_time, p_box->data.p_mvhd->i_creation_time );
- MP4_ConvertDate2Str( s_modification_time,
+ MP4_ConvertDate2Str( s_modification_time,
p_box->data.p_mvhd->i_modification_time );
if( p_box->data.p_mvhd->i_rate )
{
- MP4_ConvertDate2Str( s_duration,
+ MP4_ConvertDate2Str( s_duration,
p_box->data.p_mvhd->i_duration / p_box->data.p_mvhd->i_rate );
}
else
{
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",
s_creation_time,
s_modification_time,
- (u32)p_box->data.p_mvhd->i_timescale,
+ (uint32_t)p_box->data.p_mvhd->i_timescale,
s_duration,
(float)p_box->data.p_mvhd->i_rate / (1<<16 ),
(float)p_box->data.p_mvhd->i_volume / 256 ,
- (u32)p_box->data.p_mvhd->i_next_track_id );
+ (uint32_t)p_box->data.p_mvhd->i_next_track_id );
#endif
MP4_READBOX_EXIT( 1 );
}
int MP4_ReadBox_tkhd( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
{
- int i;
+ unsigned int i;
#ifdef MP4_VERBOSE
char s_creation_time[128];
char s_modification_time[128];
char s_duration[128];
#endif
MP4_READBOX_ENTER( MP4_Box_data_tkhd_t );
-
+
MP4_GETVERSIONFLAGS( p_box->data.p_tkhd );
if( p_box->data.p_tkhd->i_version )
MP4_GET4BYTES( p_box->data.p_tkhd->i_reserved );
MP4_GET4BYTES( p_box->data.p_tkhd->i_duration );
}
-
+
for( i = 0; i < 2; i++ )
{
MP4_GET4BYTES( p_box->data.p_tkhd->i_reserved2[i] );
}
MP4_GET4BYTES( p_box->data.p_tkhd->i_width );
MP4_GET4BYTES( p_box->data.p_tkhd->i_height );
-
+
#ifdef MP4_VERBOSE
MP4_ConvertDate2Str( s_creation_time, p_box->data.p_mvhd->i_creation_time );
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",
s_creation_time,
s_modification_time,
MP4_READBOX_EXIT( 1 );
}
-int MP4_ReadBox_tref( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
-{
-
- if( p_box->i_size < 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 )
{
- int i;
- u16 i_language;
+ unsigned int i;
+ uint16_t i_language;
#ifdef MP4_VERBOSE
char s_creation_time[128];
char s_modification_time[128];
MP4_GET4BYTES( p_box->data.p_mdhd->i_timescale );
MP4_GET4BYTES( p_box->data.p_mdhd->i_duration );
}
- i_language = GetWBE( p_peek );
+ i_language = GetWBE( p_peek );
for( i = 0; i < 3; i++ )
{
- p_box->data.p_mdhd->i_language[i] =
+ p_box->data.p_mdhd->i_language[i] =
( ( i_language >> ( (2-i)*5 ) )&0x1f ) + 0x60;
}
MP4_GET2BYTES( p_box->data.p_mdhd->i_predefined );
-
+
#ifdef MP4_VERBOSE
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 );
msg_Dbg( p_stream->p_input, "Read Box: \"mdhd\" creation %s modification %s time scale %d duration %s language %c%c%c",
s_creation_time,
s_modification_time,
- (u32)p_box->data.p_mdhd->i_timescale,
+ (uint32_t)p_box->data.p_mdhd->i_timescale,
s_duration,
p_box->data.p_mdhd->i_language[0],
p_box->data.p_mdhd->i_language[1],
int MP4_ReadBox_hdlr( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
{
- MP4_READBOX_ENTER( MP4_Box_data_hdlr_t );
+ 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_handler_type );
memcpy( p_box->data.p_hdlr->psz_name, p_peek, i_read );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Read Box: \"hdlr\" hanler type %c%c%c%c name %s",
- ( p_box->data.p_hdlr->i_handler_type )&0xff,
- ( p_box->data.p_hdlr->i_handler_type >> 8 )&0xff,
- ( p_box->data.p_hdlr->i_handler_type >> 16 )&0xff,
- ( p_box->data.p_hdlr->i_handler_type >> 24 )&0xff,
+ msg_Dbg( p_stream->p_input, "Read Box: \"hdlr\" hanler type %4.4s name %s",
+ (char*)&p_box->data.p_hdlr->i_handler_type,
p_box->data.p_hdlr->psz_name );
#endif
int MP4_ReadBox_vmhd( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
{
- int i;
-
- MP4_READBOX_ENTER( MP4_Box_data_vmhd_t );
+ unsigned int i;
+
+ MP4_READBOX_ENTER( MP4_Box_data_vmhd_t );
MP4_GETVERSIONFLAGS( p_box->data.p_vmhd );
-
+
MP4_GET2BYTES( p_box->data.p_vmhd->i_graphics_mode );
for( i = 0; i < 3; i++ )
{
MP4_GET2BYTES( p_box->data.p_vmhd->i_opcolor[i] );
}
-
+
#ifdef MP4_VERBOSE
msg_Dbg( p_stream->p_input, "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],
p_box->data.p_vmhd->i_opcolor[2] );
-
#endif
MP4_READBOX_EXIT( 1 );
}
int MP4_ReadBox_smhd( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
{
- MP4_READBOX_ENTER( MP4_Box_data_smhd_t );
+ MP4_READBOX_ENTER( MP4_Box_data_smhd_t );
MP4_GETVERSIONFLAGS( p_box->data.p_smhd );
MP4_GET2BYTES( p_box->data.p_smhd->i_balance );
MP4_GET2BYTES( p_box->data.p_smhd->i_reserved );
-
+
#ifdef MP4_VERBOSE
msg_Dbg( p_stream->p_input, "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 )
{
- MP4_READBOX_ENTER( MP4_Box_data_hmhd_t );
+ MP4_READBOX_ENTER( MP4_Box_data_hmhd_t );
MP4_GETVERSIONFLAGS( p_box->data.p_hmhd );
p_box->data.p_hmhd->i_avg_PDU_size,
p_box->data.p_hmhd->i_max_bitrate,
p_box->data.p_hmhd->i_avg_bitrate );
-
#endif
MP4_READBOX_EXIT( 1 );
}
int MP4_ReadBox_url( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
{
- MP4_READBOX_ENTER( MP4_Box_data_url_t );
+ MP4_READBOX_ENTER( MP4_Box_data_url_t );
MP4_GETVERSIONFLAGS( p_box->data.p_url );
MP4_GETSTRINGZ( p_box->data.p_url->psz_location );
MP4_GETVERSIONFLAGS( p_box->data.p_urn );
MP4_GETSTRINGZ( p_box->data.p_urn->psz_name );
- MP4_GETSTRINGZ( p_box->data.p_urn->psz_location );
-
+ 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",
p_box->data.p_urn->psz_name,
int MP4_ReadBox_dref( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
{
MP4_READBOX_ENTER( MP4_Box_data_dref_t );
-
+
MP4_GETVERSIONFLAGS( p_box->data.p_dref );
MP4_GET4BYTES( p_box->data.p_dref->i_entry_count );
-
+
MP4_SeekStream( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) + 8 );
MP4_ReadBoxContainerRaw( p_stream, p_box );
int MP4_ReadBox_stts( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
{
- int i;
- MP4_READBOX_ENTER( MP4_Box_data_stts_t );
+ unsigned int i;
+ MP4_READBOX_ENTER( MP4_Box_data_stts_t );
MP4_GETVERSIONFLAGS( p_box->data.p_stts );
MP4_GET4BYTES( p_box->data.p_stts->i_entry_count );
- p_box->data.p_stts->i_sample_count =
- calloc( sizeof( u32 ), p_box->data.p_stts->i_entry_count );
+ p_box->data.p_stts->i_sample_count =
+ calloc( sizeof( uint32_t ), p_box->data.p_stts->i_entry_count );
p_box->data.p_stts->i_sample_delta =
- calloc( sizeof( u32 ), p_box->data.p_stts->i_entry_count );
-
+ calloc( sizeof( uint32_t ), p_box->data.p_stts->i_entry_count );
+
for( i = 0; (i < p_box->data.p_stts->i_entry_count )&&( i_read >=8 ); i++ )
{
MP4_GET4BYTES( p_box->data.p_stts->i_sample_count[i] );
MP4_GET4BYTES( p_box->data.p_stts->i_sample_delta[i] );
}
-
-
+
#ifdef MP4_VERBOSE
msg_Dbg( p_stream->p_input, "Read Box: \"stts\" entry-count %d",
p_box->data.p_stts->i_entry_count );
{
FREE( p_box->data.p_stts->i_sample_count );
FREE( p_box->data.p_stts->i_sample_delta );
-
}
int MP4_ReadBox_ctts( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
{
- int i;
+ unsigned int i;
MP4_READBOX_ENTER( MP4_Box_data_ctts_t );
-
+
MP4_GETVERSIONFLAGS( p_box->data.p_ctts );
-
+
MP4_GET4BYTES( p_box->data.p_ctts->i_entry_count );
- p_box->data.p_ctts->i_sample_count =
- calloc( sizeof( u32 ), p_box->data.p_ctts->i_entry_count );
+ p_box->data.p_ctts->i_sample_count =
+ calloc( sizeof( uint32_t ), p_box->data.p_ctts->i_entry_count );
p_box->data.p_ctts->i_sample_offset =
- calloc( sizeof( u32 ), p_box->data.p_ctts->i_entry_count );
-
+ calloc( sizeof( uint32_t ), p_box->data.p_ctts->i_entry_count );
+
for( i = 0; (i < p_box->data.p_ctts->i_entry_count )&&( i_read >=8 ); i++ )
{
MP4_GET4BYTES( p_box->data.p_ctts->i_sample_count[i] );
MP4_GET4BYTES( p_box->data.p_ctts->i_sample_offset[i] );
}
-
-
+
#ifdef MP4_VERBOSE
msg_Dbg( p_stream->p_input, "Read Box: \"ctts\" entry-count %d",
p_box->data.p_ctts->i_entry_count );
FREE( p_box->data.p_ctts->i_sample_offset );
}
-static int MP4_ReadLengthDescriptor( u8 **pp_peek, s64 *i_read )
+static int MP4_ReadLengthDescriptor( uint8_t **pp_peek, int64_t *i_read )
{
- int i_b;
- int i_len = 0;
+ unsigned int i_b;
+ unsigned int i_len = 0;
do
{
i_b = **pp_peek;
(*i_read)--;
i_len = ( i_len << 7 ) + ( i_b&0x7f );
} while( i_b&0x80 );
- return( i_len );
+ return( i_len );
}
int MP4_ReadBox_esds( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
{
#define es_descriptor p_box->data.p_esds->es_descriptor
- int i_len;
- int i_flags;
- int i_type;
+ unsigned int i_len;
+ unsigned int i_flags;
+ unsigned int i_type;
MP4_READBOX_ENTER( MP4_Box_data_esds_t );
}
if( es_descriptor.b_url )
{
- int i_len;
-
+ unsigned int i_len;
+
MP4_GET1BYTE( i_len );
es_descriptor.psz_URL = calloc( sizeof(char), i_len + 1 );
memcpy( es_descriptor.psz_URL, p_peek, i_len );
if( i_type != 0x04)/* MP4DecConfigDescrTag */
{
+ es_descriptor.p_decConfigDescr = NULL;
MP4_READBOX_EXIT( 1 ); /* rest isn't interesting up to now */
}
i_len = MP4_ReadLengthDescriptor( &p_peek, &i_read );
- es_descriptor.p_decConfigDescr =
+ es_descriptor.p_decConfigDescr =
malloc( sizeof( MP4_descriptor_decoder_config_t ));
MP4_GET1BYTE( es_descriptor.p_decConfigDescr->i_objectTypeIndication );
MP4_GET1BYTE( i_type );
if( i_type != 0x05 )/* MP4DecSpecificDescrTag */
{
+ es_descriptor.p_decConfigDescr->i_decoder_specific_info_len = 0;
+ es_descriptor.p_decConfigDescr->p_decoder_specific_info = NULL;
MP4_READBOX_EXIT( 1 );
}
-
+
i_len = MP4_ReadLengthDescriptor( &p_peek, &i_read );
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,
+ memcpy( es_descriptor.p_decConfigDescr->p_decoder_specific_info,
p_peek, i_len );
MP4_READBOX_EXIT( 1 );
void MP4_FreeBox_esds( input_thread_t *p_input, MP4_Box_t *p_box )
{
FREE( 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 );
+ }
FREE( p_box->data.p_esds->es_descriptor.p_decConfigDescr );
}
int MP4_ReadBox_sample_soun( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
{
- int i;
-
+ unsigned int i;
+
MP4_READBOX_ENTER( MP4_Box_data_sample_soun_t );
for( i = 0; i < 6 ; i++ )
}
MP4_GET2BYTES( p_box->data.p_sample_soun->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_soun->i_reserved2[i] );
+ 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 );
+
MP4_GET2BYTES( p_box->data.p_sample_soun->i_channelcount );
MP4_GET2BYTES( p_box->data.p_sample_soun->i_samplesize );
MP4_GET2BYTES( p_box->data.p_sample_soun->i_predefined );
MP4_GET2BYTES( p_box->data.p_sample_soun->i_reserved3 );
MP4_GET2BYTES( p_box->data.p_sample_soun->i_sampleratehi );
MP4_GET2BYTES( p_box->data.p_sample_soun->i_sampleratelo );
-
- MP4_SeekStream( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) + 28 );
- 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 );
-#endif
- MP4_READBOX_EXIT( 1 );
-}
-
-#if 0
-int MP4_ReadBox_sample_mp4a( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
-{
- int i;
-
- MP4_READBOX_ENTER( MP4_Box_data_sample_mp4a_t );
-
- for( i = 0; i < 6 ; i++ )
+ if( p_box->data.p_sample_soun->i_qt_version == 1 &&
+ i_read >= 16 )
{
- MP4_GET1BYTE( p_box->data.p_sample_mp4a->i_reserved1[i] );
- }
+ /* qt3+ */
+ 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 );
- MP4_GET2BYTES( p_box->data.p_sample_mp4a->i_data_reference_index );
-
- for( i = 0; i < 2 ; i++ )
+#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 );
+#endif
+ MP4_SeekStream( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) + 44 );
+ }
+ else
{
- MP4_GET4BYTES( p_box->data.p_sample_mp4a->i_reserved2[i] );
+ p_box->data.p_sample_soun->i_sample_per_packet = 0;
+ p_box->data.p_sample_soun->i_bytes_per_packet = 0;
+ 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="I64Fd")", i_read );
+ MP4_SeekStream( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) + 28 );
}
-
- 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_SeekStream( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) + 28 );
MP4_ReadBoxContainerRaw( p_stream, p_box ); /* esds */
#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->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 );
#endif
MP4_READBOX_EXIT( 1 );
}
-#endif
+
int MP4_ReadBox_sample_vide( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
{
- int i;
+ unsigned int i;
MP4_READBOX_ENTER( MP4_Box_data_sample_vide_t );
MP4_GET2BYTES( p_box->data.p_sample_vide->i_data_reference_index );
- MP4_GET2BYTES( p_box->data.p_sample_vide->i_predefined1 );
- MP4_GET2BYTES( p_box->data.p_sample_vide->i_reserved2 );
-
- for( i = 0; i < 3 ; i++ )
+ /*
+ * XXX hack -> produce a copy of the nearly complete chunk
+ */
+ if( i_read > 0 )
{
- MP4_GET4BYTES( p_box->data.p_sample_vide->i_predefined2[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_reserved3 );
- MP4_GET2BYTES( p_box->data.p_sample_vide->i_predefined3 );
+ 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_vide->i_depth );
- MP4_GET2BYTES( p_box->data.p_sample_vide->i_predefined4 );
-
+ 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 ) + 78);
MP4_ReadBoxContainerRaw( p_stream, p_box );
-
+
#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,
MP4_GET4BYTES( p_box->data.p_stsd->i_entry_count );
- MP4_SeekStream( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) + 8 );
+ MP4_SeekStream( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) + 8 );
MP4_ReadBoxContainerRaw( p_stream, p_box );
int MP4_ReadBox_stsz( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
{
- int i;
+ unsigned int i;
MP4_READBOX_ENTER( MP4_Box_data_stsz_t );
-
+
MP4_GETVERSIONFLAGS( p_box->data.p_stsz );
-
+
MP4_GET4BYTES( p_box->data.p_stsz->i_sample_size );
MP4_GET4BYTES( p_box->data.p_stsz->i_sample_count );
- p_box->data.p_stsz->i_entry_size =
- calloc( sizeof( u32 ), p_box->data.p_stsz->i_sample_count );
-
+ p_box->data.p_stsz->i_entry_size =
+ calloc( sizeof( uint32_t ), p_box->data.p_stsz->i_sample_count );
+
if( !p_box->data.p_stsz->i_sample_size )
{
for( i=0; (i<p_box->data.p_stsz->i_sample_count)&&(i_read >= 4 ); i++ )
MP4_GET4BYTES( p_box->data.p_stsz->i_entry_size[i] );
}
}
-
-
-#ifdef MP4_VERBOSE
+
+#ifdef MP4_VERBOSE
msg_Dbg( p_stream->p_input, "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 );
int MP4_ReadBox_stsc( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
{
- int i;
-
+ unsigned int i;
+
MP4_READBOX_ENTER( MP4_Box_data_stsc_t );
MP4_GETVERSIONFLAGS( p_box->data.p_stsc );
-
+
MP4_GET4BYTES( p_box->data.p_stsc->i_entry_count );
- p_box->data.p_stsc->i_first_chunk =
- calloc( sizeof( u32 ), p_box->data.p_stsc->i_entry_count );
- p_box->data.p_stsc->i_samples_per_chunk =
- calloc( sizeof( u32 ), p_box->data.p_stsc->i_entry_count );
- p_box->data.p_stsc->i_sample_description_index =
- calloc( sizeof( u32 ), p_box->data.p_stsc->i_entry_count );
+ p_box->data.p_stsc->i_first_chunk =
+ calloc( sizeof( uint32_t ), p_box->data.p_stsc->i_entry_count );
+ p_box->data.p_stsc->i_samples_per_chunk =
+ calloc( sizeof( uint32_t ), p_box->data.p_stsc->i_entry_count );
+ p_box->data.p_stsc->i_sample_description_index =
+ calloc( sizeof( uint32_t ), p_box->data.p_stsc->i_entry_count );
for( i = 0; (i < p_box->data.p_stsc->i_entry_count )&&( i_read >= 12 );i++ )
{
MP4_GET4BYTES( p_box->data.p_stsc->i_samples_per_chunk[i] );
MP4_GET4BYTES( p_box->data.p_stsc->i_sample_description_index[i] );
}
-
-
-#ifdef MP4_VERBOSE
+
+#ifdef MP4_VERBOSE
msg_Dbg( p_stream->p_input, "Read Box: \"stsc\" entry-count %d",
p_box->data.p_stsc->i_entry_count );
int MP4_ReadBox_stco_co64( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
{
- int i;
-
+ unsigned int i;
+
MP4_READBOX_ENTER( MP4_Box_data_co64_t );
MP4_GETVERSIONFLAGS( p_box->data.p_co64 );
MP4_GET4BYTES( p_box->data.p_co64->i_entry_count );
- p_box->data.p_co64->i_chunk_offset =
- calloc( sizeof( u64 ), p_box->data.p_co64->i_entry_count );
+ p_box->data.p_co64->i_chunk_offset =
+ calloc( sizeof( uint64_t ), p_box->data.p_co64->i_entry_count );
for( i = 0; i < p_box->data.p_co64->i_entry_count; i++ )
{
MP4_GET8BYTES( p_box->data.p_co64->i_chunk_offset[i] );
}
}
-
-
-#ifdef MP4_VERBOSE
+
+#ifdef MP4_VERBOSE
msg_Dbg( p_stream->p_input, "Read Box: \"co64\" entry-count %d",
p_box->data.p_co64->i_entry_count );
int MP4_ReadBox_stss( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
{
- int i;
-
- MP4_READBOX_ENTER( MP4_Box_data_stss_t );
+ unsigned int i;
+
+ MP4_READBOX_ENTER( MP4_Box_data_stss_t );
MP4_GETVERSIONFLAGS( p_box->data.p_stss );
MP4_GET4BYTES( p_box->data.p_stss->i_entry_count );
- p_box->data.p_stss->i_sample_number =
- calloc( sizeof( u32 ), p_box->data.p_stss->i_entry_count );
+ p_box->data.p_stss->i_sample_number =
+ calloc( sizeof( uint32_t ), p_box->data.p_stss->i_entry_count );
for( i = 0; (i < p_box->data.p_stss->i_entry_count )&&( i_read >= 4 ); i++ )
{
/* XXX in libmp4 sample begin at 0 */
p_box->data.p_stss->i_sample_number[i]--;
}
-
-
-#ifdef MP4_VERBOSE
+
+#ifdef MP4_VERBOSE
msg_Dbg( p_stream->p_input, "Read Box: \"stss\" entry-count %d",
p_box->data.p_stss->i_entry_count );
int MP4_ReadBox_stsh( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
{
- int i;
-
+ unsigned int i;
+
MP4_READBOX_ENTER( MP4_Box_data_stsh_t );
MP4_GETVERSIONFLAGS( p_box->data.p_stsh );
MP4_GET4BYTES( p_box->data.p_stsh->i_entry_count );
- p_box->data.p_stsh->i_shadowed_sample_number =
- calloc( sizeof( u32 ), p_box->data.p_stsh->i_entry_count );
+ p_box->data.p_stsh->i_shadowed_sample_number =
+ calloc( sizeof( uint32_t ), p_box->data.p_stsh->i_entry_count );
- p_box->data.p_stsh->i_sync_sample_number =
- calloc( sizeof( u32 ), p_box->data.p_stsh->i_entry_count );
+ p_box->data.p_stsh->i_sync_sample_number =
+ calloc( sizeof( uint32_t ), p_box->data.p_stsh->i_entry_count );
for( i = 0; (i < p_box->data.p_stss->i_entry_count )&&( i_read >= 8 ); i++ )
MP4_GET4BYTES( p_box->data.p_stsh->i_shadowed_sample_number[i] );
MP4_GET4BYTES( p_box->data.p_stsh->i_sync_sample_number[i] );
}
-
-
-#ifdef MP4_VERBOSE
+
+#ifdef MP4_VERBOSE
msg_Dbg( p_stream->p_input, "Read Box: \"stsh\" entry-count %d",
p_box->data.p_stsh->i_entry_count );
#endif
int MP4_ReadBox_stdp( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
{
- int i;
-
- MP4_READBOX_ENTER( MP4_Box_data_stdp_t );
+ unsigned int i;
+
+ MP4_READBOX_ENTER( MP4_Box_data_stdp_t );
MP4_GETVERSIONFLAGS( p_box->data.p_stdp );
- p_box->data.p_stdp->i_priority =
- calloc( sizeof( u16 ), i_read / 2 );
+ p_box->data.p_stdp->i_priority =
+ calloc( sizeof( uint16_t ), i_read / 2 );
for( i = 0; i < i_read / 2 ; i++ )
{
MP4_GET2BYTES( p_box->data.p_stdp->i_priority[i] );
}
-
-
-#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Read Box: \"stdp\" entry-count %d",
+
+#ifdef MP4_VERBOSE
+ msg_Dbg( p_stream->p_input, "Read Box: \"stdp\" entry-count "I64Fd,
i_read / 2 );
#endif
int MP4_ReadBox_padb( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
{
- int i;
-
+ unsigned int i;
+
MP4_READBOX_ENTER( MP4_Box_data_padb_t );
MP4_GETVERSIONFLAGS( p_box->data.p_padb );
MP4_GET4BYTES( p_box->data.p_padb->i_sample_count );
- p_box->data.p_padb->i_reserved1 =
- calloc( sizeof( u16 ), ( p_box->data.p_padb->i_sample_count + 1 ) / 2 );
- p_box->data.p_padb->i_pad2 =
- calloc( sizeof( u16 ), ( p_box->data.p_padb->i_sample_count + 1 ) / 2 );
- p_box->data.p_padb->i_reserved2 =
- calloc( sizeof( u16 ), ( p_box->data.p_padb->i_sample_count + 1 ) / 2 );
- p_box->data.p_padb->i_pad1 =
- calloc( sizeof( u16 ), ( p_box->data.p_padb->i_sample_count + 1 ) / 2 );
+ p_box->data.p_padb->i_reserved1 =
+ calloc( sizeof( uint16_t ), ( p_box->data.p_padb->i_sample_count + 1 ) / 2 );
+ p_box->data.p_padb->i_pad2 =
+ calloc( sizeof( uint16_t ), ( p_box->data.p_padb->i_sample_count + 1 ) / 2 );
+ p_box->data.p_padb->i_reserved2 =
+ calloc( sizeof( uint16_t ), ( p_box->data.p_padb->i_sample_count + 1 ) / 2 );
+ p_box->data.p_padb->i_pad1 =
+ calloc( sizeof( uint16_t ), ( p_box->data.p_padb->i_sample_count + 1 ) / 2 );
for( i = 0; i < i_read / 2 ; i++ )
p_peek += 1; i_read -= 1;
}
-
-
-#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Read Box: \"stdp\" entry-count %d",
+
+#ifdef MP4_VERBOSE
+ msg_Dbg( p_stream->p_input, "Read Box: \"stdp\" entry-count "I64Fd,
i_read / 2 );
#endif
int MP4_ReadBox_elst( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
{
- int i;
-
+ unsigned int i;
+
MP4_READBOX_ENTER( MP4_Box_data_padb_t );
MP4_GETVERSIONFLAGS( p_box->data.p_elst );
MP4_GET4BYTES( p_box->data.p_elst->i_entry_count );
p_box->data.p_elst->i_segment_duration =
- calloc( sizeof( u64 ), p_box->data.p_elst->i_entry_count );
+ calloc( sizeof( uint64_t ), p_box->data.p_elst->i_entry_count );
p_box->data.p_elst->i_media_time =
- calloc( sizeof( u64 ), p_box->data.p_elst->i_entry_count );
+ calloc( sizeof( uint64_t ), p_box->data.p_elst->i_entry_count );
p_box->data.p_elst->i_media_rate_integer =
- calloc( sizeof( u16 ), p_box->data.p_elst->i_entry_count );
- p_box->data.p_elst->i_media_rate_fraction=
- calloc( sizeof( u16 ), p_box->data.p_elst->i_entry_count );
+ calloc( sizeof( uint16_t ), p_box->data.p_elst->i_entry_count );
+ p_box->data.p_elst->i_media_rate_fraction=
+ calloc( sizeof( uint16_t ), p_box->data.p_elst->i_entry_count );
for( i = 0; i < p_box->data.p_elst->i_entry_count; i++ )
MP4_GET2BYTES( p_box->data.p_elst->i_media_rate_integer[i] );
MP4_GET2BYTES( p_box->data.p_elst->i_media_rate_fraction[i] );
}
-
-
-#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Read Box: \"elst\" entry-count %d",
+
+#ifdef MP4_VERBOSE
+ msg_Dbg( p_stream->p_input, "Read Box: \"elst\" entry-count "I64Fd,
i_read / 2 );
#endif
int MP4_ReadBox_cprt( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
{
- int i_language;
- int i;
-
+ unsigned int i_language;
+ unsigned int i;
+
MP4_READBOX_ENTER( MP4_Box_data_cprt_t );
MP4_GETVERSIONFLAGS( p_box->data.p_cprt );
- i_language = GetWBE( p_peek );
+ i_language = GetWBE( p_peek );
for( i = 0; i < 3; i++ )
{
- p_box->data.p_cprt->i_language[i] =
+ p_box->data.p_cprt->i_language[i] =
( ( i_language >> ( (2-i)*5 ) )&0x1f ) + 0x60;
}
- p_peek += 2; i_read -= 2;
+ p_peek += 2; i_read -= 2;
MP4_GETSTRINGZ( p_box->data.p_cprt->psz_notice );
#ifdef MP4_VERBOSE
int MP4_ReadBox_dcom( MP4_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 : %c%c%c%c",
- ( p_box->data.p_dcom->i_algorithm )&0xff,
- ( p_box->data.p_dcom->i_algorithm >> 8 )&0xff,
- ( p_box->data.p_dcom->i_algorithm >> 16 )&0xff,
- ( p_box->data.p_dcom->i_algorithm >> 24 )&0xff );
-#endif
-
+ msg_Dbg( p_stream->p_input,
+ "Read Box: \"dcom\" compression algorithm : %4.4s",
+ (char*)&p_box->data.p_dcom->i_algorithm );
+#endif
MP4_READBOX_EXIT( 1 );
}
{
MP4_READBOX_ENTER( MP4_Box_data_cmvd_t );
-
MP4_GET4BYTES( p_box->data.p_cmvd->i_uncompressed_size );
p_box->data.p_cmvd->i_compressed_size = i_read;
-
+
if( !( p_box->data.p_cmvd->p_data = malloc( i_read ) ) )
{
msg_Dbg( p_stream->p_input, "Read Box: \"cmvd\" not enough memory to load data" );
return( 1 );
}
-
+
/* now copy compressed data */
memcpy( p_box->data.p_cmvd->p_data,
p_peek,
i_read);
-
+
p_box->data.p_cmvd->b_compressed = 1;
-
+
#ifdef MP4_VERBOSE
msg_Dbg( p_stream->p_input, "Read Box: \"cmvd\" compressed data size %d",
p_box->data.p_cmvd->i_compressed_size );
-#endif
-
+#endif
+
MP4_READBOX_EXIT( 1 );
}
void MP4_FreeBox_cmvd( input_thread_t *p_input, 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
- u8 *p_data;
-
+ uint8_t *p_data;
+
int i_result;
if( !( p_box->data.p_cmov = malloc( sizeof( MP4_Box_data_cmov_t ) ) ) )
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 );
{
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->data.p_dcom->i_algorithm != FOURCC_zlib )
{
- msg_Dbg( p_stream->p_input, "Read Box: \"cmov\" compression algorithm : %c%c%c%c not supported",
- ( p_dcom->data.p_dcom->i_algorithm )&0xff,
- ( p_dcom->data.p_dcom->i_algorithm >> 8 )&0xff,
- ( p_dcom->data.p_dcom->i_algorithm >> 16 )&0xff,
- ( p_dcom->data.p_dcom->i_algorithm >> 24 )&0xff );
+ 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->p_input,
"Read Box: \"cmov\" zlib unsupported" );
return( 1 );
-#else
+#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,
+ msg_Err( p_stream->p_input,
"Read Box: \"cmov\" not enough memory to uncompress data" );
return( 1 );
}
/* init zlib */
if( ( i_result = inflateInit( &z_data ) ) != Z_OK )
{
- msg_Err( p_stream->p_input,
+ msg_Err( p_stream->p_input,
"Read Box: \"cmov\" error while uncompressing data" );
free( p_data );
return( 1 );
i_result = inflate( &z_data, Z_NO_FLUSH );
if( ( i_result != Z_OK )&&( i_result != Z_STREAM_END ) )
{
- msg_Err( p_stream->p_input,
+ msg_Err( p_stream->p_input,
"Read Box: \"cmov\" error while uncompressing data" );
free( p_data );
return( 1 );
if( p_cmvd->data.p_cmvd->i_uncompressed_size != z_data.total_out )
{
- msg_Warn( p_stream->p_input,
+ msg_Warn( p_stream->p_input,
"Read Box: \"cmov\" uncompressing data size mismatch" );
}
p_cmvd->data.p_cmvd->i_uncompressed_size = z_data.total_out;
- /* close zlib */
+ /* close zlib */
i_result = inflateEnd( &z_data );
if( i_result != Z_OK )
{
- msg_Warn( p_stream->p_input,
+ msg_Warn( p_stream->p_input,
"Read Box: \"cmov\" error while uncompressing data (ignored)" );
}
p_cmvd->data.p_cmvd->p_data = p_data;
p_cmvd->data.p_cmvd->b_compressed = 0;
- msg_Dbg( p_stream->p_input,
+ msg_Dbg( p_stream->p_input,
"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_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 );
+
/* and read uncompressd moov */
p_umov = malloc( sizeof( MP4_Box_t ) );
-
+
i_result = MP4_ReadBox( p_stream_memory, p_umov, NULL );
-
+
p_box->data.p_cmov->p_moov = p_umov;
free( p_stream_memory );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input,
+ msg_Dbg( p_stream->p_input,
"Read Box: \"cmov\" compressed movie header completed" );
#endif
return( i_result );
#endif /* HAVE_ZLIB_H */
}
+int MP4_ReadBox_rdrf( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+{
+ uint32_t i_len;
+ MP4_READBOX_ENTER( MP4_Box_data_rdrf_t );
+
+ MP4_GETVERSIONFLAGS( p_box->data.p_rdrf );
+ MP4_GETFOURCC( p_box->data.p_rdrf->i_ref_type );
+ MP4_GET4BYTES( i_len );
+ if( i_len > 0 )
+ {
+ uint32_t i;
+ 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] );
+ }
+ p_box->data.p_rdrf->psz_ref[i_len] = '\0';
+ }
+ else
+ {
+ p_box->data.p_rdrf->psz_ref = NULL;
+ }
+
+#ifdef MP4_VERBOSE
+ msg_Dbg( p_stream->p_input,
+ "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 )
+{
+ FREE( p_box->data.p_rdrf->psz_ref )
+}
+
+
+int MP4_ReadBox_rmdr( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+{
+ MP4_READBOX_ENTER( MP4_Box_data_rmdr_t );
+
+ MP4_GETVERSIONFLAGS( p_box->data.p_rmdr );
+
+ MP4_GET4BYTES( p_box->data.p_rmdr->i_rate );
+
+#ifdef MP4_VERBOSE
+ msg_Dbg( p_stream->p_input,
+ "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 )
+{
+ 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",
+ 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 )
+{
+ MP4_READBOX_ENTER( MP4_Box_data_rmvc_t );
+ MP4_GETVERSIONFLAGS( p_box->data.p_rmvc );
+
+ MP4_GETFOURCC( p_box->data.p_rmvc->i_gestaltType );
+ MP4_GET4BYTES( p_box->data.p_rmvc->i_val1 );
+ MP4_GET4BYTES( p_box->data.p_rmvc->i_val2 );
+ 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",
+ (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 );
+#endif
+
+ MP4_READBOX_EXIT( 1 );
+}
/**** ------------------------------------------------------------------- ****/
/**** "Higher level" Functions ****/
/**** ------------------------------------------------------------------- ****/
-static struct
+static struct
{
- u32 i_type;
- int (*MP4_ReadBox_function )( MP4_Stream_t *p_stream, MP4_Box_t *p_box );
+ 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 );
} MP4_Box_Function [] =
{
{ FOURCC_udta, MP4_ReadBoxContainer, MP4_FreeBox_Common },
{ FOURCC_nmhd, MP4_ReadBoxContainer, MP4_FreeBox_Common },
{ FOURCC_hnti, MP4_ReadBoxContainer, MP4_FreeBox_Common },
+ { FOURCC_rmra, MP4_ReadBoxContainer, MP4_FreeBox_Common },
+ { FOURCC_rmda, MP4_ReadBoxContainer, MP4_FreeBox_Common },
+ { FOURCC_tref, MP4_ReadBoxContainer, MP4_FreeBox_Common },
/* 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 },
/* for codecs */
{ FOURCC_soun, MP4_ReadBox_sample_soun, MP4_FreeBox_Common },
- { FOURCC__mp3, 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_Qclp, MP4_ReadBox_sample_soun, MP4_FreeBox_Common },
+ { FOURCC_samr, 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_ZyGo, 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_s263, 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_VP31, MP4_ReadBox_sample_vide, MP4_FreeBox_Common },
+ { FOURCC_vp31, MP4_ReadBox_sample_vide, MP4_FreeBox_Common },
+
{ FOURCC_jpeg, MP4_ReadBox_sample_vide, MP4_FreeBox_Common },
{ FOURCC_mp4s, NULL, MP4_FreeBox_Common },
{ FOURCC_dpnd, NULL, NULL },
{ FOURCC_ipir, NULL, NULL },
{ FOURCC_mpod, NULL, NULL },
-
+
/* found in hnti */
{ FOURCC_rtp, NULL, NULL },
-
+
+ /* found in rmra */
+ { FOURCC_rdrf, MP4_ReadBox_rdrf, MP4_FreeBox_rdrf },
+ { FOURCC_rmdr, MP4_ReadBox_rmdr, MP4_FreeBox_Common },
+ { FOURCC_rmqu, MP4_ReadBox_rmqu, MP4_FreeBox_Common },
+ { FOURCC_rmvc, MP4_ReadBox_rmvc, MP4_FreeBox_Common },
+
/* Last entry */
-
{ 0, NULL, NULL }
};
/*****************************************************************************
- * MP4_ReadBox : parse the actual box and the children
+ * 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 )
{
int i_result;
- int i_index;
-
+ unsigned int i_index;
+
if( !MP4_ReadBoxCommon( p_stream, p_box ) )
{
msg_Warn( p_stream->p_input, "Cannot read one box" );
if( MP4_Box_Function[i_index].MP4_ReadBox_function == NULL )
{
msg_Warn( p_stream->p_input,
- "Unknown box type %c%c%c%c (uncompletetly loaded)",
- (p_box->i_type)&0xff,
- (p_box->i_type>>8)&0xff,
- (p_box->i_type>>16)&0xff,
- (p_box->i_type>>24)&0xff );
+ "Unknown box type %4.4s (uncompletetly loaded)",
+ (char*)&p_box->i_type );
return( 1 );
}
else
{
- i_result =
+ 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
+ * MP4_CountBox: given a box, count how many child have the requested type
+ * FIXME : support GUUID
*****************************************************************************/
-int MP4_CountBox( MP4_Box_t *p_box, u32 i_type )
+int MP4_CountBox( MP4_Box_t *p_box, uint32_t i_type )
{
- int i_count;
+ unsigned int i_count;
MP4_Box_t *p_child;
-
+
if( !p_box )
{
return( 0 );
while( p_child )
{
if( p_child->i_type == i_type )
- {
+ {
i_count++;
}
p_child = p_child->p_next;
}
-
+
return( i_count );
}
#endif
* return NULL if not found
*****************************************************************************/
-MP4_Box_t *MP4_FindBox( MP4_Box_t *p_box, u32 i_type )
+MP4_Box_t *MP4_FindBox( MP4_Box_t *p_box, uint32_t i_type )
{
MP4_Box_t *p_child;
-
+
if( !p_box )
{
return( NULL );
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
+ * 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 );
/*****************************************************************************
* MP4_FindNbBox: find the box i_number
*****************************************************************************/
-MP4_Box_t *MP4_FindNbBox( MP4_Box_t *p_box, u32 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 )
{
return( NULL );
#endif
/*****************************************************************************
- * MP4_FreeBox : free memory after read with MP4_ReadBox and all
+ * 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 )
{
- int i_index;
+ unsigned int i_index;
MP4_Box_t *p_child;
MP4_Box_t *p_next;
MP4_BoxFree( p_input, p_child );
/* MP4_FreeBoxChildren have free all data expect p_child itself */
free( p_child );
- p_child = p_next;
+ p_child = p_next;
}
/* Now search function to call */
if( MP4_Box_Function[i_index].MP4_FreeBox_function == NULL )
{
/* Should not happen */
- msg_Warn( p_input,
- "cannot free box %c%c%c%c, type unknown",
- (p_box->i_type)&0xff,
- (p_box->i_type >> 8)&0xff,
- (p_box->i_type >> 16)&0xff,
- (p_box->i_type >> 24)&0xff );
+ msg_Warn( p_input,
+ "cannot free box %4.4s, type unknown",
+ (char*)&p_box->i_type );
}
else
{
p_box->p_first = NULL;
p_box->p_last = NULL;
-
+
}
/*****************************************************************************
* MP4_BoxGetRoot : Parse the entire file, and create all boxes in memory
*****************************************************************************
- * The first box is a virtual box "root" and is the father for all first
+ * 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_Stream_t *p_stream;
int i_result;
-
+
MP4_SeekAbsolute( p_input, 0 ); /* Go to the begining */
p_root->i_pos = 0;
p_root->i_type = VLC_FOURCC( 'r', 'o', 'o', 't' );
p_root->p_first = NULL;
p_root->p_last = NULL;
p_root->p_next = NULL;
-
+
p_stream = MP4_InputStream( p_input );
-
+
i_result = MP4_ReadBoxContainerRaw( p_stream, p_root );
free( p_stream );
-
+
if( i_result )
{
- MP4_Box_t *p_child;
+ MP4_Box_t *p_child;
MP4_Box_t *p_moov;
MP4_Box_t *p_cmov;
- /* check if there is a cmov, if so replace
+ /* 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_FindBox( p_root, FOURCC_moov ) )&&
+ ( p_cmov = MP4_FindBox( p_moov, FOURCC_cmov ) ) ) ||
+ ( ( p_moov = MP4_FindBox( p_root, FOURCC_foov ) )&&
+ ( p_cmov = MP4_FindBox( p_moov, FOURCC_cmov ) ) ) )
{
/* rename the compressed moov as a box to skip */
p_moov->i_type = FOURCC_skip;
-
+
/* get uncompressed p_moov */
p_moov = p_cmov->data.p_cmov->p_moov;
p_cmov->data.p_cmov->p_moov = NULL;
static void __MP4_BoxDumpStructure( input_thread_t *p_input,
- MP4_Box_t *p_box, int i_level )
+ MP4_Box_t *p_box, unsigned int i_level )
{
MP4_Box_t *p_child;
if( !i_level )
{
- msg_Dbg( p_input, "Dumping root Box \"%c%c%c%c \"",
- (p_box->i_type ) &0xff,
- (p_box->i_type >>8 ) &0xff,
- (p_box->i_type >>16 ) &0xff,
- (p_box->i_type >>24) &0xff );
+ msg_Dbg( p_input, "Dumping root Box \"%4.4s\"",
+ (char*)&p_box->i_type );
}
else
{
char str[512];
- int i;
- memset( str, (u8)' ', 512 );
+ unsigned int i;
+ memset( str, (uint8_t)' ', 512 );
for( i = 0; i < i_level; i++ )
{
str[i*5] = '|';
}
- sprintf( str + i_level * 5, "+ %c%c%c%c size %d",
- (p_box->i_type ) &0xff,
- (p_box->i_type>>8 ) &0xff,
- (p_box->i_type>>16 ) &0xff,
- (p_box->i_type>>24 ) &0xff,
- (u32)p_box->i_size );
-
+ sprintf( str + i_level * 5, "+ %4.4s size %d",
+ (char*)&p_box->i_type,
+ (uint32_t)p_box->i_size );
+
msg_Dbg( p_input, "%s", str );
}
p_child = p_box->p_first;
__MP4_BoxDumpStructure( p_input, p_child, i_level + 1 );
p_child = p_child->p_next;
}
-
}
void MP4_BoxDumpStructure( input_thread_t *p_input, MP4_Box_t *p_box )
*****************************************************************************/
static void __get_token( char **ppsz_path, char **ppsz_token, int *pi_number )
{
- int i_len ;
+ size_t i_len ;
if( !*ppsz_path[0] )
{
*ppsz_token = NULL;
return;
}
i_len = 0;
- while( (*ppsz_path)[i_len] &&
+ while( (*ppsz_path)[i_len] &&
(*ppsz_path)[i_len] != '/' && (*ppsz_path)[i_len] != '[' )
{
i_len++;
i_len = 1;
}
*ppsz_token = malloc( i_len + 1 );
-
+
memcpy( *ppsz_token, *ppsz_path, i_len );
(*ppsz_token)[i_len] = '\0';
*ppsz_path += i_len;
-
+
if( **ppsz_path == '[' )
{
(*ppsz_path)++;
MP4_Box_t *p_box, char *psz_fmt, va_list args)
{
char *psz_path;
-#ifndef HAVE_VASPRINTF
- int i_size;
+#if !defined(HAVE_VASPRINTF) || defined(SYS_DARWIN) || defined(SYS_BEOS)
+ size_t i_size;
#endif
-
if( !p_box )
{
*pp_result = NULL;
return;
}
-#ifdef HAVE_VASPRINTF
+#if defined(HAVE_VASPRINTF) && !defined(SYS_DARWIN) && !defined(SYS_BEOS)
vasprintf( &psz_path, psz_fmt, args );
#else
i_size = strlen( psz_fmt ) + 1024;
int i_number;
__get_token( &psz_path, &psz_token, &i_number );
-// fprintf( stderr, "path:'%s', token:'%s' n:%d\n",
+// fprintf( stderr, "path:'%s', token:'%s' n:%d\n",
// psz_path,psz_token,i_number );
if( !psz_token )
{
else
if( strlen( psz_token ) == 4 )
{
- u32 i_fourcc;
+ uint32_t i_fourcc;
i_fourcc = VLC_FOURCC( psz_token[0], psz_token[1],
psz_token[2], psz_token[3] );
p_box = p_box->p_first;
*pp_result = NULL;
return;
}
-
+
free( psz_token );
}
-
}
/*****************************************************************************
*****************************************************************************
* Path Format: . .. / as usual
* [number] to specifie box number ex: trak[12]
- *
+ *
* ex: /moov/trak[12]
* ../mdia
*****************************************************************************/
va_list args;
MP4_Box_t *p_result;
- va_start( args, psz_fmt );
+ va_start( args, psz_fmt );
__MP4_BoxGet( &p_result, p_box, psz_fmt, args );
va_end( args );
*****************************************************************************
* Path Format: . .. / as usual
* [number] to specifie box number ex: trak[12]
- *
+ *
* ex: /moov/trak[12]
* ../mdia
*****************************************************************************/
int i_count;
MP4_Box_t *p_result, *p_next;
- va_start( args, psz_fmt );
+ va_start( args, psz_fmt );
__MP4_BoxGet( &p_result, p_box, psz_fmt, args );
va_end( args );
if( !p_result )
{
return( 0 );
}
-
+
i_count = 1;
for( p_next = p_result->p_next; p_next != NULL; p_next = p_next->p_next)
{
projects / vlc / blobdiff