/*****************************************************************************
* libmp4.c : LibMP4 library for mp4 module for vlc
*****************************************************************************
- * Copyright (C) 2001-2004, 2010 the VideoLAN team
+ * Copyright (C) 2001-2004, 2010 VLC authors and VideoLAN
*
* Author: 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
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 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
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
}
p_box->i_pos = stream_Tell( p_stream );
- p_box->data.p_data = NULL;
+ p_box->data.p_payload = NULL;
p_box->p_father = NULL;
p_box->p_first = NULL;
p_box->p_last = NULL;
p_container->p_last = p_box;
if( p_box->i_type == i_last_child )
+ {
+ MP4_NextBox( p_stream, p_box );
break;
+ }
} while( MP4_NextBox( p_stream, p_box ) == 1 );
MP4_Box_data_stra_t *p_stra = p_box->data.p_stra;
uint8_t i_reserved;
+ VLC_UNUSED(i_reserved);
MP4_GET1BYTE( p_stra->i_es_cat );
MP4_GET1BYTE( i_reserved );
MP4_GET2BYTES( p_stra->i_track_ID );
}
uint16_t i_reserved;
+ VLC_UNUSED(i_reserved);
MP4_GET2BYTES( i_reserved );
MP4_GET2BYTES( p_sidx_data->i_reference_count );
uint16_t i_count = p_sidx_data->i_reference_count;
double scale[2]; // scale factor; sx = scale[0] , sy = scale[1]
double translate[2];// amount to translate; tx = translate[0] , ty = translate[1]
- int *matrix = p_box->data.p_tkhd->i_matrix;
+ int32_t *matrix = p_box->data.p_tkhd->i_matrix;
translate[0] = conv_fx(matrix[6]);
translate[1] = conv_fx(matrix[7]);
static int MP4_ReadBox_hdlr( stream_t *p_stream, MP4_Box_t *p_box )
{
int32_t i_reserved;
+ VLC_UNUSED(i_reserved);
MP4_READBOX_ENTER( MP4_Box_data_hdlr_t );
p_box->data.p_stts->i_sample_count =
calloc( p_box->data.p_stts->i_entry_count, sizeof(uint32_t) );
p_box->data.p_stts->i_sample_delta =
- calloc( p_box->data.p_stts->i_entry_count, sizeof(uint32_t) );
+ calloc( p_box->data.p_stts->i_entry_count, sizeof(int32_t) );
if( p_box->data.p_stts->i_sample_count == NULL
|| p_box->data.p_stts->i_sample_delta == NULL )
{
p_box->data.p_ctts->i_sample_count =
calloc( p_box->data.p_ctts->i_entry_count, sizeof(uint32_t) );
p_box->data.p_ctts->i_sample_offset =
- calloc( p_box->data.p_ctts->i_entry_count, sizeof(uint32_t) );
+ calloc( p_box->data.p_ctts->i_entry_count, sizeof(int32_t) );
if( ( p_box->data.p_ctts->i_sample_count == NULL )
|| ( p_box->data.p_ctts->i_sample_offset == NULL ) )
{
#undef es_descriptor
}
+static void MP4_FreeBox_hvcC(MP4_Box_t *p_box )
+{
+ MP4_Box_data_hvcC_t *p_hvcC = p_box->data.p_hvcC;
+ if( p_hvcC->i_hvcC > 0 ) FREENULL( p_hvcC->p_hvcC) ;
+}
+
+static int MP4_ReadBox_hvcC( stream_t *p_stream, MP4_Box_t *p_box )
+{
+ MP4_Box_data_hvcC_t *p_hvcC;
+
+ MP4_READBOX_ENTER( MP4_Box_data_hvcC_t );
+ p_hvcC = p_box->data.p_hvcC;
+
+ p_hvcC->i_hvcC = i_read;
+ if( p_hvcC->i_hvcC > 0 )
+ {
+ uint8_t * p = p_hvcC->p_hvcC = malloc( p_hvcC->i_hvcC );
+ if( p )
+ memcpy( p, p_peek, i_read );
+ }
+ MP4_READBOX_EXIT( 1 );
+}
+
static void MP4_FreeBox_avcC( MP4_Box_t *p_box )
{
MP4_Box_data_avcC_t *p_avcC = p_box->data.p_avcC;
p_dvc1 = p_box->data.p_dvc1;
MP4_GET1BYTE( p_dvc1->i_profile_level ); /* profile is on 4bits, level 3bits */
- if( (p_dvc1->i_profile_level & 0xf0) >> 4 != 0x06 )
+ uint8_t i_profile = (p_dvc1->i_profile_level & 0xf0) >> 4;
+ if( i_profile != 0x06 && i_profile != 0x0c )
{
- msg_Warn( p_stream, "unsupported VC-1 profile, please report" );
+ msg_Warn( p_stream, "unsupported VC-1 profile (%"PRIu8"), please report", i_profile );
MP4_READBOX_EXIT( 0 );
}
#ifdef MP4_VERBOSE
msg_Dbg( p_stream,
- "read box: \"dvc1\" profile=%i level=%i",
- p_dvc1->i_profile_level & 0xf0 >> 4, p_dvc1->i_profile_level & 0x0e >> 1 );
+ "read box: \"dvc1\" profile=%"PRIu8" level=%i",
+ i_profile, p_dvc1->i_profile_level & 0x0e >> 1 );
#endif
MP4_READBOX_EXIT( 1 );
MP4_READBOX_EXIT( 0 );
uint32_t i_version;
+ VLC_UNUSED(i_version);
uint32_t i_reserved;
+ VLC_UNUSED(i_reserved);
MP4_GET4BYTES( i_version );
MP4_GET4BYTES( i_reserved );
MP4_GET2BYTES( p_gnre->i_genre );
MP4_READBOX_EXIT( 0 );
uint32_t i_version;
+ VLC_UNUSED(i_version);
uint32_t i_reserved;
+ VLC_UNUSED(i_reserved);
MP4_GET4BYTES( i_version );
MP4_GET4BYTES( i_reserved );
MP4_GET2BYTES( i_reserved );
MP4_READBOX_EXIT( 1 );
}
-
static int MP4_ReadBox_sample_soun( stream_t *p_stream, MP4_Box_t *p_box )
{
MP4_READBOX_ENTER( MP4_Box_data_sample_soun_t );
MP4_GET2BYTES( p_box->data.p_sample_text->i_background_color[0] );
MP4_GET2BYTES( p_box->data.p_sample_text->i_background_color[1] );
MP4_GET2BYTES( p_box->data.p_sample_text->i_background_color[2] );
- p_box->data.p_sample_text->i_background_color[3] = 0;
+ p_box->data.p_sample_text->i_background_color[3] = 0xFF;
MP4_GET2BYTES( p_box->data.p_sample_text->i_text_box_top );
MP4_GET2BYTES( p_box->data.p_sample_text->i_text_box_left );
MP4_GET2BYTES( p_box->data.p_sample_text->i_text_box_bottom );
MP4_GET2BYTES( p_box->data.p_sample_text->i_text_box_right );
+ MP4_GET4BYTES( p_box->data.p_sample_text->i_reserved3 );
+
+ MP4_GET2BYTES( p_box->data.p_sample_text->i_font_id );
+ MP4_GET1BYTE ( p_box->data.p_sample_text->i_font_face );
+ MP4_GET1BYTE ( p_box->data.p_sample_text->i_font_size );
+ MP4_GET4BYTES( p_box->data.p_sample_text->i_font_color );
+
#ifdef MP4_VERBOSE
msg_Dbg( p_stream, "read box: \"tx3g\" in stsd text" );
#endif
p_box->data.p_elst->i_segment_duration =
calloc( p_box->data.p_elst->i_entry_count, sizeof(uint64_t) );
p_box->data.p_elst->i_media_time =
- calloc( p_box->data.p_elst->i_entry_count, sizeof(uint64_t) );
+ calloc( p_box->data.p_elst->i_entry_count, sizeof(int64_t) );
p_box->data.p_elst->i_media_rate_integer =
calloc( p_box->data.p_elst->i_entry_count, sizeof(uint16_t) );
p_box->data.p_elst->i_media_rate_fraction =
FREENULL( p_box->data.p_name->psz_text );
}
+static int MP4_ReadBox_data( stream_t *p_stream, MP4_Box_t *p_box )
+{
+ MP4_READBOX_ENTER( MP4_Box_data_data_t );
+
+ /* What's that header ?? */
+ if ( i_read <= 8 )
+ MP4_READBOX_EXIT( 0 );
+
+ p_box->data.p_data->p_blob = malloc( i_read - 8 );
+ if ( !p_box->data.p_data->p_blob )
+ MP4_READBOX_EXIT( 0 );
+
+ p_box->data.p_data->i_blob = i_read - 8;
+ memcpy( p_box->data.p_data->p_blob, p_peek + 8, i_read - 8 );
+
+ MP4_READBOX_EXIT( 1 );
+}
+
+static void MP4_FreeBox_data( MP4_Box_t *p_box )
+{
+ free( p_box->data.p_data->p_blob );
+}
+
static int MP4_ReadBox_0xa9xxx( stream_t *p_stream, MP4_Box_t *p_box )
{
uint16_t i16;
/* data box contains a version/flags field */
uint32_t i_version;
uint32_t i_reserved;
+ VLC_UNUSED(i_reserved);
MP4_GET4BYTES( i_version );
MP4_GET4BYTES( i_reserved );
// version should be 0, flags should be 1 for text, 0 for data
{
MP4_Box_data_chpl_t *p_chpl;
uint32_t i_dummy;
+ VLC_UNUSED(i_dummy);
int i;
MP4_READBOX_ENTER( MP4_Box_data_chpl_t );
static int MP4_ReadBox_iods( stream_t *p_stream, MP4_Box_t *p_box )
{
char i_unused;
+ VLC_UNUSED(i_unused);
MP4_READBOX_ENTER( MP4_Box_data_iods_t );
MP4_GETVERSIONFLAGS( p_box->data.p_iods );
MP4_GET1BYTE( p_sdtp->p_sample_table[i] );
#ifdef MP4_VERBOSE
- msg_Info( p_stream, "i_sample_count is %"PRIu32"", i_sample_count );
+ msg_Dbg( p_stream, "i_sample_count is %"PRIu32"", i_sample_count );
msg_Dbg( p_stream,
"read box: \"sdtp\" head: %"PRIx8" %"PRIx8" %"PRIx8" %"PRIx8"",
p_sdtp->p_sample_table[0],
((uint64_t *)(p_tfra->p_moof_offset))[1] );
}
- msg_Info( p_stream, "number_of_entries is %"PRIu32"", i_number_of_entries );
- msg_Info( p_stream, "track ID is: %"PRIu32"", p_tfra->i_track_ID );
+ msg_Dbg( p_stream, "number_of_entries is %"PRIu32"", i_number_of_entries );
+ msg_Dbg( p_stream, "track ID is: %"PRIu32"", p_tfra->i_track_ID );
#endif
MP4_READBOX_EXIT( 1 );
{ ATOM_dcom, MP4_ReadBox_dcom, MP4_FreeBox_Common },
{ ATOM_cmvd, MP4_ReadBox_cmvd, MP4_FreeBox_cmvd },
{ ATOM_avcC, MP4_ReadBox_avcC, MP4_FreeBox_avcC },
+ { ATOM_hvcC, MP4_ReadBox_hvcC, MP4_FreeBox_hvcC },
{ ATOM_dac3, MP4_ReadBox_dac3, MP4_FreeBox_Common },
{ ATOM_dvc1, MP4_ReadBox_dvc1, MP4_FreeBox_Common },
{ ATOM_enda, MP4_ReadBox_enda, MP4_FreeBox_Common },
{ ATOM_free, MP4_ReadBoxSkip, MP4_FreeBox_Common },
{ ATOM_wide, MP4_ReadBoxSkip, MP4_FreeBox_Common },
+ /* Subtitles */
+ { ATOM_tx3g, MP4_ReadBox_sample_tx3g, MP4_FreeBox_Common },
+ //{ ATOM_text, MP4_ReadBox_sample_text, MP4_FreeBox_Common },
+
/* for codecs */
{ ATOM_soun, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
{ ATOM_ms02, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
/* iTunes/Quicktime meta info */
{ ATOM_meta, MP4_ReadBox_meta, MP4_FreeBox_Common },
{ ATOM_name, MP4_ReadBox_name, MP4_FreeBox_name },
+ { ATOM_covr, MP4_ReadBoxContainer, MP4_FreeBox_Common },
+ { ATOM_data, MP4_ReadBox_data, MP4_FreeBox_data },
/* found in smoothstreaming */
{ ATOM_traf, MP4_ReadBoxContainer, MP4_FreeBox_Common },
}
/* Now search function to call */
- if( p_box->data.p_data )
+ if( p_box->data.p_payload )
{
for( i_index = 0; ; i_index++ )
{
{
MP4_Box_Function[i_index].MP4_FreeBox_function( p_box );
}
- free( p_box->data.p_data );
+ free( p_box->data.p_payload );
}
free( p_box );
}
return NULL;
}
-#define MAX_SKIP 8
MP4_Box_t *MP4_BoxGetNextChunk( stream_t *s )
{
/* p_chunk is a virtual root container for the moof and mdat boxes */
MP4_Box_t *p_chunk;
- MP4_Box_t *p_moof = NULL;
- MP4_Box_t *p_sidx = NULL;
MP4_Box_t *p_tmp_box = NULL;
p_tmp_box = calloc( 1, sizeof( MP4_Box_t ) );
if( (p_tmp_box->i_type == ATOM_uuid && !CmpUUID( &p_tmp_box->i_uuid, &SmooBoxUUID )) )
{
+ free( p_tmp_box );
return MP4_BoxGetSmooBox( s );
}
else if( p_tmp_box->i_type == ATOM_ftyp )
{
+ free( p_tmp_box );
return MP4_BoxGetRoot( s );
}
free( p_tmp_box );
p_chunk->i_type = ATOM_root;
p_chunk->i_shortsize = 1;
- /* there may be some boxes before moof,
- * we skip them (but sidx) for now, but put a reasonable limit */
- for( int i = 0 ; i < MAX_SKIP; i++ )
- {
- p_moof = MP4_ReadBox( s, p_chunk );
- if( !p_moof )
- goto error;
- if( p_moof->i_type != ATOM_moof )
- {
- if( i == MAX_SKIP - 1 )
- {
- MP4_BoxFree( s, p_moof );
- goto error;
- }
- if( p_moof->i_type != ATOM_sidx )
- {
- MP4_BoxFree( s, p_moof );
- stream_Read( s, NULL, p_moof->i_size );
- }
- else
- p_sidx = p_moof;
- }
- else
- break;
- }
-
- p_chunk->p_first = p_moof;
- p_chunk->p_last = p_moof;
-
- if( p_sidx )
- {
- p_chunk->p_first = p_sidx;
- p_sidx->p_next = p_moof;
- }
+ MP4_ReadBoxContainerChildren( s, p_chunk, ATOM_moof );
return p_chunk;
-
-error:
- free( p_chunk );
- return NULL;
}
-#undef MAX_SKIP
-
/*****************************************************************************
* MP4_BoxGetRoot : Parse the entire file, and create all boxes in memory
*****************************************************************************
p_root->i_size = 0;
CreateUUID( &p_root->i_uuid, p_root->i_type );
- p_root->data.p_data = NULL;
+ p_root->data.p_payload = NULL;
p_root->p_father = NULL;
p_root->p_first = NULL;
p_root->p_last = NULL;
return p_root;
p_root->i_size = stream_Size( s );
- /* Get the rest of the file */
- i_result = MP4_ReadBoxContainerRaw( p_stream, p_root );
+ if( stream_Tell( s ) + 8 < stream_Size( s ) )
+ {
+ /* Get the rest of the file */
+ i_result = MP4_ReadBoxContainerRaw( p_stream, p_root );
- if( !i_result )
- goto error;
+ if( !i_result )
+ goto error;
+ }
MP4_Box_t *p_moov;
MP4_Box_t *p_cmov;
error:
free( p_root );
+ stream_Seek( p_stream, 0 );
return NULL;
}
}
if( MP4_BOX_TYPE_ASCII() )
snprintf( &str[i_level * 4], sizeof(str) - 4*i_level,
- "+ %4.4s size %d",
- (char*)&p_box->i_type, (uint32_t)p_box->i_size );
+ "+ %4.4s size %"PRIu64" offset %ld",
+ (char*)&p_box->i_type, p_box->i_size, p_box->i_pos );
else
snprintf( &str[i_level * 4], sizeof(str) - 4*i_level,
- "+ c%3.3s size %d",
- (char*)&p_box->i_type+1, (uint32_t)p_box->i_size );
+ "+ c%3.3s size %"PRIu64" offset %ld",
+ (char*)&p_box->i_type+1, p_box->i_size, p_box->i_pos );
msg_Dbg( s, "%s", str );
}
p_child = p_box->p_first;
projects / vlc / blobdiff