/*****************************************************************************
* 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>
{ \
return( 0 ); \
} \
- if( MP4_ReadStream( p_stream, p_peek, i_read ) )\
+ if( stream_Read( p_stream, p_peek, i_read ) < i_read )\
{ \
free( p_buff ); \
return( 0 ); \
free( p_buff ); \
if( i_read < 0 ) \
{ \
- msg_Warn( p_stream->s, "Not enough data" ); \
+ msg_Warn( p_stream, "Not enough data" ); \
} \
return( i_code )
int i_sec;
/* date begin at 1 jan 1904 */
- i_date += ((1904U * 365) + 17) * 24 * 60 * 60;
+ i_date += ((I64C(1904) * 365) + 17) * 24 * 60 * 60;
i_day = i_date / ( 60*60*24);
i_hour = ( i_date /( 60*60 ) ) % 60;
i_min = ( i_date / 60 ) % 60;
i_sec = i_date % 60;
- 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 );
}
/*****************************************************************************
* Some prototypes.
*****************************************************************************/
-static MP4_Box_t *MP4_ReadBox( MP4_Stream_t *p_stream, MP4_Box_t *p_father );
-
-/*****************************************************************************
- * Some basic functions to manipulate MP4_Stream_t, an abstraction of stream_t
- * in the way that you can read from a memory buffer or from an input
- *
- *****************************************************************************/
-
-/**** ------- First some function to make abstract from input -------- */
-
-/****************************************************************************
- * MP4_InputStream create an stram with an input
- *
- ****************************************************************************/
-MP4_Stream_t *MP4_InputStream( stream_t *s )
-{
- MP4_Stream_t *p_stream;
-
- if( !( p_stream = malloc( sizeof( MP4_Stream_t ) ) ) )
- {
- return( NULL );
- }
- p_stream->b_memory = 0;
- p_stream->s = s;
- p_stream->i_start = 0;
- p_stream->i_stop = 0;
- p_stream->p_buffer = NULL;
- return( p_stream );
-}
-
-
-/****************************************************************************
- * MP4_MemoryStream create a memory stream
- * if p_buffer == NULL, will allocate a buffer of i_size, else
- * it uses p_buffer XXX you have to unallocate it yourself !
- *
- ****************************************************************************/
-MP4_Stream_t *MP4_MemoryStream( stream_t *s,
- int i_size, uint8_t *p_buffer )
-{
- MP4_Stream_t *p_stream;
-
- if( !( p_stream = malloc( sizeof( MP4_Stream_t ) ) ) )
- {
- return( NULL );
- }
- p_stream->b_memory = 1;
- p_stream->s = s;
- p_stream->i_start = 0;
- p_stream->i_stop = i_size;
- if( !p_buffer )
- {
- if( !( p_stream->p_buffer = malloc( i_size ) ) )
- {
- free( p_stream );
- return( NULL );
- }
- }
- else
- {
- p_stream->p_buffer = p_buffer;
- }
-
- return( p_stream );
-}
-/****************************************************************************
- * MP4_ReadStream read from a MP4_Stream_t
- *
- ****************************************************************************/
-int MP4_ReadStream( MP4_Stream_t *p_stream, uint8_t *p_buff, int i_size )
-{
- if( p_stream->b_memory )
- {
- if( i_size > p_stream->i_stop - p_stream->i_start )
- {
- return( VLC_EGENERIC );
- }
- memcpy( p_buff,
- p_stream->p_buffer + p_stream->i_start,
- i_size );
- p_stream->i_start += i_size;
- return( VLC_SUCCESS );
- }
- else
- {
- return( stream_Read( p_stream->s, p_buff, i_size ) < i_size ? VLC_EGENERIC : VLC_SUCCESS);
- }
-}
-
-/****************************************************************************
- * MP4_PeekStream peek from a MP4_Stream_t
- *
- ****************************************************************************/
-int MP4_PeekStream( MP4_Stream_t *p_stream, uint8_t **pp_peek, int i_size )
-{
- if( p_stream->b_memory )
- {
- *pp_peek = p_stream->p_buffer + p_stream->i_start;
-
- return( __MIN(i_size,p_stream->i_stop - p_stream->i_start ));
- }
- else
- {
-
- if( stream_Size( p_stream->s ) > 0 )
- {
- int64_t i_max = stream_Size( p_stream->s ) - stream_Tell( p_stream->s );
- if( i_size > i_max )
- {
- i_size = i_max;
- }
- }
- return( stream_Peek( p_stream->s, pp_peek, i_size ) );
- }
-}
-
-/****************************************************************************
- * MP4_TellStream give absolute position in the stream
- * XXX for a memory stream give position from begining of the buffer
- ****************************************************************************/
-off_t MP4_TellStream( MP4_Stream_t *p_stream )
-{
- if( p_stream->b_memory )
- {
- return( p_stream->i_start );
- }
- else
- {
- return( stream_Tell( p_stream->s ) );
- }
-}
-
-/****************************************************************************
- * MP4_SeekStream seek in a MP4_Stream_t
- *
- ****************************************************************************/
-int MP4_SeekStream( MP4_Stream_t *p_stream, off_t i_pos)
-{
- if( p_stream->b_memory )
- {
- if( i_pos < p_stream->i_stop )
- {
- p_stream->i_start = i_pos;
- return( VLC_SUCCESS );
- }
- else
- {
- return( VLC_EGENERIC );
- }
- }
- else
- {
- return( stream_Seek( p_stream->s, (int64_t)i_pos ) );
- }
-}
-
+static MP4_Box_t *MP4_ReadBox( stream_t *p_stream, MP4_Box_t *p_father );
/*****************************************************************************
*
* RETURN : 0 if it fail, 1 otherwise
*****************************************************************************/
-int MP4_ReadBoxCommon( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+int MP4_ReadBoxCommon( stream_t *p_stream, MP4_Box_t *p_box )
{
int i_read;
uint8_t *p_peek;
- if( ( ( i_read = MP4_PeekStream( p_stream, &p_peek, 32 ) ) < 8 ) )
+ if( ( ( i_read = stream_Peek( p_stream, &p_peek, 32 ) ) < 8 ) )
{
- return( 0 );
+ return 0;
}
- p_box->i_pos = MP4_TellStream( p_stream );
+ p_box->i_pos = stream_Tell( p_stream );
p_box->data.p_data = NULL;
p_box->p_father = NULL;
#ifdef MP4_VERBOSE
if( p_box->i_size )
{
- msg_Dbg( p_stream->s, "found Box: %4.4s size "I64Fd,
- (char*)&p_box->i_type,
- p_box->i_size );
+ msg_Dbg( p_stream, "found Box: %4.4s size "I64Fd,
+ (char*)&p_box->i_type, p_box->i_size );
}
#endif
- return( 1 );
+ return 1;
}
-
/*****************************************************************************
* MP4_NextBox : Go to the next box
*****************************************************************************
* if p_box == NULL, go to the next box in witch we are( at the begining ).
*****************************************************************************/
-static int MP4_NextBox( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_NextBox( stream_t *p_stream, MP4_Box_t *p_box )
{
MP4_Box_t box;
if( !p_box->i_size )
{
- return( 2 ); /* Box with infinite size */
+ return 2; /* Box with infinite size */
}
if( p_box->p_father )
{
/* 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 )
+ p_box->p_father->i_size + p_box->p_father->i_pos )
{
- return( 0 ); /* out of bound */
+ return 0; /* out of bound */
}
}
- if( MP4_SeekStream( p_stream, p_box->i_size + p_box->i_pos ) )
+ if( stream_Seek( p_stream, p_box->i_size + p_box->i_pos ) )
{
return 0;
}
* after called one of theses functions, file position is unknown
* you need to call MP4_GotoBox to go where you want
*****************************************************************************/
-static int MP4_ReadBoxContainerRaw( MP4_Stream_t *p_stream, MP4_Box_t *p_container )
+static int MP4_ReadBoxContainerRaw( stream_t *p_stream, MP4_Box_t *p_container )
{
MP4_Box_t *p_box;
- if( MP4_TellStream( p_stream ) + 8 >
- (off_t)(p_container->i_pos + p_container->i_size) )
+ if( stream_Tell( p_stream ) + 8 >
+ (off_t)(p_container->i_pos + p_container->i_size) )
{
/* there is no box to load */
- return( 0 );
+ return 0;
}
do
{
- 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( MP4_Stream_t *p_stream, MP4_Box_t *p_container )
+static int MP4_ReadBoxContainer( stream_t *p_stream, MP4_Box_t *p_container )
{
if( p_container->i_size <= (size_t)MP4_BOX_HEADERSIZE(p_container ) + 8 )
{
/* container is empty, 8 stand for the first header in this box */
- return( 1 );
+ return 1;
}
/* enter box */
- MP4_SeekStream( 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 )
/* Up to now do nothing */
}
-static int MP4_ReadBoxSkip( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBoxSkip( stream_t *p_stream, MP4_Box_t *p_box )
{
/* XXX sometime moov is hiden in a free box */
- if( p_box->p_father && p_box->p_father->i_type == VLC_FOURCC( 'r', 'o', 'o', 't' )&&
+ 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 );
+ i_read = stream_Peek( p_stream, &p_peek, 44 );
p_peek += MP4_BOX_HEADERSIZE( p_box ) + 4;
i_read -= MP4_BOX_HEADERSIZE( p_box ) + 4;
if( i_fcc == FOURCC_cmov || i_fcc == FOURCC_mvhd )
{
- msg_Warn( p_stream->s, "detected moov hidden in a free box ..." );
+ msg_Warn( p_stream, "detected moov hidden in a free box ..." );
p_box->i_type = FOURCC_foov;
return MP4_ReadBoxContainer( p_stream, p_box );
}
}
}
+
/* Nothing to do */
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s, "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( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_ftyp( stream_t *p_stream, MP4_Box_t *p_box )
{
MP4_READBOX_ENTER( MP4_Box_data_ftyp_t );
}
-static int MP4_ReadBox_mvhd( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_mvhd( stream_t *p_stream, MP4_Box_t *p_box )
{
unsigned int i;
#ifdef MP4_VERBOSE
{
s_duration[0] = 0;
}
- msg_Dbg( p_stream->s, "read box: \"mvhd\" creation %s modification %s time scale %d duration %s rate %f volume %f next track id %d",
+ msg_Dbg( p_stream, "read box: \"mvhd\" creation %s modification %s time scale %d duration %s rate %f volume %f next track id %d",
s_creation_time,
s_modification_time,
(uint32_t)p_box->data.p_mvhd->i_timescale,
MP4_READBOX_EXIT( 1 );
}
-static int MP4_ReadBox_tkhd( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_tkhd( stream_t *p_stream, MP4_Box_t *p_box )
{
unsigned int i;
#ifdef MP4_VERBOSE
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->s, "read box: \"tkhd\" creation %s modification %s duration %s track ID %d layer %d volume %f width %f height %f",
+ msg_Dbg( p_stream, "read box: \"tkhd\" creation %s modification %s duration %s track ID %d layer %d volume %f width %f height %f",
s_creation_time,
s_modification_time,
s_duration,
}
-static int MP4_ReadBox_mdhd( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_mdhd( stream_t *p_stream, MP4_Box_t *p_box )
{
unsigned int i;
uint16_t i_language;
MP4_ConvertDate2Str( s_creation_time, p_box->data.p_mdhd->i_creation_time );
MP4_ConvertDate2Str( s_modification_time, p_box->data.p_mdhd->i_modification_time );
MP4_ConvertDate2Str( s_duration, p_box->data.p_mdhd->i_duration );
- msg_Dbg( p_stream->s, "read box: \"mdhd\" creation %s modification %s time scale %d duration %s language %c%c%c",
+ msg_Dbg( p_stream, "read box: \"mdhd\" creation %s modification %s time scale %d duration %s language %c%c%c",
s_creation_time,
s_modification_time,
(uint32_t)p_box->data.p_mdhd->i_timescale,
}
-static int MP4_ReadBox_hdlr( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_hdlr( stream_t *p_stream, MP4_Box_t *p_box )
{
int32_t i_reserved;
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s, "read box: \"hdlr\" hanler type %4.4s name %s",
+ msg_Dbg( p_stream, "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 );
FREE( p_box->data.p_hdlr->psz_name );
}
-static int MP4_ReadBox_vmhd( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_vmhd( stream_t *p_stream, MP4_Box_t *p_box )
{
unsigned int i;
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s, "read box: \"vmhd\" graphics-mode %d opcolor (%d, %d, %d)",
+ msg_Dbg( p_stream, "read box: \"vmhd\" graphics-mode %d opcolor (%d, %d, %d)",
p_box->data.p_vmhd->i_graphics_mode,
p_box->data.p_vmhd->i_opcolor[0],
p_box->data.p_vmhd->i_opcolor[1],
MP4_READBOX_EXIT( 1 );
}
-static int MP4_ReadBox_smhd( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_smhd( stream_t *p_stream, MP4_Box_t *p_box )
{
MP4_READBOX_ENTER( MP4_Box_data_smhd_t );
MP4_GET2BYTES( p_box->data.p_smhd->i_reserved );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s, "read box: \"smhd\" balance %f",
+ msg_Dbg( p_stream, "read box: \"smhd\" balance %f",
(float)p_box->data.p_smhd->i_balance / 256 );
#endif
MP4_READBOX_EXIT( 1 );
}
-static int MP4_ReadBox_hmhd( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_hmhd( stream_t *p_stream, MP4_Box_t *p_box )
{
MP4_READBOX_ENTER( MP4_Box_data_hmhd_t );
MP4_GET4BYTES( p_box->data.p_hmhd->i_reserved );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s, "read box: \"hmhd\" maxPDU-size %d avgPDU-size %d max-bitrate %d avg-bitrate %d",
+ msg_Dbg( p_stream, "read box: \"hmhd\" maxPDU-size %d avgPDU-size %d max-bitrate %d avg-bitrate %d",
p_box->data.p_hmhd->i_max_PDU_size,
p_box->data.p_hmhd->i_avg_PDU_size,
p_box->data.p_hmhd->i_max_bitrate,
MP4_READBOX_EXIT( 1 );
}
-static int MP4_ReadBox_url( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_url( stream_t *p_stream, MP4_Box_t *p_box )
{
MP4_READBOX_ENTER( MP4_Box_data_url_t );
MP4_GETSTRINGZ( p_box->data.p_url->psz_location );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s, "read box: \"url\" url: %s",
+ msg_Dbg( p_stream, "read box: \"url\" url: %s",
p_box->data.p_url->psz_location );
#endif
FREE( p_box->data.p_url->psz_location )
}
-static int MP4_ReadBox_urn( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_urn( stream_t *p_stream, MP4_Box_t *p_box )
{
MP4_READBOX_ENTER( MP4_Box_data_urn_t );
MP4_GETSTRINGZ( p_box->data.p_urn->psz_location );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s, "read box: \"urn\" name %s location %s",
+ msg_Dbg( p_stream, "read box: \"urn\" name %s location %s",
p_box->data.p_urn->psz_name,
p_box->data.p_urn->psz_location );
#endif
}
-static int MP4_ReadBox_dref( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_dref( stream_t *p_stream, MP4_Box_t *p_box )
{
MP4_READBOX_ENTER( MP4_Box_data_dref_t );
MP4_GET4BYTES( p_box->data.p_dref->i_entry_count );
- MP4_SeekStream( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) + 8 );
+ stream_Seek( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) + 8 );
MP4_ReadBoxContainerRaw( p_stream, p_box );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s, "read box: \"dref\" entry-count %d",
+ msg_Dbg( p_stream, "read box: \"dref\" entry-count %d",
p_box->data.p_dref->i_entry_count );
#endif
}
-static int MP4_ReadBox_stts( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_stts( stream_t *p_stream, MP4_Box_t *p_box )
{
unsigned int i;
MP4_READBOX_ENTER( MP4_Box_data_stts_t );
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s, "read box: \"stts\" entry-count %d",
+ msg_Dbg( p_stream, "read box: \"stts\" entry-count %d",
p_box->data.p_stts->i_entry_count );
#endif
FREE( p_box->data.p_stts->i_sample_delta );
}
-static int MP4_ReadBox_ctts( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_ctts( stream_t *p_stream, MP4_Box_t *p_box )
{
unsigned int i;
MP4_READBOX_ENTER( MP4_Box_data_ctts_t );
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s, "read box: \"ctts\" entry-count %d",
+ msg_Dbg( p_stream, "read box: \"ctts\" entry-count %d",
p_box->data.p_ctts->i_entry_count );
#endif
return( i_len );
}
-static int MP4_ReadBox_esds( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_esds( stream_t *p_stream, MP4_Box_t *p_box )
{
#define es_descriptor p_box->data.p_esds->es_descriptor
unsigned int i_len;
i_len = MP4_ReadLengthDescriptor( &p_peek, &i_read );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s, "found esds MPEG4ESDescr (%dBytes)",
+ msg_Dbg( p_stream, "found esds MPEG4ESDescr (%dBytes)",
i_len );
#endif
i_len = MP4_ReadLengthDescriptor( &p_peek, &i_read );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s, "found esds MP4DecConfigDescr (%dBytes)",
+ msg_Dbg( p_stream, "found esds MP4DecConfigDescr (%dBytes)",
i_len );
#endif
i_len = MP4_ReadLengthDescriptor( &p_peek, &i_read );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s, "found esds MP4DecSpecificDescr (%dBytes)",
+ msg_Dbg( p_stream, "found esds MP4DecSpecificDescr (%dBytes)",
i_len );
#endif
FREE( p_box->data.p_esds->es_descriptor.p_decConfigDescr );
}
-static int MP4_ReadBox_avcC( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_avcC( stream_t *p_stream, MP4_Box_t *p_box )
{
MP4_Box_data_avcC_t *p_avcC;
int i;
}
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s,
+ msg_Dbg( p_stream,
"read box: \"avcC\" version=%d profile=0x%x level=0x%x lengh size=%d sps=%d pps=%d",
p_avcC->i_version, p_avcC->i_profile, p_avcC->i_level,
p_avcC->i_length_size,
p_avcC->i_sps, p_avcC->i_pps );
for( i = 0; i < p_avcC->i_sps; i++ )
{
- msg_Dbg( p_stream->s, " - sps[%d] length=%d",
+ msg_Dbg( p_stream, " - sps[%d] length=%d",
i, p_avcC->i_sps_length[i] );
}
for( i = 0; i < p_avcC->i_pps; i++ )
{
- msg_Dbg( p_stream->s, " - pps[%d] length=%d",
+ msg_Dbg( p_stream, " - pps[%d] length=%d",
i, p_avcC->i_pps_length[i] );
}
if( p_avcC->i_pps > 0 ) FREE( p_avcC->pps );
}
-static int MP4_ReadBox_sample_soun( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_sample_soun( stream_t *p_stream, MP4_Box_t *p_box )
{
unsigned int i;
MP4_GET2BYTES( p_box->data.p_sample_soun->i_sampleratehi );
MP4_GET2BYTES( p_box->data.p_sample_soun->i_sampleratelo );
- if( p_box->data.p_sample_soun->i_qt_version == 1 &&
- i_read >= 16 )
+ if( p_box->data.p_sample_soun->i_qt_version == 1 && i_read >= 16 )
{
- /* qt3+ */
+ /* SoundDescriptionV1 */
MP4_GET4BYTES( p_box->data.p_sample_soun->i_sample_per_packet );
MP4_GET4BYTES( p_box->data.p_sample_soun->i_bytes_per_packet );
MP4_GET4BYTES( p_box->data.p_sample_soun->i_bytes_per_frame );
MP4_GET4BYTES( p_box->data.p_sample_soun->i_bytes_per_sample );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s,
+ msg_Dbg( p_stream,
"read box: \"soun\" qt3+ sample/packet=%d bytes/packet=%d "
"bytes/frame=%d bytes/sample=%d",
p_box->data.p_sample_soun->i_sample_per_packet,
p_box->data.p_sample_soun->i_bytes_per_frame,
p_box->data.p_sample_soun->i_bytes_per_sample );
#endif
- MP4_SeekStream( p_stream, p_box->i_pos +
+ 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;
+ uint32_t i_channel;
+
+ MP4_GET4BYTES( p_box->data.p_sample_soun->i_sample_per_packet );
+ MP4_GET8BYTES( (*(int64_t *)&f_sample_rate) );
+
+ 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;
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->s, "read box: \"soun\" mp4 or qt1/2 (rest="I64Fd")",
+ msg_Dbg( p_stream, "read box: \"soun\" mp4 or qt1/2 (rest="I64Fd")",
i_read );
- MP4_SeekStream( p_stream, p_box->i_pos +
+ stream_Seek( p_stream, p_box->i_pos +
MP4_BOX_HEADERSIZE( p_box ) + 28 );
}
if( p_box->i_type == FOURCC_drms )
{
p_box->data.p_sample_soun->p_drms =
- drms_alloc( p_stream->s->p_vlc->psz_homedir );
+ drms_alloc( p_stream->p_vlc->psz_homedir );
if( p_box->data.p_sample_soun->p_drms == NULL )
{
- msg_Err( p_stream->s, "drms_alloc() failed" );
+ msg_Err( p_stream, "drms_alloc() failed" );
}
}
- 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->s, "read box: \"soun\" in stsd channel %d "
- "sample size %d sampl rate %f",
+ msg_Dbg( p_stream, "read box: \"soun\" in stsd channel %d "
+ "sample size %d sample rate %f",
p_box->data.p_sample_soun->i_channelcount,
p_box->data.p_sample_soun->i_samplesize,
(float)p_box->data.p_sample_soun->i_sampleratehi +
}
-int MP4_ReadBox_sample_vide( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+int MP4_ReadBox_sample_vide( stream_t *p_stream, MP4_Box_t *p_box )
{
unsigned int i;
MP4_GET2BYTES( p_box->data.p_sample_vide->i_depth );
MP4_GET2BYTES( p_box->data.p_sample_vide->i_qt_color_table );
- MP4_SeekStream( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) + 78);
+ stream_Seek( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) + 78);
MP4_ReadBoxContainerRaw( p_stream, p_box );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s, "read box: \"vide\" in stsd %dx%d depth %d",
+ msg_Dbg( p_stream, "read box: \"vide\" in stsd %dx%d depth %d",
p_box->data.p_sample_vide->i_width,
p_box->data.p_sample_vide->i_height,
p_box->data.p_sample_vide->i_depth );
FREE( p_box->data.p_sample_vide->p_qt_image_description );
}
-static int MP4_ReadBox_sample_mp4s( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_sample_mp4s( stream_t *p_stream, MP4_Box_t *p_box )
{
- MP4_SeekStream( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) + 8 );
+ stream_Seek( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) + 8 );
MP4_ReadBoxContainerRaw( p_stream, p_box );
return 1;
}
-static int MP4_ReadBox_sample_text( MP4_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;
p_box->data.p_sample_text->psz_text_name[i] = '\0';
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s, "read box: \"text\" in stsd text name=%s",
+ msg_Dbg( p_stream, "read box: \"text\" in stsd text name=%s",
p_box->data.p_sample_text->psz_text_name );
#endif
MP4_READBOX_EXIT( 1 );
#endif
-static int MP4_ReadBox_stsd( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_stsd( stream_t *p_stream, MP4_Box_t *p_box )
{
MP4_READBOX_ENTER( MP4_Box_data_stsd_t );
MP4_GET4BYTES( p_box->data.p_stsd->i_entry_count );
- MP4_SeekStream( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) + 8 );
+ stream_Seek( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) + 8 );
MP4_ReadBoxContainerRaw( p_stream, p_box );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s, "read box: \"stsd\" entry-count %d",
+ msg_Dbg( p_stream, "read box: \"stsd\" entry-count %d",
p_box->data.p_stsd->i_entry_count );
#endif
}
-static int MP4_ReadBox_stsz( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_stsz( stream_t *p_stream, MP4_Box_t *p_box )
{
unsigned int i;
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s, "read box: \"stsz\" sample-size %d sample-count %d",
+ msg_Dbg( p_stream, "read box: \"stsz\" sample-size %d sample-count %d",
p_box->data.p_stsz->i_sample_size,
p_box->data.p_stsz->i_sample_count );
FREE( p_box->data.p_stsz->i_entry_size );
}
-static int MP4_ReadBox_stsc( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_stsc( stream_t *p_stream, MP4_Box_t *p_box )
{
unsigned int i;
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s, "read box: \"stsc\" entry-count %d",
+ msg_Dbg( p_stream, "read box: \"stsc\" entry-count %d",
p_box->data.p_stsc->i_entry_count );
#endif
FREE( p_box->data.p_stsc->i_sample_description_index );
}
-static int MP4_ReadBox_stco_co64( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_stco_co64( stream_t *p_stream, MP4_Box_t *p_box )
{
unsigned int i;
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s, "read box: \"co64\" entry-count %d",
+ msg_Dbg( p_stream, "read box: \"co64\" entry-count %d",
p_box->data.p_co64->i_entry_count );
#endif
FREE( p_box->data.p_co64->i_chunk_offset );
}
-static int MP4_ReadBox_stss( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_stss( stream_t *p_stream, MP4_Box_t *p_box )
{
unsigned int i;
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s, "read box: \"stss\" entry-count %d",
+ msg_Dbg( p_stream, "read box: \"stss\" entry-count %d",
p_box->data.p_stss->i_entry_count );
#endif
FREE( p_box->data.p_stss->i_sample_number )
}
-static int MP4_ReadBox_stsh( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_stsh( stream_t *p_stream, MP4_Box_t *p_box )
{
unsigned int i;
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s, "read box: \"stsh\" entry-count %d",
+ msg_Dbg( p_stream, "read box: \"stsh\" entry-count %d",
p_box->data.p_stsh->i_entry_count );
#endif
MP4_READBOX_EXIT( 1 );
}
-static int MP4_ReadBox_stdp( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_stdp( stream_t *p_stream, MP4_Box_t *p_box )
{
unsigned int i;
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s, "read box: \"stdp\" entry-count "I64Fd,
+ msg_Dbg( p_stream, "read box: \"stdp\" entry-count "I64Fd,
i_read / 2 );
#endif
FREE( p_box->data.p_stdp->i_priority )
}
-static int MP4_ReadBox_padb( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_padb( stream_t *p_stream, MP4_Box_t *p_box )
{
unsigned int i;
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s, "read box: \"stdp\" entry-count "I64Fd,
+ msg_Dbg( p_stream, "read box: \"stdp\" entry-count "I64Fd,
i_read / 2 );
#endif
FREE( p_box->data.p_padb->i_pad1 );
}
-static int MP4_ReadBox_elst( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_elst( stream_t *p_stream, MP4_Box_t *p_box )
{
unsigned int i;
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s, "read box: \"elst\" entry-count "I64Fd,
+ msg_Dbg( p_stream, "read box: \"elst\" entry-count "I64Fd,
i_read / 2 );
#endif
FREE( p_box->data.p_elst->i_media_rate_fraction );
}
-static int MP4_ReadBox_cprt( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_cprt( stream_t *p_stream, MP4_Box_t *p_box )
{
unsigned int i_language;
unsigned int i;
MP4_GETSTRINGZ( p_box->data.p_cprt->psz_notice );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s, "read box: \"cprt\" language %c%c%c notice %s",
+ msg_Dbg( p_stream, "read box: \"cprt\" language %c%c%c notice %s",
p_box->data.p_cprt->i_language[0],
p_box->data.p_cprt->i_language[1],
p_box->data.p_cprt->i_language[2],
}
-static int MP4_ReadBox_dcom( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_dcom( stream_t *p_stream, MP4_Box_t *p_box )
{
MP4_READBOX_ENTER( MP4_Box_data_dcom_t );
MP4_GETFOURCC( p_box->data.p_dcom->i_algorithm );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s,
+ msg_Dbg( p_stream,
"read box: \"dcom\" compression algorithm : %4.4s",
(char*)&p_box->data.p_dcom->i_algorithm );
#endif
MP4_READBOX_EXIT( 1 );
}
-static int MP4_ReadBox_cmvd( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_cmvd( stream_t *p_stream, MP4_Box_t *p_box )
{
MP4_READBOX_ENTER( MP4_Box_data_cmvd_t );
if( !( p_box->data.p_cmvd->p_data = malloc( i_read ) ) )
{
- msg_Dbg( p_stream->s, "read box: \"cmvd\" not enough memory to load data" );
+ msg_Dbg( p_stream, "read box: \"cmvd\" not enough memory to load data" );
return( 1 );
}
p_box->data.p_cmvd->b_compressed = 1;
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s, "read box: \"cmvd\" compressed data size %d",
+ msg_Dbg( p_stream, "read box: \"cmvd\" compressed data size %d",
p_box->data.p_cmvd->i_compressed_size );
#endif
}
-static int MP4_ReadBox_cmov( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_cmov( stream_t *p_stream, MP4_Box_t *p_box )
{
- MP4_Stream_t *p_stream_memory;
-
MP4_Box_t *p_dcom;
MP4_Box_t *p_cmvd;
+
#ifdef HAVE_ZLIB_H
- z_stream z_data;
-#endif
+ stream_t *p_stream_memory;
+ z_stream z_data;
uint8_t *p_data;
-
int i_result;
+#endif
if( !( p_box->data.p_cmov = malloc( sizeof( MP4_Box_data_cmov_t ) ) ) )
{
- msg_Err( p_stream->s, "out of memory" );
- return( 0 );
+ msg_Err( p_stream, "out of memory" );
+ return 0;
}
memset( p_box->data.p_cmov, 0, sizeof( MP4_Box_data_cmov_t ) );
if( !p_box->p_father ||
- ( p_box->p_father->i_type != FOURCC_moov && 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->s, "Read box: \"cmov\" box alone" );
- return( 1 );
+ msg_Warn( p_stream, "Read box: \"cmov\" box alone" );
+ return 1;
}
- if( !(i_result = MP4_ReadBoxContainer( p_stream, p_box ) ) )
+ if( !MP4_ReadBoxContainer( p_stream, p_box ) )
{
- return( 0 );
+ return 0;
}
if( ( p_dcom = MP4_BoxGet( p_box, "dcom" ) ) == NULL ||
( p_cmvd = MP4_BoxGet( p_box, "cmvd" ) ) == NULL ||
p_cmvd->data.p_cmvd->p_data == NULL )
{
- msg_Warn( p_stream->s, "read box: \"cmov\" incomplete" );
- return( 1 );
+ msg_Warn( p_stream, "read box: \"cmov\" incomplete" );
+ return 1;
}
if( p_dcom->data.p_dcom->i_algorithm != FOURCC_zlib )
{
- msg_Dbg( p_stream->s, "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->s,
- "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->s,
- "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->s,
- "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->s,
- "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->s,
- "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->s,
- "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->s,
- "read box: \"cmov\" box succesfully uncompressed" );
+ msg_Dbg( p_stream, "read box: \"cmov\" box succesfully uncompressed" );
/* now create a memory stream */
- p_stream_memory = MP4_MemoryStream( p_stream->s,
- p_cmvd->data.p_cmvd->i_uncompressed_size,
- p_cmvd->data.p_cmvd->p_data );
+ 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->s,
- "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 int MP4_ReadBox_rdrf( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_rdrf( stream_t *p_stream, MP4_Box_t *p_box )
{
uint32_t i_len;
MP4_READBOX_ENTER( MP4_Box_data_rdrf_t );
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s,
+ msg_Dbg( p_stream,
"read box: \"rdrf\" type:%4.4s ref %s",
(char*)&p_box->data.p_rdrf->i_ref_type,
p_box->data.p_rdrf->psz_ref );
}
-static int MP4_ReadBox_rmdr( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_rmdr( stream_t *p_stream, MP4_Box_t *p_box )
{
MP4_READBOX_ENTER( MP4_Box_data_rmdr_t );
MP4_GET4BYTES( p_box->data.p_rmdr->i_rate );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s,
+ msg_Dbg( p_stream,
"read box: \"rmdr\" rate:%d",
p_box->data.p_rmdr->i_rate );
#endif
MP4_READBOX_EXIT( 1 );
}
-static int MP4_ReadBox_rmqu( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_rmqu( stream_t *p_stream, MP4_Box_t *p_box )
{
MP4_READBOX_ENTER( MP4_Box_data_rmqu_t );
MP4_GET4BYTES( p_box->data.p_rmqu->i_quality );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s,
+ msg_Dbg( p_stream,
"read box: \"rmqu\" quality:%d",
p_box->data.p_rmqu->i_quality );
#endif
MP4_READBOX_EXIT( 1 );
}
-static int MP4_ReadBox_rmvc( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_rmvc( stream_t *p_stream, MP4_Box_t *p_box )
{
MP4_READBOX_ENTER( MP4_Box_data_rmvc_t );
MP4_GETVERSIONFLAGS( p_box->data.p_rmvc );
MP4_GET2BYTES( p_box->data.p_rmvc->i_checkType );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s,
+ msg_Dbg( p_stream,
"read box: \"rmvc\" gestaltType:%4.4s val1:0x%x val2:0x%x checkType:0x%x",
(char*)&p_box->data.p_rmvc->i_gestaltType,
p_box->data.p_rmvc->i_val1,p_box->data.p_rmvc->i_val2,
MP4_READBOX_EXIT( 1 );
}
-static int MP4_ReadBox_drms( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_drms( stream_t *p_stream, MP4_Box_t *p_box )
{
MP4_Box_t *p_drms_box = p_box;
if( drms_init( p_drms_box->data.p_sample_soun->p_drms,
p_box->i_type, p_peek, i_read ) )
{
- msg_Err( p_stream->s, "drms_init( %4.4s ) failed",
+ msg_Err( p_stream, "drms_init( %4.4s ) failed",
(char *)&p_box->i_type );
drms_free( p_drms_box->data.p_sample_soun->p_drms );
MP4_READBOX_EXIT( 1 );
}
-static int MP4_ReadBox_0xa9xxx( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_0xa9xxx( stream_t *p_stream, MP4_Box_t *p_box )
{
int16_t i_length, i_dummy;
p_box->data.p_0xa9xxx->psz_text[i_length] = '\0';
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->s,
+ msg_Dbg( p_stream,
"read box: \"%4.4s\" text=`%s'",
(char*)&p_box->i_type,
p_box->data.p_0xa9xxx->psz_text );
}
/* For generic */
-static int MP4_ReadBox_default( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_default( stream_t *p_stream, MP4_Box_t *p_box )
{
if( !p_box->p_father )
{
case FOURCC_text:
return MP4_ReadBox_sample_text( p_stream, p_box );
default:
- msg_Warn( p_stream->s,
+ msg_Warn( p_stream,
"unknown handler type in stsd (uncompletetly loaded)" );
return 1;
}
}
unknown:
- msg_Warn( p_stream->s,
+ msg_Warn( p_stream,
"unknown box type %4.4s (uncompletetly loaded)",
(char*)&p_box->i_type );
static struct
{
uint32_t i_type;
- int (*MP4_ReadBox_function )( MP4_Stream_t *p_stream, MP4_Box_t *p_box );
+ int (*MP4_ReadBox_function )( stream_t *p_stream, MP4_Box_t *p_box );
void (*MP4_FreeBox_function )( MP4_Box_t *p_box );
} MP4_Box_Function [] =
{
{ 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_0xa9prd,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
{ FOURCC_0xa9prf,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
{ FOURCC_0xa9src,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
+ { FOURCC_0xa9alb,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
+ { FOURCC_0xa9dis,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
+ { FOURCC_0xa9enc,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
+ { FOURCC_0xa9gen,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
+ { FOURCC_0xa9trk,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
+ { FOURCC_0xa9dsa,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
+ { FOURCC_0xa9hst,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
+ { FOURCC_0xa9url,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
+ { FOURCC_0xa9ope,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
+ { FOURCC_0xa9com,MP4_ReadBox_0xa9xxx, MP4_FreeBox_0xa9xxx },
/* Last entry */
{ 0, MP4_ReadBox_default, NULL }
* MP4_ReadBox : parse the actual box and the children
* XXX : Do not go to the next box
*****************************************************************************/
-static MP4_Box_t *MP4_ReadBox( MP4_Stream_t *p_stream, MP4_Box_t *p_father )
+static MP4_Box_t *MP4_ReadBox( stream_t *p_stream, MP4_Box_t *p_father )
{
MP4_Box_t *p_box = malloc( sizeof( MP4_Box_t ) );
unsigned int i_index;
if( !MP4_ReadBoxCommon( p_stream, p_box ) )
{
- msg_Warn( p_stream->s, "cannot read one box" );
+ msg_Warn( p_stream, "cannot read one box" );
free( p_box );
return NULL;
}
if( !p_box->i_size )
{
- msg_Dbg( p_stream->s, "found an empty box (null size)" );
+ msg_Dbg( p_stream, "found an empty box (null size)" );
free( p_box );
return NULL;
}
MP4_Box_t *MP4_BoxGetRoot( stream_t *s )
{
MP4_Box_t *p_root;
- MP4_Stream_t *p_stream;
+ stream_t *p_stream;
int i_result;
p_root = malloc( sizeof( MP4_Box_t ) );
p_root->p_last = NULL;
p_root->p_next = NULL;
- p_stream = MP4_InputStream( s );
+ p_stream = s;
i_result = MP4_ReadBoxContainerRaw( p_stream, p_root );
- free( p_stream );
-
if( i_result )
{
MP4_Box_t *p_child;
projects / vlc / blobdiff