X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fmp4%2Fmp4.c;h=22a708e83c8acfe37c492b0e98953f779c2dacee;hb=314cd3825c7b20f77bab5fcc9909a7e700d88d3f;hp=a55170b0f444ca2bce1eccf399ed4c597c5e042d;hpb=58766eae93336caaf0113e76900900a7a274bd05;p=vlc diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c index a55170b0f4..22a708e83c 100644 --- a/modules/demux/mp4/mp4.c +++ b/modules/demux/mp4/mp4.c @@ -42,23 +42,20 @@ #include "libmp4.h" #include "drms.h" -#ifdef UNDER_CE -#define uint64_t int64_t -#endif - /***************************************************************************** * Module descriptor *****************************************************************************/ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_description( N_("MP4 stream demuxer") ); - set_capability( "demux", 242 ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_description( N_("MP4 stream demuxer") ) + set_shortname( N_("MP4") ) + set_capability( "demux", 242 ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Local prototypes @@ -76,11 +73,12 @@ typedef struct uint32_t i_sample_count; /* how many samples in this chunk */ uint32_t i_sample_first; /* index of the first sample in this chunk */ - /* now provide way to calculate pts, dts, and offset without to - much memory and with fast acces */ + /* now provide way to calculate pts, dts, and offset without too + much memory and with fast access */ /* with this we can calculate dts/pts without waste memory */ - uint64_t i_first_dts; + uint64_t i_first_dts; /* DTS of the first sample */ + uint64_t i_last_dts; /* DTS of the last sample */ uint32_t *p_sample_count_dts; uint32_t *p_sample_delta_dts; /* dts delta */ @@ -102,6 +100,8 @@ typedef struct bool b_selected; /* is the trak being played */ bool b_chapter; /* True when used for chapter only */ + bool b_mac_encoding; + es_format_t fmt; es_out_id_t *p_es; @@ -139,6 +139,7 @@ typedef struct bool b_drms; void *p_drms; + MP4_Box_t *p_skcr; } mp4_track_t; @@ -155,6 +156,7 @@ struct demux_sys_t uint64_t i_duration; /* movie duration */ unsigned int i_tracks; /* number of tracks */ mp4_track_t *track; /* array of track */ + float f_fps; /* number of frame per seconds */ /* */ MP4_Box_t *p_tref_chap; @@ -166,8 +168,8 @@ struct demux_sys_t /***************************************************************************** * Declaration of local function *****************************************************************************/ -static void MP4_TrackCreate ( demux_t *, mp4_track_t *, MP4_Box_t *); -static void MP4_TrackDestroy( demux_t *, mp4_track_t * ); +static void MP4_TrackCreate ( demux_t *, mp4_track_t *, MP4_Box_t *, bool b_force_enable ); +static void MP4_TrackDestroy( mp4_track_t * ); static int MP4_TrackSelect ( demux_t *, mp4_track_t *, mtime_t ); static void MP4_TrackUnselect(demux_t *, mp4_track_t * ); @@ -180,6 +182,7 @@ static int MP4_TrackNextSample( demux_t *, mp4_track_t * ); static void MP4_TrackSetELST( demux_t *, mp4_track_t *, int64_t ); static void MP4_UpdateSeekpoint( demux_t * ); +static const char *MP4_ConvertMacCode( uint16_t ); /* Return time in s of a track */ static inline int64_t MP4_TrackGetDTS( demux_t *p_demux, mp4_track_t *p_track ) @@ -202,7 +205,6 @@ static inline int64_t MP4_TrackGetDTS( demux_t *p_demux, mp4_track_t *p_track ) else { i_dts += i_sample * chunk.p_sample_delta_dts[i_index]; - i_sample = 0; break; } } @@ -233,7 +235,7 @@ static inline int64_t MP4_TrackGetDTS( demux_t *p_demux, mp4_track_t *p_track ) return INT64_C(1000000) * i_dts / p_track->i_timescale; } -static inline int64_t MP4_TrackGetPTSDelta( demux_t *p_demux, mp4_track_t *p_track ) +static inline int64_t MP4_TrackGetPTSDelta( mp4_track_t *p_track ) { mp4_chunk_t *ck = &p_track->chunk[p_track->i_chunk]; unsigned int i_index = 0; @@ -276,6 +278,7 @@ static int Open( vlc_object_t * p_this ) unsigned int i; bool b_seekable; + bool b_enabled_es; /* A little test to see if it could be a mp4 */ if( stream_Peek( p_demux->s, &p_peek, 8 ) < 8 ) return VLC_EGENERIC; @@ -310,8 +313,7 @@ static int Open( vlc_object_t * p_this ) p_demux->pf_control = Control; /* create our structure that will contains all data */ - p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) ); - memset( p_sys, 0, sizeof( demux_sys_t ) ); + p_demux->p_sys = p_sys = calloc( 1, sizeof( demux_sys_t ) ); /* Now load all boxes ( except raw data ) */ if( ( p_sys->p_root = MP4_BoxGetRoot( p_demux->s ) ) == NULL ) @@ -364,9 +366,10 @@ static int Open( vlc_object_t * p_this ) msg_Dbg( p_demux, "detected playlist mov file (%d ref)", i_count ); - input_thread_t * p_input = vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT ); - input_item_t * p_current = input_GetItem( p_input ); - p_current->i_type = ITEM_TYPE_PLAYLIST; + input_thread_t *p_input = demux_GetParentInput( p_demux ); + input_item_t *p_current = input_GetItem( p_input ); + + input_item_node_t *p_subitems = input_item_node_Create( p_current ); for( i = 0; i < i_count; i++ ) { @@ -403,19 +406,23 @@ static int Open( vlc_object_t * p_this ) if( end ) end[1] = '\0'; else *psz_path = '\0'; - asprintf( &psz_absolute, "%s://%s%s", - p_demux->psz_access, psz_path, psz_ref ); + if( asprintf( &psz_absolute, "%s://%s%s", + p_demux->psz_access, psz_path, psz_ref ) < 0 ) + { + free( psz_ref ); + free( psz_path ); + vlc_object_release( p_input) ; + return VLC_ENOMEM; + } free( psz_ref ); psz_ref = psz_absolute; free( psz_path ); } - input_item_t *p_input; msg_Dbg( p_demux, "adding ref = `%s'", psz_ref ); - p_input = input_ItemNewExt( p_demux, psz_ref, NULL, - 0, NULL, -1 ); - input_ItemCopyOptions( p_current, p_input ); - input_ItemAddSubItem( p_current, p_input ); + input_item_t *p_input = input_item_New( p_demux, psz_ref, NULL ); + input_item_CopyOptions( p_current, p_input ); + input_item_node_AppendItem( p_subitems, p_input ); vlc_gc_decref( p_input ); } else @@ -425,6 +432,7 @@ static int Open( vlc_object_t * p_this ) } free( psz_ref ); } + input_item_node_PostAndDelete( p_subitems ); vlc_object_release( p_input ); } @@ -468,24 +476,29 @@ static int Open( vlc_object_t * p_this ) goto error; memset( p_sys->track, 0, p_sys->i_tracks * sizeof( mp4_track_t ) ); - /* Search the first chap reference (like quicktime) */ + /* Search the first chap reference (like quicktime) and + * check that at least 1 stream is enabled */ p_sys->p_tref_chap = NULL; + b_enabled_es = false; for( i = 0; i < p_sys->i_tracks; i++ ) { MP4_Box_t *p_trak = MP4_BoxGet( p_sys->p_root, "/moov/trak[%d]", i ); - MP4_Box_t *p_chap = MP4_BoxGet( p_trak, "tref/chap", i ); - if( !p_chap || p_chap->data.p_tref_generic->i_entry_count <= 0 ) - continue; - p_sys->p_tref_chap = p_chap; - break; + + MP4_Box_t *p_tkhd = MP4_BoxGet( p_trak, "tkhd" ); + if( p_tkhd && (p_tkhd->data.p_tkhd->i_flags&MP4_TRACK_ENABLED) ) + b_enabled_es = true; + + MP4_Box_t *p_chap = MP4_BoxGet( p_trak, "tref/chap", i ); + if( p_chap && p_chap->data.p_tref_generic->i_entry_count > 0 && !p_sys->p_tref_chap ) + p_sys->p_tref_chap = p_chap; } /* now process each track and extract all usefull information */ for( i = 0; i < p_sys->i_tracks; i++ ) { p_trak = MP4_BoxGet( p_sys->p_root, "/moov/trak[%d]", i ); - MP4_TrackCreate( p_demux, &p_sys->track[i], p_trak ); + MP4_TrackCreate( p_demux, &p_sys->track[i], p_trak, !b_enabled_es ); if( p_sys->track[i].b_ok && !p_sys->track[i].b_chapter ) { @@ -605,7 +618,7 @@ static int Demux( demux_t *p_demux ) MP4_UpdateSeekpoint( p_demux ); /* first wait for the good time to read a packet */ - es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pcr + 1 ); + es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_sys->i_pcr ); p_sys->i_pcr = MP4_GetMoviePTS( p_sys ); @@ -653,8 +666,24 @@ static int Demux( demux_t *p_demux ) if( tk->b_drms && tk->p_drms ) { - drms_decrypt( tk->p_drms, (uint32_t*)p_block->p_buffer, - p_block->i_buffer ); + if( tk->p_skcr ) + { + uint32_t p_key[4]; + drms_get_p_key( tk->p_drms, p_key ); + + for( size_t i_pos = tk->p_skcr->data.p_skcr->i_init; i_pos < p_block->i_buffer; ) + { + int n = __MIN( tk->p_skcr->data.p_skcr->i_encr, p_block->i_buffer - i_pos ); + drms_decrypt( tk->p_drms, (uint32_t*)&p_block->p_buffer[i_pos], n, p_key ); + i_pos += n; + i_pos += __MIN( tk->p_skcr->data.p_skcr->i_decr, p_block->i_buffer - i_pos ); + } + } + else + { + drms_decrypt( tk->p_drms, (uint32_t*)p_block->p_buffer, + p_block->i_buffer, NULL ); + } } else if( tk->fmt.i_cat == SPU_ES ) { @@ -686,15 +715,15 @@ static int Demux( demux_t *p_demux ) } } /* dts */ - p_block->i_dts = MP4_TrackGetDTS( p_demux, tk ) + 1; + p_block->i_dts = VLC_TS_0 + MP4_TrackGetDTS( p_demux, tk ); /* pts */ - i_delta = MP4_TrackGetPTSDelta( p_demux, tk ); + i_delta = MP4_TrackGetPTSDelta( tk ); if( i_delta != -1 ) p_block->i_pts = p_block->i_dts + i_delta; else if( tk->fmt.i_cat != VIDEO_ES ) p_block->i_pts = p_block->i_dts; else - p_block->i_pts = 0; + p_block->i_pts = VLC_TS_INVALID; if( !tk->b_drms || ( tk->b_drms && tk->p_drms ) ) es_out_Send( p_demux->out, tk->p_es, p_block ); @@ -731,7 +760,7 @@ static void MP4_UpdateSeekpoint( demux_t *p_demux ) } } /***************************************************************************** - * Seek: Got to i_date + * Seek: Go to i_date ******************************************************************************/ static int Seek( demux_t *p_demux, mtime_t i_date ) { @@ -749,6 +778,9 @@ static int Seek( demux_t *p_demux, mtime_t i_date ) MP4_TrackSeek( p_demux, tk, i_date ); } MP4_UpdateSeekpoint( p_demux ); + + es_out_Control( p_demux->out, ES_OUT_SET_NEXT_DISPLAY_TIME, i_date ); + return VLC_SUCCESS; } @@ -814,8 +846,9 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) return VLC_SUCCESS; case DEMUX_GET_FPS: - msg_Warn( p_demux, "DEMUX_GET_FPS unimplemented !!" ); - return VLC_EGENERIC; + pf = (double*)va_arg( args, double* ); + *pf = p_sys->f_fps; + return VLC_SUCCESS; case DEMUX_GET_META: { @@ -875,7 +908,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) break; case FOURCC_0xa9trk: /* Track */ - SET( vlc_meta_SetTracknum ); + SET( vlc_meta_SetTrackNum ); break; case FOURCC_0xa9cmt: /* Commment */ @@ -974,7 +1007,7 @@ static void Close ( vlc_object_t * p_this ) MP4_BoxFree( p_demux->s, p_sys->p_root ); for( i_track = 0; i_track < p_sys->i_tracks; i_track++ ) { - MP4_TrackDestroy( p_demux, &p_sys->track[i_track] ); + MP4_TrackDestroy( &p_sys->track[i_track] ); } FREENULL( p_sys->track ); @@ -1013,7 +1046,7 @@ static void LoadChapterApple( demux_t *p_demux, mp4_track_t *tk ) for( tk->i_sample = 0; tk->i_sample < tk->i_sample_count; tk->i_sample++ ) { const int64_t i_dts = MP4_TrackGetDTS( p_demux, tk ); - const int64_t i_pts_delta = MP4_TrackGetPTSDelta( p_demux, tk ); + const int64_t i_pts_delta = MP4_TrackGetPTSDelta( tk ); const unsigned int i_size = MP4_TrackSampleSize( tk ); if( i_size > 0 && !stream_Seek( p_demux->s, MP4_TrackGetPos( tk ) ) ) @@ -1067,7 +1100,7 @@ static void LoadChapter( demux_t *p_demux ) } if( j < p_sys->i_tracks ) { - LoadChapterApple( p_demux, &p_sys->track[i] ); + LoadChapterApple( p_demux, &p_sys->track[j] ); break; } } @@ -1176,7 +1209,7 @@ static int TrackCreateSamplesIndex( demux_t *p_demux, int64_t i_index; int64_t i_index_sample_used; - int64_t i_last_dts; + int64_t i_next_dts; /* Find stsz * Gives the sample size for each samples. There is also a stz2 table @@ -1231,15 +1264,16 @@ static int TrackCreateSamplesIndex( demux_t *p_demux, * for fast research (problem with raw stream where a sample is sometime * just channels*bits_per_sample/8 */ - i_last_dts = 0; + i_next_dts = 0; i_index = 0; i_index_sample_used = 0; for( i_chunk = 0; i_chunk < p_demux_track->i_chunk_count; i_chunk++ ) { mp4_chunk_t *ck = &p_demux_track->chunk[i_chunk]; int64_t i_entry, i_sample_count, i; - /* save last dts */ - ck->i_first_dts = i_last_dts; + /* save first dts */ + ck->i_first_dts = i_next_dts; + ck->i_last_dts = i_next_dts; /* count how many entries are needed for this chunk * for p_sample_delta_dts and p_sample_count_dts */ @@ -1260,6 +1294,9 @@ static int TrackCreateSamplesIndex( demux_t *p_demux, ck->p_sample_count_dts = calloc( i_entry, sizeof( uint32_t ) ); ck->p_sample_delta_dts = calloc( i_entry, sizeof( uint32_t ) ); + if( !ck->p_sample_count_dts || !ck->p_sample_delta_dts ) + return VLC_ENOMEM; + /* now copy */ i_sample_count = ck->i_sample_count; for( i = 0; i < i_entry; i++ ) @@ -1273,11 +1310,12 @@ static int TrackCreateSamplesIndex( demux_t *p_demux, i_index_sample_used += i_used; i_sample_count -= i_used; + i_next_dts += i_used * stts->i_sample_delta[i_index]; ck->p_sample_count_dts[i] = i_used; ck->p_sample_delta_dts[i] = stts->i_sample_delta[i_index]; - - i_last_dts += i_used * ck->p_sample_delta_dts[i]; + if( i_used > 0 ) + ck->i_last_dts = i_next_dts - ck->p_sample_delta_dts[i]; if( i_index_sample_used >= stts->i_sample_count[i_index] ) { @@ -1323,6 +1361,8 @@ static int TrackCreateSamplesIndex( demux_t *p_demux, /* allocate them */ ck->p_sample_count_pts = calloc( i_entry, sizeof( uint32_t ) ); ck->p_sample_offset_pts = calloc( i_entry, sizeof( int32_t ) ); + if( !ck->p_sample_count_pts || !ck->p_sample_offset_pts ) + return VLC_ENOMEM; /* now copy */ i_sample_count = ck->i_sample_count; @@ -1353,11 +1393,53 @@ static int TrackCreateSamplesIndex( demux_t *p_demux, msg_Dbg( p_demux, "track[Id 0x%x] read %d samples length:%"PRId64"s", p_demux_track->i_track_ID, p_demux_track->i_sample_count, - i_last_dts / p_demux_track->i_timescale ); + i_next_dts / p_demux_track->i_timescale ); return VLC_SUCCESS; } +/** + * It computes the sample rate for a video track using the given sample + * description index + */ +static void TrackGetESSampleRate( unsigned *pi_num, unsigned *pi_den, + const mp4_track_t *p_track, + unsigned i_sd_index, + unsigned i_chunk ) +{ + *pi_num = 0; + *pi_den = 0; + + if( p_track->i_chunk_count <= 0 ) + return; + + /* */ + const mp4_chunk_t *p_chunk = &p_track->chunk[i_chunk]; + while( p_chunk > &p_track->chunk[0] && + p_chunk[-1].i_sample_description_index == i_sd_index ) + { + p_chunk--; + } + + uint64_t i_sample = 0; + uint64_t i_first_dts = p_chunk->i_first_dts; + uint64_t i_last_dts; + do + { + i_sample += p_chunk->i_sample_count; + i_last_dts = p_chunk->i_last_dts; + p_chunk++; + } + while( p_chunk < &p_track->chunk[p_track->i_chunk_count] && + p_chunk->i_sample_description_index == i_sd_index ); + + if( i_sample > 1 && i_first_dts < i_last_dts ) + vlc_ureduce( pi_num, pi_den, + ( i_sample - 1) * p_track->i_timescale, + i_last_dts - i_first_dts, + UINT16_MAX); +} + /* * TrackCreateES: * Create ES and PES to init decoder if needed, for a track starting at i_chunk @@ -1365,14 +1447,17 @@ static int TrackCreateSamplesIndex( demux_t *p_demux, static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, unsigned int i_chunk, es_out_id_t **pp_es ) { + const unsigned i_sample_description_index = + p_track->chunk[i_chunk].i_sample_description_index; MP4_Box_t *p_sample; MP4_Box_t *p_esds; - MP4_Box_t *p_box; + MP4_Box_t *p_frma; + MP4_Box_t *p_enda; if( pp_es ) *pp_es = NULL; - if( !p_track->chunk[i_chunk].i_sample_description_index ) + if( !i_sample_description_index ) { msg_Warn( p_demux, "invalid SampleEntry index (track[Id 0x%x])", p_track->i_track_ID ); @@ -1380,7 +1465,7 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, } p_sample = MP4_BoxGet( p_track->p_stsd, "[%d]", - p_track->chunk[i_chunk].i_sample_description_index - 1 ); + i_sample_description_index - 1 ); if( !p_sample || ( !p_sample->data.p_data && p_track->fmt.i_cat != SPU_ES ) ) @@ -1392,6 +1477,17 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, p_track->p_sample = p_sample; + if( ( p_frma = MP4_BoxGet( p_track->p_sample, "sinf/frma" ) ) ) + { + msg_Warn( p_demux, "Original Format Box: %4.4s", (char *)&p_frma->data.p_frma->i_type ); + + p_sample->i_type = p_frma->data.p_frma->i_type; + } + + p_enda = MP4_BoxGet( p_sample, "wave/enda" ); + if( !p_enda ) + p_enda = MP4_BoxGet( p_sample, "enda" ); + if( p_track->fmt.i_cat == AUDIO_ES && ( p_track->i_sample_size == 1 || p_track->i_sample_size == 2 ) ) { MP4_Box_data_sample_soun_t *p_soun; @@ -1444,14 +1540,126 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, p_soun->i_qt_version = 0; } } + else if( p_track->fmt.i_cat == AUDIO_ES && p_sample->data.p_sample_soun->i_qt_version == 1 ) + { + MP4_Box_data_sample_soun_t *p_soun = p_sample->data.p_sample_soun; + + switch( p_sample->i_type ) + { + case( VLC_FOURCC( '.', 'm', 'p', '3' ) ): + case( VLC_FOURCC( 'm', 's', 0x00, 0x55 ) ): + { + if( p_track->i_sample_size > 1 ) + p_soun->i_qt_version = 0; + break; + } + case( VLC_FOURCC( 'a', 'c', '-', '3' ) ): + case( VLC_FOURCC( 'e', 'c', '-', '3' ) ): + case( VLC_FOURCC( 'm', 's', 0x20, 0x00 ) ): + p_soun->i_qt_version = 0; + break; + default: + break; + } + } + + /* */ + switch( p_track->fmt.i_cat ) + { + case VIDEO_ES: + p_track->fmt.video.i_width = p_sample->data.p_sample_vide->i_width; + p_track->fmt.video.i_height = p_sample->data.p_sample_vide->i_height; + p_track->fmt.video.i_bits_per_pixel = + p_sample->data.p_sample_vide->i_depth; + + /* fall on display size */ + if( p_track->fmt.video.i_width <= 0 ) + p_track->fmt.video.i_width = p_track->i_width; + if( p_track->fmt.video.i_height <= 0 ) + p_track->fmt.video.i_height = p_track->i_height; + + /* Find out apect ratio from display size */ + if( p_track->i_width > 0 && p_track->i_height > 0 && + /* Work-around buggy muxed files */ + p_sample->data.p_sample_vide->i_width != p_track->i_width ) + { + p_track->fmt.video.i_sar_num = p_track->i_width * p_track->fmt.video.i_height; + p_track->fmt.video.i_sar_den = p_track->i_height * p_track->fmt.video.i_width; + } + + /* Support for cropping (eg. in H263 files) */ + p_track->fmt.video.i_visible_width = p_track->fmt.video.i_width; + p_track->fmt.video.i_visible_height = p_track->fmt.video.i_height; + + /* Frame rate */ + TrackGetESSampleRate( &p_track->fmt.video.i_frame_rate, + &p_track->fmt.video.i_frame_rate_base, + p_track, i_sample_description_index, i_chunk ); + p_demux->p_sys->f_fps = (float)p_track->fmt.video.i_frame_rate / + (float)p_track->fmt.video.i_frame_rate_base; + break; + + case AUDIO_ES: + p_track->fmt.audio.i_channels = + p_sample->data.p_sample_soun->i_channelcount; + p_track->fmt.audio.i_rate = + p_sample->data.p_sample_soun->i_sampleratehi; + p_track->fmt.i_bitrate = p_sample->data.p_sample_soun->i_channelcount * + p_sample->data.p_sample_soun->i_sampleratehi * + p_sample->data.p_sample_soun->i_samplesize; + p_track->fmt.audio.i_bitspersample = + p_sample->data.p_sample_soun->i_samplesize; + + if( p_track->i_sample_size != 0 && + p_sample->data.p_sample_soun->i_qt_version == 1 && p_sample->data.p_sample_soun->i_sample_per_packet <= 0 ) + { + msg_Err( p_demux, "Invalid sample per packet value for qt_version 1" ); + return VLC_EGENERIC; + } + break; + + default: + break; + } + /* It's a little ugly but .. there are special cases */ switch( p_sample->i_type ) { case( VLC_FOURCC( '.', 'm', 'p', '3' ) ): case( VLC_FOURCC( 'm', 's', 0x00, 0x55 ) ): + { p_track->fmt.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'a' ); break; + } + case( VLC_FOURCC( 'a', 'c', '-', '3' ) ): + { + MP4_Box_t *p_dac3_box = MP4_BoxGet( p_sample, "dac3", 0 ); + + p_track->fmt.i_codec = VLC_FOURCC( 'a', '5', '2', ' ' ); + if( p_dac3_box ) + { + static const int pi_bitrate[] = { + 32, 40, 48, 56, + 64, 80, 96, 112, + 128, 160, 192, 224, + 256, 320, 384, 448, + 512, 576, 640, + }; + MP4_Box_data_dac3_t *p_dac3 = p_dac3_box->data.p_dac3; + p_track->fmt.audio.i_channels = 0; + p_track->fmt.i_bitrate = 0; + if( p_dac3->i_bitrate_code < sizeof(pi_bitrate)/sizeof(*pi_bitrate) ) + p_track->fmt.i_bitrate = pi_bitrate[p_dac3->i_bitrate_code] * 1000; + p_track->fmt.audio.i_bitspersample = 0; + } + break; + } + case( VLC_FOURCC( 'e', 'c', '-', '3' ) ): + { + p_track->fmt.i_codec = VLC_FOURCC( 'e', 'a', 'c', '3' ); + break; + } case( VLC_FOURCC( 'r', 'a', 'w', ' ' ) ): case( VLC_FOURCC( 'N', 'O', 'N', 'E' ) ): @@ -1491,7 +1699,10 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, p_track->fmt.i_codec = VLC_FOURCC( 's', 'u', 'b', 't' ); /* FIXME: Not true, could be UTF-16 with a Byte Order Mark (0xfeff) */ /* FIXME UTF-8 doesn't work here ? */ - p_track->fmt.subs.psz_encoding = strdup( "UTF-8" ); + if( p_track->b_mac_encoding ) + p_track->fmt.subs.psz_encoding = strdup( "MAC" ); + else + p_track->fmt.subs.psz_encoding = strdup( "UTF-8" ); break; case VLC_FOURCC('y','v','1','2'): @@ -1502,14 +1713,16 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, break; case VLC_FOURCC('i','n','2','4'): - /* in in24/in32 there's enda-atom to tell it's little-endian (if present) */ - if( ( MP4_BoxGet( p_sample, "wave/enda" ) ) || - ( MP4_BoxGet( p_sample, "enda" ) ) ) - { - p_track->fmt.i_codec = VLC_FOURCC('4','2','n','i'); - } else { - p_track->fmt.i_codec = p_sample->i_type; - } + p_track->fmt.i_codec = p_enda && p_enda->data.p_enda->i_little_endian == 1 ? + VLC_FOURCC('4','2','n','i') : VLC_FOURCC('i','n','2','4'); + break; + case VLC_FOURCC('f','l','3','2'): + p_track->fmt.i_codec = p_enda && p_enda->data.p_enda->i_little_endian == 1 ? + VLC_CODEC_F32L : VLC_CODEC_F32B; + break; + case VLC_FOURCC('f','l','6','4'): + p_track->fmt.i_codec = p_enda && p_enda->data.p_enda->i_little_endian == 1 ? + VLC_CODEC_F64L : VLC_CODEC_F64B; break; default: @@ -1533,6 +1746,12 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, break; case( 0x40): p_track->fmt.i_codec = VLC_FOURCC( 'm','p','4','a' ); + if( p_decconfig->i_decoder_specific_info_len >= 2 && + p_decconfig->p_decoder_specific_info[0] == 0xF8 && + (p_decconfig->p_decoder_specific_info[1]&0xE0) == 0x80 ) + { + p_track->fmt.i_codec = VLC_CODEC_ALS; + } break; case( 0x60): case( 0x61): @@ -1561,6 +1780,15 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, case( 0x6c ): /* jpeg */ p_track->fmt.i_codec = VLC_FOURCC( 'j','p','e','g' ); break; + case( 0x6d ): /* png */ + p_track->fmt.i_codec = VLC_FOURCC( 'p','n','g',' ' ); + break; + case( 0x6e ): /* jpeg200 */ + p_track->fmt.i_codec = VLC_FOURCC( 'M','J','2','C' ); + break; + case( 0xa3 ): /* vc1 */ + p_track->fmt.i_codec = VLC_FOURCC( 'W','V','C','1' ); + break; /* Private ID */ case( 0xe0 ): /* NeroDigital: dvd subs */ @@ -1573,6 +1801,13 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, p_track->fmt.subs.spu.i_original_frame_height = p_track->i_height; break; } + case( 0xe1 ): /* QCelp for 3gp */ + if( p_track->fmt.i_cat == AUDIO_ES ) + { + p_track->fmt.i_codec = VLC_FOURCC( 'Q','c','l','p' ); + } + break; + /* Fallback */ default: /* Unknown entry, but don't touch i_fourcc */ @@ -1627,7 +1862,6 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, break; case VLC_FOURCC( 'Q', 'D', 'M', 'C' ): case VLC_FOURCC( 'Q', 'D', 'M', '2' ): - case VLC_FOURCC( 'Q', 'c', 'l', 'p' ): case VLC_FOURCC( 's', 'a', 'm', 'r' ): case VLC_FOURCC( 'a', 'l', 'a', 'c' ): p_track->fmt.i_extra = @@ -1649,9 +1883,12 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, if( p_avcC ) { p_track->fmt.i_extra = p_avcC->data.p_avcC->i_avcC; - p_track->fmt.p_extra = malloc( p_avcC->data.p_avcC->i_avcC ); - memcpy( p_track->fmt.p_extra, p_avcC->data.p_avcC->p_avcC, - p_track->fmt.i_extra ); + if( p_track->fmt.i_extra > 0 ) + { + p_track->fmt.p_extra = malloc( p_avcC->data.p_avcC->i_avcC ); + memcpy( p_track->fmt.p_extra, p_avcC->data.p_avcC->p_avcC, + p_track->fmt.i_extra ); + } } else { @@ -1660,6 +1897,12 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, break; } + case VLC_FOURCC('m','s',0x00,0x02): + case VLC_FOURCC('m','s',0x00,0x11): + case VLC_FOURCC('Q','c','l','p'): + p_track->fmt.audio.i_blockalign = p_sample->data.p_sample_soun->i_bytes_per_frame; + break; + default: break; } @@ -1667,62 +1910,6 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, #undef p_decconfig - /* some last initialisation */ - switch( p_track->fmt.i_cat ) - { - case( VIDEO_ES ): - p_track->fmt.video.i_width = p_sample->data.p_sample_vide->i_width; - p_track->fmt.video.i_height = p_sample->data.p_sample_vide->i_height; - p_track->fmt.video.i_bits_per_pixel = - p_sample->data.p_sample_vide->i_depth; - - /* fall on display size */ - if( p_track->fmt.video.i_width <= 0 ) - p_track->fmt.video.i_width = p_track->i_width; - if( p_track->fmt.video.i_height <= 0 ) - p_track->fmt.video.i_height = p_track->i_height; - - /* Find out apect ratio from display size */ - if( p_track->i_width > 0 && p_track->i_height > 0 && - /* Work-around buggy muxed files */ - p_sample->data.p_sample_vide->i_width != p_track->i_width ) - p_track->fmt.video.i_aspect = - VOUT_ASPECT_FACTOR * p_track->i_width / p_track->i_height; - - /* Support for cropping (eg. in H263 files) */ - p_track->fmt.video.i_visible_width = p_track->fmt.video.i_width; - p_track->fmt.video.i_visible_height = p_track->fmt.video.i_height; - - /* Frame rate */ - p_track->fmt.video.i_frame_rate = p_track->i_timescale; - p_track->fmt.video.i_frame_rate_base = 1; - - if( p_track->fmt.video.i_frame_rate && - (p_box = MP4_BoxGet( p_track->p_stbl, "stts" )) && - p_box->data.p_stts->i_entry_count >= 1 ) - { - p_track->fmt.video.i_frame_rate_base = - p_box->data.p_stts->i_sample_delta[0]; - } - - break; - - case( AUDIO_ES ): - p_track->fmt.audio.i_channels = - p_sample->data.p_sample_soun->i_channelcount; - p_track->fmt.audio.i_rate = - p_sample->data.p_sample_soun->i_sampleratehi; - p_track->fmt.i_bitrate = p_sample->data.p_sample_soun->i_channelcount * - p_sample->data.p_sample_soun->i_sampleratehi * - p_sample->data.p_sample_soun->i_samplesize; - p_track->fmt.audio.i_bitspersample = - p_sample->data.p_sample_soun->i_samplesize; - break; - - default: - break; - } - if( pp_es ) *pp_es = es_out_Add( p_demux->out, &p_track->fmt ); @@ -1737,7 +1924,7 @@ static int TrackTimeToSampleChunk( demux_t *p_demux, mp4_track_t *p_track, uint32_t *pi_sample ) { demux_sys_t *p_sys = p_demux->p_sys; - MP4_Box_t *p_stss; + MP4_Box_t *p_box_stss; uint64_t i_dts; unsigned int i_sample; unsigned int i_chunk; @@ -1842,43 +2029,34 @@ static int TrackTimeToSampleChunk( demux_t *p_demux, mp4_track_t *p_track, /* *** Try to find nearest sync points *** */ - if( ( p_stss = MP4_BoxGet( p_track->p_stbl, "stss" ) ) ) + if( ( p_box_stss = MP4_BoxGet( p_track->p_stbl, "stss" ) ) ) { - unsigned int i_index; - msg_Dbg( p_demux, - "track[Id 0x%x] using Sync Sample Box (stss)", - p_track->i_track_ID ); - for( i_index = 0; i_index < p_stss->data.p_stss->i_entry_count; i_index++ ) + MP4_Box_data_stss_t *p_stss = p_box_stss->data.p_stss; + msg_Dbg( p_demux, "track[Id 0x%x] using Sync Sample Box (stss)", + p_track->i_track_ID ); + for( unsigned i_index = 0; i_index < p_stss->i_entry_count; i_index++ ) { - if( p_stss->data.p_stss->i_sample_number[i_index] >= i_sample ) + if( i_index >= p_stss->i_entry_count - 1 || + i_sample < p_stss->i_sample_number[i_index+1] ) { - if( i_index > 0 ) + unsigned i_sync_sample = p_stss->i_sample_number[i_index]; + msg_Dbg( p_demux, "stts gives %d --> %d (sample number)", + i_sample, i_sync_sample ); + + if( i_sync_sample <= i_sample ) { - msg_Dbg( p_demux, "stts gives %d --> %d (sample number)", - i_sample, - p_stss->data.p_stss->i_sample_number[i_index-1] ); - i_sample = p_stss->data.p_stss->i_sample_number[i_index-1]; - /* new i_sample is less than old so i_chunk can only decreased */ while( i_chunk > 0 && - i_sample < p_track->chunk[i_chunk].i_sample_first ) - { + i_sync_sample < p_track->chunk[i_chunk].i_sample_first ) i_chunk--; - } } else { - msg_Dbg( p_demux, "stts gives %d --> %d (sample number)", - i_sample, - p_stss->data.p_stss->i_sample_number[i_index] ); - i_sample = p_stss->data.p_stss->i_sample_number[i_index]; - /* new i_sample is more than old so i_chunk can only increased */ while( i_chunk < p_track->i_chunk_count - 1 && - i_sample >= p_track->chunk[i_chunk].i_sample_first + - p_track->chunk[i_chunk].i_sample_count ) - { + i_sync_sample >= p_track->chunk[i_chunk].i_sample_first + + p_track->chunk[i_chunk].i_sample_count ) i_chunk++; - } } + i_sample = i_sync_sample; break; } } @@ -1901,9 +2079,9 @@ static int TrackGotoChunkSample( demux_t *p_demux, mp4_track_t *p_track, bool b_reselect = false; /* now see if actual es is ok */ - if( (p_track->i_chunk >= p_track->i_chunk_count - 1) || - (p_track->chunk[p_track->i_chunk].i_sample_description_index != - p_track->chunk[i_chunk].i_sample_description_index) ) + if( p_track->i_chunk >= p_track->i_chunk_count || + p_track->chunk[p_track->i_chunk].i_sample_description_index != + p_track->chunk[i_chunk].i_sample_description_index ) { msg_Warn( p_demux, "recreate ES for track[Id 0x%x]", p_track->i_track_ID ); @@ -1945,7 +2123,8 @@ static int TrackGotoChunkSample( demux_t *p_demux, mp4_track_t *p_track, * If it succeed b_ok is set to 1 else to 0 ****************************************************************************/ static void MP4_TrackCreate( demux_t *p_demux, mp4_track_t *p_track, - MP4_Box_t *p_box_trak ) + MP4_Box_t *p_box_trak, + bool b_force_enable ) { demux_sys_t *p_sys = p_demux->p_sys; @@ -1972,6 +2151,7 @@ static void MP4_TrackCreate( demux_t *p_demux, mp4_track_t *p_track, p_track->b_enable = false; p_track->b_selected = false; p_track->b_chapter = false; + p_track->b_mac_encoding = false; es_format_Init( &p_track->fmt, UNKNOWN_ES, 0 ); @@ -1983,6 +2163,8 @@ static void MP4_TrackCreate( demux_t *p_demux, mp4_track_t *p_track, /* do we launch this track by default ? */ p_track->b_enable = ( ( p_tkhd->data.p_tkhd->i_flags&MP4_TRACK_ENABLED ) != 0 ); + if( !p_track->b_enable ) + p_track->fmt.i_priority = -1; p_track->i_track_ID = p_tkhd->data.p_tkhd->i_track_ID; p_track->i_width = p_tkhd->data.p_tkhd->i_width / 65536; @@ -2005,11 +2187,19 @@ static void MP4_TrackCreate( demux_t *p_demux, mp4_track_t *p_track, if( !p_track->i_timescale ) return; - for( i = 0; i < 3; i++ ) + if( p_mdhd->data.p_mdhd->i_language_code < 0x800 ) { - language[i] = p_mdhd->data.p_mdhd->i_language[i]; + /* We can convert i_language_code into iso 639 code, + * I won't */ + strcpy( language, MP4_ConvertMacCode( p_mdhd->data.p_mdhd->i_language_code ) ); + p_track->b_mac_encoding = true; + } + else + { + for( i = 0; i < 3; i++ ) + language[i] = p_mdhd->data.p_mdhd->i_language[i]; + language[3] = '\0'; } - language[3] = '\0'; switch( p_hdlr->data.p_hdlr->i_handler_type ) { @@ -2032,6 +2222,7 @@ static void MP4_TrackCreate( demux_t *p_demux, mp4_track_t *p_track, case( FOURCC_text ): case( FOURCC_subp ): case( FOURCC_tx3g ): + case( FOURCC_sbtl ): p_track->fmt.i_cat = SPU_ES; break; @@ -2076,8 +2267,19 @@ static void MP4_TrackCreate( demux_t *p_demux, mp4_track_t *p_track, p_track->p_drms = p_track->b_drms ? p_drms->data.p_sample_soun->p_drms : NULL; + if ( !p_drms ) + { + p_drms = MP4_BoxGet( p_track->p_stsd, "drmi" ); + p_track->b_drms = p_drms != NULL; + p_track->p_drms = p_track->b_drms ? + p_drms->data.p_sample_vide->p_drms : NULL; + } + + if( p_drms ) + p_track->p_skcr = MP4_BoxGet( p_drms, "sinf/skcr" ); + /* Set language */ - if( strcmp( language, "```" ) && strcmp( language, "und" ) ) + if( *language && strcmp( language, "```" ) && strcmp( language, "und" ) ) { p_track->fmt.psz_language = strdup( language ); } @@ -2110,7 +2312,7 @@ static void MP4_TrackCreate( demux_t *p_demux, mp4_track_t *p_track, p_track->i_sample = 0; /* Mark chapter only track */ - if( !p_track->b_enable && p_sys->p_tref_chap ) + if( p_sys->p_tref_chap ) { MP4_Box_data_tref_generic_t *p_chap = p_sys->p_tref_chap->data.p_tref_generic; unsigned int i; @@ -2120,12 +2322,22 @@ static void MP4_TrackCreate( demux_t *p_demux, mp4_track_t *p_track, if( p_track->i_track_ID == p_chap->i_track_ID[i] ) { p_track->b_chapter = true; + p_track->b_enable = false; break; } } } /* now create es */ + if( b_force_enable && + ( p_track->fmt.i_cat == VIDEO_ES || p_track->fmt.i_cat == AUDIO_ES ) ) + { + msg_Warn( p_demux, "Enabling track[Id 0x%x] (buggy file without enabled track)", + p_track->i_track_ID ); + p_track->b_enable = true; + p_track->fmt.i_priority = 0; + } + p_track->p_es = NULL; if( TrackCreateES( p_demux, p_track, p_track->i_chunk, @@ -2155,7 +2367,7 @@ static void MP4_TrackCreate( demux_t *p_demux, mp4_track_t *p_track, **************************************************************************** * Destroy a track created by MP4_TrackCreate. ****************************************************************************/ -static void MP4_TrackDestroy( demux_t *p_demux, mp4_track_t *p_track ) +static void MP4_TrackDestroy( mp4_track_t *p_track ) { unsigned int i_chunk; @@ -2245,15 +2457,9 @@ static int MP4_TrackSeek( demux_t *p_demux, mp4_track_t *p_track, p_track->b_selected = true; - if( TrackGotoChunkSample( p_demux, p_track, i_chunk, i_sample ) == - VLC_SUCCESS ) - { + if( !TrackGotoChunkSample( p_demux, p_track, i_chunk, i_sample ) ) p_track->b_selected = true; - es_out_Control( p_demux->out, ES_OUT_SET_NEXT_DISPLAY_TIME, - p_track->p_es, i_start ); - } - return p_track->b_selected ? VLC_SUCCESS : VLC_EGENERIC; } @@ -2282,8 +2488,11 @@ static int MP4_TrackSampleSize( mp4_track_t *p_track ) if( p_soun->i_qt_version == 1 ) { - i_size = p_track->chunk[p_track->i_chunk].i_sample_count / - p_soun->i_sample_per_packet * p_soun->i_bytes_per_frame; + int i_samples = p_track->chunk[p_track->i_chunk].i_sample_count; + if( p_track->fmt.audio.i_blockalign > 1 ) + i_samples = p_soun->i_sample_per_packet; + + i_size = i_samples / p_soun->i_sample_per_packet * p_soun->i_bytes_per_frame; } else if( p_track->i_sample_size > 256 ) { @@ -2326,8 +2535,10 @@ static uint64_t MP4_TrackGetPos( mp4_track_t *p_track ) } else { - /* we read chunk by chunk */ - i_pos += 0; + /* we read chunk by chunk unless a blockalign is requested */ + if( p_track->fmt.audio.i_blockalign > 1 ) + i_pos += ( p_track->i_sample - p_track->chunk[p_track->i_chunk].i_sample_first ) / + p_soun->i_sample_per_packet * p_soun->i_bytes_per_frame; } } else @@ -2352,10 +2563,11 @@ static int MP4_TrackNextSample( demux_t *p_demux, mp4_track_t *p_track ) if( p_soun->i_qt_version == 1 ) { - /* chunk by chunk */ - p_track->i_sample = - p_track->chunk[p_track->i_chunk].i_sample_first + - p_track->chunk[p_track->i_chunk].i_sample_count; + /* we read chunk by chunk unless a blockalign is requested */ + if( p_track->fmt.audio.i_blockalign > 1 ) + p_track->i_sample += p_soun->i_sample_per_packet; + else + p_track->i_sample += p_track->chunk[p_track->i_chunk].i_sample_count; } else if( p_track->i_sample_size > 256 ) { @@ -2463,3 +2675,44 @@ static void MP4_TrackSetELST( demux_t *p_demux, mp4_track_t *tk, msg_Warn( p_demux, "elst old=%d new=%d", i_elst_last, tk->i_elst ); } } + +/* */ +static const char *MP4_ConvertMacCode( uint16_t i_code ) +{ + static const struct { const char *psz_iso639_1; uint16_t i_code; } p_cvt[] = { + { "en", 0 }, { "fr", 1 }, { "de", 2 }, { "it", 3 }, { "nl", 4 }, + { "sv", 5 }, { "es", 6 }, { "da", 7 }, { "pt", 8 }, { "no", 9 }, + { "he", 10 }, { "ja", 11 }, { "ar", 12 }, { "fi", 13 }, { "el", 14 }, + { "is", 15 }, { "mt", 16 }, { "tr", 17 }, { "hr", 18 }, { "zh", 19 }, + { "ur", 20 }, { "hi", 21 }, { "th", 22 }, { "ko", 23 }, { "lt", 24 }, + { "pl", 25 }, { "hu", 26 }, { "et", 27 }, { "lv", 28 }, //{ "??", 29 }, + { "fo", 30 }, { "fa", 31 }, { "ru", 32 }, { "zh", 33 }, { "nl", 34 }, + { "ga", 35 }, { "sq", 36 }, { "ro", 37 }, { "cs", 38 }, { "sk", 39 }, + { "sl", 40 }, { "yi", 41 }, { "sr", 42 }, { "mk", 43 }, { "bg", 44 }, + { "uk", 45 }, { "be", 46 }, { "uz", 47 }, { "az", 48 }, { "kk", 48 }, + { "az", 50 }, { "hy", 51 }, { "ka", 52 }, { "mo", 53 }, { "ky", 54 }, + { "tg", 55 }, { "tk", 56 }, { "mn", 57 }, { "mn", 58 }, { "ps", 59 }, + { "ku", 60 }, { "ks", 61 }, { "sd", 62 }, { "bo", 63 }, { "ne", 64 }, + { "sa", 65 }, { "mr", 66 }, { "bn", 67 }, { "as", 68 }, { "gu", 69 }, + { "pa", 70 }, { "or", 71 }, { "ml", 72 }, { "kn", 73 }, { "ta", 74 }, + { "te", 75 }, { "si", 76 }, { "my", 77 }, { "km", 78 }, { "lo", 79 }, + { "vi", 80 }, { "id", 81 }, { "tl", 82 }, { "ms", 83 }, { "ms", 84 }, + { "am", 85 }, { "ti", 86 }, { "om", 87 }, { "so", 88 }, { "sw", 89 }, + { "rw", 90 }, { "rn", 91 }, { "ny", 92 }, { "mg", 93 }, { "eo", 94 }, + + { "cy", 128 }, { "eu", 129 }, + { "ca", 130 }, { "la", 131 }, { "qu", 132 }, { "gn", 133 }, { "ay", 134 }, + { "tt", 135 }, { "ug", 136 }, { "dz", 137 }, { "jv", 138 }, { "su", 139 }, + { "gl", 140 }, { "af", 141 }, { "br", 142 }, { "iu", 143 }, { "gd", 144 }, + { "gv", 145 }, { "ga", 146 }, { "to", 147 }, { "el", 148 }, + /* */ + { NULL, 0 } + }; + int i; + for( i = 0; p_cvt[i].psz_iso639_1 != NULL; i++ ) + { + if( p_cvt[i].i_code == i_code ) + return p_cvt[i].psz_iso639_1; + } + return ""; +}