X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fmp4%2Fmp4.c;h=db07c9787a7c3139a99bb8efe544e051bf176e91;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=cfa74ddc2f48df0869c31d9b84c339857558919a;hpb=a93fc49af1a5ba31fdb54f7841ba3210760221ec;p=vlc diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c index cfa74ddc2f..db07c9787a 100644 --- a/modules/demux/mp4/mp4.c +++ b/modules/demux/mp4/mp4.c @@ -17,20 +17,22 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ #include -#include + + +#include #include #include +#include #include "iso_lang.h" -#include "vlc_meta.h" +#include #include "libmp4.h" #include "drms.h" @@ -88,11 +90,12 @@ typedef struct /* Contain all needed information for read all track with vlc */ typedef struct { - int i_track_ID; /* this should be unique */ + unsigned int i_track_ID;/* this should be unique */ - int b_ok; /* The track is usable */ - int b_enable; /* is the trak enable by default */ - vlc_bool_t b_selected; /* is the trak being played */ + int b_ok; /* The track is usable */ + int b_enable; /* is the trak enable by default */ + vlc_bool_t b_selected; /* is the trak being played */ + vlc_bool_t b_chapter; /* True when used for chapter only */ es_format_t fmt; es_out_id_t *p_es; @@ -141,12 +144,18 @@ struct demux_sys_t mtime_t i_pcr; - uint64_t i_time; /* time position of the presentation - * in movie timescale */ - uint64_t i_timescale; /* movie time scale */ - uint64_t i_duration; /* movie duration */ - unsigned int i_tracks; /* number of tracks */ - mp4_track_t *track; /* array of track */ + uint64_t i_time; /* time position of the presentation + * in movie timescale */ + uint64_t i_timescale; /* movie time scale */ + uint64_t i_duration; /* movie duration */ + unsigned int i_tracks; /* number of tracks */ + mp4_track_t *track; /* array of track */ + + /* */ + MP4_Box_t *p_tref_chap; + + /* */ + input_title_t *p_title; }; /***************************************************************************** @@ -165,6 +174,8 @@ static int MP4_TrackSampleSize( mp4_track_t * ); 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 * ); + /* Return time in s of a track */ static inline int64_t MP4_TrackGetDTS( demux_t *p_demux, mp4_track_t *p_track ) { @@ -241,7 +252,11 @@ static inline int64_t MP4_GetMoviePTS(demux_sys_t *p_sys ) return I64C(1000000) * p_sys->i_time / p_sys->i_timescale; } -#define FREE( p ) if( p ) { free( p ); (p) = NULL;} +/* Function to lookup the currently playing item */ +static vlc_bool_t FindItem( demux_t *p_demux, playlist_t *p_playlist, + playlist_item_t **pp_item ); + +static void LoadChapter( demux_t *p_demux ); /***************************************************************************** * Open: check file and initializes MP4 structures @@ -251,7 +266,7 @@ static int Open( vlc_object_t * p_this ) demux_t *p_demux = (demux_t *)p_this; demux_sys_t *p_sys; - uint8_t *p_peek; + const uint8_t *p_peek; MP4_Box_t *p_ftyp; MP4_Box_t *p_rmra; @@ -344,22 +359,19 @@ static int Open( vlc_object_t * p_this ) if( ( p_rmra = MP4_BoxGet( p_sys->p_root, "/moov/rmra" ) ) ) { playlist_t *p_playlist; - playlist_item_t *p_item; + playlist_item_t *p_current, *p_item_in_category; int i_count = MP4_BoxCount( p_rmra, "rmda" ); int i; vlc_bool_t b_play = VLC_FALSE; msg_Dbg( p_demux, "detected playlist mov file (%d ref)", i_count ); - p_playlist = - (playlist_t *)vlc_object_find( p_demux, - VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); + p_playlist = pl_Yield( p_demux ); if( p_playlist ) { - p_item = playlist_LockItemGetByInput( p_playlist, - ((input_thread_t *)p_demux->p_parent)->input.p_item ); - playlist_ItemToNode( p_playlist, p_item ); + b_play = FindItem( p_demux, p_playlist, &p_current ); + p_item_in_category = playlist_ItemToNode( p_playlist, p_current, VLC_TRUE ); + p_current->p_input->i_type = ITEM_TYPE_PLAYLIST; for( i = 0; i < i_count; i++ ) { @@ -367,7 +379,7 @@ static int Open( vlc_object_t * p_this ) char *psz_ref; uint32_t i_ref_type; - if( !p_rdrf || !( psz_ref = p_rdrf->data.p_rdrf->psz_ref ) ) + if( !p_rdrf || !( psz_ref = strdup( p_rdrf->data.p_rdrf->psz_ref ) ) ) { continue; } @@ -386,59 +398,34 @@ static int Open( vlc_object_t * p_this ) if( !strncmp( psz_ref, "http://", 7 ) || !strncmp( psz_ref, "rtsp://", 7 ) ) { - msg_Dbg( p_demux, "adding ref = `%s'", psz_ref ); - if( p_item ) - { - playlist_item_t *p_child = - playlist_ItemNew( p_playlist, - psz_ref, psz_ref ); - if( p_child ) - { - playlist_NodeAddItem( p_playlist, p_child, - p_item->pp_parents[0]->i_view, - p_item, PLAYLIST_APPEND, - PLAYLIST_END ); - playlist_CopyParents( p_item, p_child ); - b_play = VLC_TRUE; - } - } + ; } else { - /* msg dbg relative ? */ - char *psz_absolute = alloca( strlen( p_demux->psz_access ) + 3 + strlen( p_demux->psz_path ) + strlen( psz_ref ) + 1); - char *end = strrchr( p_demux->psz_path, '/' ); - - if( end ) - { - int i_len = end + 1 - p_demux->psz_path; - - strcpy( psz_absolute, p_demux->psz_access ); - strcat( psz_absolute, "://" ); - strncat( psz_absolute, p_demux->psz_path, i_len); - } - else - { - strcpy( psz_absolute, "" ); - } - strcat( psz_absolute, psz_ref ); - msg_Dbg( p_demux, "adding ref = `%s'", psz_absolute ); - if( p_item ) - { - playlist_item_t *p_child = - playlist_ItemNew( p_playlist, - psz_absolute, - psz_absolute ); - if( p_child ) - { - playlist_NodeAddItem( p_playlist, p_child, - p_item->pp_parents[0]->i_view, - p_item, PLAYLIST_APPEND, - PLAYLIST_END ); - playlist_CopyParents( p_item, p_child ); - b_play = VLC_TRUE; - } - } + char *psz_absolute; + char *psz_path = strdup( p_demux->psz_path ); + char *end = strrchr( psz_path, '/' ); + if( end ) end[1] = '\0'; + else *psz_path = '\0'; + + asprintf( &psz_absolute, "%s://%s%s", + p_demux->psz_access, psz_path, psz_ref ); + + if( psz_ref ) free( psz_ref ); + psz_ref = psz_absolute; + free( psz_path ); + } + if( p_current ) + { + input_item_t *p_input; + msg_Dbg( p_demux, "adding ref = `%s'", psz_ref ); + p_input = input_ItemNewExt( p_playlist, psz_ref, NULL, + 0, NULL, -1 ); + input_ItemCopyOptions( p_current->p_input, p_input ); + playlist_BothAddInput( p_playlist, p_input, + p_item_in_category, + PLAYLIST_APPEND, PLAYLIST_END, + NULL, NULL, VLC_FALSE ); } } else @@ -446,12 +433,13 @@ static int Open( vlc_object_t * p_this ) msg_Err( p_demux, "unknown ref type=%4.4s FIXME (send a bug report)", (char*)&p_rdrf->data.p_rdrf->i_ref_type ); } + if( psz_ref ) free( psz_ref ); } - if( b_play == VLC_TRUE ) + if( b_play && p_item_in_category && + p_item_in_category->i_children > 0 ) { - playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, - p_playlist->status.i_view, - p_playlist->status.p_item, NULL ); + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, VLC_TRUE, + p_item_in_category, NULL ); } vlc_object_release( p_playlist ); } @@ -494,15 +482,28 @@ static int Open( vlc_object_t * p_this ) p_sys->track = calloc( p_sys->i_tracks, sizeof( mp4_track_t ) ); memset( p_sys->track, 0, p_sys->i_tracks * sizeof( mp4_track_t ) ); + /* Search the first chap reference (like quicktime) */ + p_sys->p_tref_chap = NULL; + 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; + } + /* 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 ); - if( p_sys->track[i].b_ok ) + if( p_sys->track[i].b_ok && !p_sys->track[i].b_chapter ) { - char *psz_cat; + const char *psz_cat; switch( p_sys->track[i].fmt.i_cat ) { case( VIDEO_ES ): @@ -526,13 +527,23 @@ static int Open( vlc_object_t * p_this ) p_sys->track[i].fmt.psz_language ? p_sys->track[i].fmt.psz_language : "undef" ); } + else if( p_sys->track[i].b_ok && p_sys->track[i].b_chapter ) + { + msg_Dbg( p_demux, "using track[Id 0x%x] for chapter language %s", + p_sys->track[i].i_track_ID, + p_sys->track[i].fmt.psz_language ? + p_sys->track[i].fmt.psz_language : "undef" ); + } else { msg_Dbg( p_demux, "ignoring track[Id 0x%x]", p_sys->track[i].i_track_ID ); } - } + + /* */ + LoadChapter( p_demux ); + return VLC_SUCCESS; error: @@ -564,7 +575,7 @@ static int Demux( demux_t *p_demux ) mp4_track_t *tk = &p_sys->track[i_track]; vlc_bool_t b; - if( !tk->b_ok || + if( !tk->b_ok || tk->b_chapter || ( tk->b_selected && tk->i_sample >= tk->i_sample_count ) ) { continue; @@ -604,6 +615,9 @@ static int Demux( demux_t *p_demux ) return 0; } + /* */ + 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 ); @@ -616,10 +630,8 @@ static int Demux( demux_t *p_demux ) { mp4_track_t *tk = &p_sys->track[i_track]; - if( !tk->b_ok || !tk->b_selected || tk->i_sample >= tk->i_sample_count ) - { + if( !tk->b_ok || tk->b_chapter || !tk->b_selected || tk->i_sample >= tk->i_sample_count ) continue; - } while( MP4_TrackGetDTS( p_demux, tk ) < MP4_GetMoviePTS( p_sys ) ) { @@ -675,7 +687,7 @@ static int Demux( demux_t *p_demux ) p_block->i_buffer = i_size + 1; /* convert \r -> \n */ - while( ( p = strchr( p_block->p_buffer, '\r' ) ) ) + while( ( p = strchr((char *) p_block->p_buffer, '\r' ) ) ) { *p = '\n'; } @@ -704,14 +716,34 @@ static int Demux( demux_t *p_demux ) /* Next sample */ if( MP4_TrackNextSample( p_demux, tk ) ) - { break; - } } } return 1; } + +static void MP4_UpdateSeekpoint( demux_t *p_demux ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + int64_t i_time; + int i; + if( !p_sys->p_title ) + return; + i_time = MP4_GetMoviePTS( p_sys ); + for( i = 0; i < p_sys->p_title->i_seekpoint; i++ ) + { + if( i_time < p_sys->p_title->seekpoint[i]->i_time_offset ) + break; + } + i--; + + if( i != p_demux->info.i_seekpoint && i >= 0 ) + { + p_demux->info.i_seekpoint = i; + p_demux->info.i_update |= INPUT_UPDATE_SEEKPOINT; + } +} /***************************************************************************** * Seek: Got to i_date ******************************************************************************/ @@ -730,6 +762,7 @@ static int Seek( demux_t *p_demux, mtime_t i_date ) mp4_track_t *tk = &p_sys->track[i_track]; MP4_TrackSeek( p_demux, tk, i_date ); } + MP4_UpdateSeekpoint( p_demux ); return VLC_SUCCESS; } @@ -800,52 +833,63 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) case DEMUX_GET_META: { - vlc_meta_t **pp_meta = (vlc_meta_t**)va_arg( args, vlc_meta_t** ); - vlc_meta_t *meta; - MP4_Box_t *p_udta = MP4_BoxGet( p_sys->p_root, "/moov/udta" ); + vlc_meta_t *p_meta = (vlc_meta_t *)va_arg( args, vlc_meta_t*); MP4_Box_t *p_0xa9xxx; + + MP4_Box_t *p_udta = MP4_BoxGet( p_sys->p_root, "/moov/udta/meta/ilst" ); if( p_udta == NULL ) { - return VLC_EGENERIC; + p_udta = MP4_BoxGet( p_sys->p_root, "/moov/udta" ); + if( p_udta == NULL ) + { + return VLC_EGENERIC; + } } - *pp_meta = meta = vlc_meta_New(); + for( p_0xa9xxx = p_udta->p_first; p_0xa9xxx != NULL; p_0xa9xxx = p_0xa9xxx->p_next ) { + + if( !p_0xa9xxx || !p_0xa9xxx->data.p_0xa9xxx ) + continue; + + /* FIXME FIXME: should convert from whatever the character + * encoding of MP4 meta data is to UTF-8. */ +#define SET(fct) do { char *psz_utf = strdup( p_0xa9xxx->data.p_0xa9xxx->psz_text ? p_0xa9xxx->data.p_0xa9xxx->psz_text : "" ); \ + if( psz_utf ) { EnsureUTF8( psz_utf ); \ + fct( p_meta, psz_utf ); free( psz_utf ); } } while(0) + + /* XXX Becarefull p_udta can have box that are not 0xa9xx */ switch( p_0xa9xxx->i_type ) { case FOURCC_0xa9nam: /* Full name */ - vlc_meta_Add( meta, VLC_META_TITLE, - p_0xa9xxx->data.p_0xa9xxx->psz_text ); + SET( vlc_meta_SetTitle ); break; case FOURCC_0xa9aut: - vlc_meta_Add( meta, VLC_META_AUTHOR, - p_0xa9xxx->data.p_0xa9xxx->psz_text ); + SET( vlc_meta_SetArtist ); break; case FOURCC_0xa9ART: - vlc_meta_Add( meta, VLC_META_ARTIST, - p_0xa9xxx->data.p_0xa9xxx->psz_text ); + SET( vlc_meta_SetArtist ); break; case FOURCC_0xa9cpy: - vlc_meta_Add( meta, VLC_META_COPYRIGHT, - p_0xa9xxx->data.p_0xa9xxx->psz_text ); + SET( vlc_meta_SetCopyright ); break; case FOURCC_0xa9day: /* Creation Date */ - vlc_meta_Add( meta, VLC_META_DATE, - p_0xa9xxx->data.p_0xa9xxx->psz_text ); + SET( vlc_meta_SetDate ); break; case FOURCC_0xa9des: /* Description */ - vlc_meta_Add( meta, VLC_META_DESCRIPTION, - p_0xa9xxx->data.p_0xa9xxx->psz_text ); + SET( vlc_meta_SetDescription ); break; case FOURCC_0xa9gen: /* Genre */ - vlc_meta_Add( meta, VLC_META_GENRE, - p_0xa9xxx->data.p_0xa9xxx->psz_text ); + SET( vlc_meta_SetGenre ); + break; + + case FOURCC_0xa9alb: /* Album */ + SET( vlc_meta_SetAlbum ); break; case FOURCC_0xa9swr: case FOURCC_0xa9inf: /* Information */ - case FOURCC_0xa9alb: /* Album */ case FOURCC_0xa9dir: /* Director */ case FOURCC_0xa9dis: /* Disclaimer */ case FOURCC_0xa9enc: /* Encoded By */ @@ -865,6 +909,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) case FOURCC_WLOC: /* Window Location */ /* TODO one day, but they aren't really meaningfull */ break; +#undef SET default: break; @@ -874,12 +919,43 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) } case DEMUX_GET_TITLE_INFO: + { + input_title_t ***ppp_title = (input_title_t***)va_arg( args, input_title_t*** ); + int *pi_int = (int*)va_arg( args, int* ); + int *pi_title_offset = (int*)va_arg( args, int* ); + int *pi_seekpoint_offset = (int*)va_arg( args, int* ); + + if( !p_sys->p_title ) + return VLC_EGENERIC; + + *pi_int = 1; + *ppp_title = malloc( sizeof( input_title_t**) ); + (*ppp_title)[0] = vlc_input_title_Duplicate( p_sys->p_title ); + *pi_title_offset = 0; + *pi_seekpoint_offset = 0; + return VLC_SUCCESS; + } + case DEMUX_SET_TITLE: + { + const int i_title = (int)va_arg( args, int ); + if( !p_sys->p_title || i_title != 0 ) + return VLC_EGENERIC; + return VLC_SUCCESS; + } + case DEMUX_SET_SEEKPOINT: + { + const int i_seekpoint = (int)va_arg( args, int ); + if( !p_sys->p_title ) + return VLC_EGENERIC; + return Seek( p_demux, p_sys->p_title->seekpoint[i_seekpoint]->i_time_offset ); + } + case DEMUX_SET_NEXT_DEMUX_TIME: case DEMUX_SET_GROUP: return VLC_EGENERIC; default: - msg_Warn( p_demux, "control query unimplemented !!!" ); + msg_Warn( p_demux, "control query %u unimplemented", i_query ); return VLC_EGENERIC; } } @@ -889,9 +965,9 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) *****************************************************************************/ static void Close ( vlc_object_t * p_this ) { - unsigned int i_track; demux_t * p_demux = (demux_t *)p_this; demux_sys_t *p_sys = p_demux->p_sys; + unsigned int i_track; msg_Dbg( p_demux, "freeing all memory" ); @@ -900,7 +976,10 @@ static void Close ( vlc_object_t * p_this ) { MP4_TrackDestroy( p_demux, &p_sys->track[i_track] ); } - FREE( p_sys->track ); + FREENULL( p_sys->track ); + + if( p_sys->p_title ) + vlc_input_title_Delete( p_sys->p_title ); free( p_sys ); } @@ -910,6 +989,90 @@ static void Close ( vlc_object_t * p_this ) /**************************************************************************** * Local functions, specific to vlc ****************************************************************************/ +/* Chapters */ +static void LoadChapterGpac( demux_t *p_demux, MP4_Box_t *p_chpl ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + int i; + + p_sys->p_title = vlc_input_title_New(); + for( i = 0; i < p_chpl->data.p_chpl->i_chapter; i++ ) + { + seekpoint_t *s = vlc_seekpoint_New(); + + s->psz_name = strdup( p_chpl->data.p_chpl->chapter[i].psz_name ); + EnsureUTF8( s->psz_name ); + s->i_time_offset = p_chpl->data.p_chpl->chapter[i].i_start / 10; + TAB_APPEND( p_sys->p_title->i_seekpoint, p_sys->p_title->seekpoint, s ); + } +} +static void LoadChapterApple( demux_t *p_demux, mp4_track_t *tk ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + + 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 unsigned int i_size = MP4_TrackSampleSize( tk ); + + if( i_size > 0 && !stream_Seek( p_demux->s, MP4_TrackGetPos( tk ) ) ) + { + char p_buffer[256]; + const int i_read = stream_Read( p_demux->s, p_buffer, __MIN( sizeof(p_buffer), i_size ) ); + const int i_len = __MIN( GetWBE(p_buffer), i_read-2 ); + + if( i_len > 0 ) + { + seekpoint_t *s = vlc_seekpoint_New(); + + s->psz_name = strndup( &p_buffer[2], i_len ); + EnsureUTF8( s->psz_name ); + + s->i_time_offset = i_dts + __MAX( i_pts_delta, 0 ); + + if( !p_sys->p_title ) + p_sys->p_title = vlc_input_title_New(); + TAB_APPEND( p_sys->p_title->i_seekpoint, p_sys->p_title->seekpoint, s ); + } + } + if( tk->i_sample+1 >= tk->chunk[tk->i_chunk].i_sample_first + + tk->chunk[tk->i_chunk].i_sample_count ) + tk->i_chunk++; + } +} +static void LoadChapter( demux_t *p_demux ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + MP4_Box_t *p_chpl; + + if( ( p_chpl = MP4_BoxGet( p_sys->p_root, "/moov/udta/chpl" ) ) && p_chpl->data.p_chpl->i_chapter > 0 ) + { + LoadChapterGpac( p_demux, p_chpl ); + } + else 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, j; + + /* Load the first subtitle track like quicktime */ + for( i = 0; i < p_chap->i_entry_count; i++ ) + { + for( j = 0; j < p_sys->i_tracks; j++ ) + { + mp4_track_t *tk = &p_sys->track[j]; + if( tk->b_ok && tk->i_track_ID == p_chap->i_track_ID[i] && + tk->fmt.i_cat == SPU_ES && tk->fmt.i_codec == VLC_FOURCC( 's', 'u', 'b', 't' ) ) + break; + } + if( j < p_sys->i_tracks ) + { + LoadChapterApple( p_demux, &p_sys->track[i] ); + break; + } + } + } +} /* now create basic chunk data, the rest will be filled by MP4_CreateSamplesIndex */ static int TrackCreateChunksIndex( demux_t *p_demux, @@ -1194,7 +1357,8 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_esds; MP4_Box_t *p_box; - *pp_es = NULL; + if( pp_es ) + *pp_es = NULL; if( !p_track->chunk[i_chunk].i_sample_description_index ) { @@ -1270,9 +1434,28 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, case( VLC_FOURCC( 'm', 's', 0x00, 0x55 ) ): p_track->fmt.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'a' ); break; + case( VLC_FOURCC( 'r', 'a', 'w', ' ' ) ): p_track->fmt.i_codec = VLC_FOURCC( 'a', 'r', 'a', 'w' ); + + /* Buggy files workaround */ + if( p_sample->data.p_sample_soun && (p_track->i_timescale != + p_sample->data.p_sample_soun->i_sampleratehi) ) + { + MP4_Box_data_sample_soun_t *p_soun = + p_sample->data.p_sample_soun; + + msg_Warn( p_demux, "i_timescale ("I64Fu") != i_sampleratehi " + "(%u), making both equal (report any problem).", + p_track->i_timescale, p_soun->i_sampleratehi ); + + if( p_soun->i_sampleratehi ) + p_track->i_timescale = p_soun->i_sampleratehi; + else + p_soun->i_sampleratehi = p_track->i_timescale; + } break; + case( VLC_FOURCC( 's', '2', '6', '3' ) ): p_track->fmt.i_codec = VLC_FOURCC( 'h', '2', '6', '3' ); break; @@ -1282,7 +1465,25 @@ 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" ); */ + p_track->fmt.subs.psz_encoding = strdup( "UTF-8" ); + break; + + case VLC_FOURCC('y','v','1','2'): + p_track->fmt.i_codec = VLC_FOURCC('Y','V','1','2'); + break; + case VLC_FOURCC('y','u','v','2'): + p_track->fmt.i_codec = VLC_FOURCC('Y','U','Y','2'); + 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; + } break; default: @@ -1340,6 +1541,10 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, if( p_track->fmt.i_cat == SPU_ES ) { p_track->fmt.i_codec = VLC_FOURCC( 's','p','u',' ' ); + if( p_track->i_width > 0 ) + p_track->fmt.subs.spu.i_original_frame_width = p_track->i_width; + if( p_track->i_height > 0 ) + p_track->fmt.subs.spu.i_original_frame_height = p_track->i_height; break; } /* Fallback */ @@ -1427,6 +1632,8 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, 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 ) @@ -1441,6 +1648,10 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, 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; @@ -1471,7 +1682,8 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, break; } - *pp_es = es_out_Add( p_demux->out, &p_track->fmt ); + if( pp_es ) + *pp_es = es_out_Add( p_demux->out, &p_track->fmt ); return VLC_SUCCESS; } @@ -1491,10 +1703,8 @@ static int TrackTimeToSampleChunk( demux_t *p_demux, mp4_track_t *p_track, int i_index; /* FIXME see if it's needed to check p_track->i_chunk_count */ - if( !p_track->b_ok || p_track->i_chunk_count == 0 ) - { + if( p_track->i_chunk_count == 0 ) return( VLC_EGENERIC ); - } /* handle elst (find the correct one) */ MP4_TrackSetELST( p_demux, p_track, i_start ); @@ -1546,8 +1756,8 @@ static int TrackTimeToSampleChunk( demux_t *p_demux, mp4_track_t *p_track, break; } - if( i_start >= p_track->chunk[i_chunk].i_first_dts && - i_start < p_track->chunk[i_chunk + 1].i_first_dts ) + if( (uint64_t)i_start >= p_track->chunk[i_chunk].i_first_dts && + (uint64_t)i_start < p_track->chunk[i_chunk + 1].i_first_dts ) { break; } @@ -1560,7 +1770,7 @@ static int TrackTimeToSampleChunk( demux_t *p_demux, mp4_track_t *p_track, { if( i_dts + p_track->chunk[i_chunk].p_sample_count_dts[i_index] * - p_track->chunk[i_chunk].p_sample_delta_dts[i_index] < i_start ) + p_track->chunk[i_chunk].p_sample_delta_dts[i_index] < (uint64_t)i_start ) { i_dts += p_track->chunk[i_chunk].p_sample_count_dts[i_index] * @@ -1650,10 +1860,9 @@ static int TrackGotoChunkSample( demux_t *p_demux, mp4_track_t *p_track, vlc_bool_t b_reselect = VLC_FALSE; /* now see if actual es is ok */ - if( p_track->i_chunk < 0 || - 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 - 1) || + (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 ); @@ -1721,6 +1930,7 @@ static void MP4_TrackCreate( demux_t *p_demux, mp4_track_t *p_track, p_track->b_ok = VLC_FALSE; p_track->b_enable = VLC_FALSE; p_track->b_selected = VLC_FALSE; + p_track->b_chapter = VLC_FALSE; es_format_Init( &p_track->fmt, UNKNOWN_ES, 0 ); @@ -1791,7 +2001,7 @@ static void MP4_TrackCreate( demux_t *p_demux, mp4_track_t *p_track, if( ( p_track->p_elst = p_elst = MP4_BoxGet( p_box_trak, "edts/elst" ) ) ) { MP4_Box_data_elst_t *elst = p_elst->data.p_elst; - int i; + unsigned int i; msg_Warn( p_demux, "elst box found" ); for( i = 0; i < elst->i_entry_count; i++ ) @@ -1800,7 +2010,8 @@ static void MP4_TrackCreate( demux_t *p_demux, mp4_track_t *p_track, "ms) rate=%d.%d", i, elst->i_segment_duration[i] * 1000 / p_sys->i_timescale, elst->i_media_time[i] >= 0 ? - elst->i_media_time[i] * 1000 / p_track->i_timescale : -1, + (int64_t)(elst->i_media_time[i] * 1000 / p_track->i_timescale) : + I64C(-1), elst->i_media_rate_integer[i], elst->i_media_rate_fraction[i] ); } @@ -1845,32 +2056,6 @@ static void MP4_TrackCreate( demux_t *p_demux, mp4_track_t *p_track, } } - /* fxi i_timescale for AUDIO_ES with i_qt_version == 0 */ - if( p_track->fmt.i_cat == AUDIO_ES ) //&& p_track->i_sample_size == 1 ) - { - MP4_Box_t *p_sample; - - p_sample = MP4_BoxGet( p_track->p_stsd, "[0]" ); - if( p_sample && p_sample->data.p_sample_soun) - { - MP4_Box_data_sample_soun_t *p_soun = p_sample->data.p_sample_soun; - if( p_soun->i_qt_version == 0 && - p_track->i_timescale != p_soun->i_sampleratehi ) - { - msg_Warn( p_demux, - "i_timescale ("I64Fu") != i_sampleratehi (%u) with " - "qt_version == 0\n" - "Making both equal. (report any problem)", - p_track->i_timescale, p_soun->i_sampleratehi ); - - if( p_soun->i_sampleratehi ) - p_track->i_timescale = p_soun->i_sampleratehi; - else - p_soun->i_sampleratehi = p_track->i_timescale; - } - } - } - /* Create chunk index table and sample index table */ if( TrackCreateChunksIndex( p_demux,p_track ) || TrackCreateSamplesIndex( p_demux, p_track ) ) @@ -1881,16 +2066,33 @@ static void MP4_TrackCreate( demux_t *p_demux, mp4_track_t *p_track, p_track->i_chunk = 0; p_track->i_sample = 0; + /* Mark chapter only track */ + if( !p_track->b_enable && 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; + + for( i = 0; i < p_chap->i_entry_count; i++ ) + { + if( p_track->i_track_ID == p_chap->i_track_ID[i] ) + { + p_track->b_chapter = VLC_TRUE; + break; + } + } + } + /* now create es */ + p_track->p_es = NULL; if( TrackCreateES( p_demux, p_track, p_track->i_chunk, - &p_track->p_es ) ) + p_track->b_chapter ? NULL : &p_track->p_es ) ) { msg_Err( p_demux, "cannot create es for track[Id 0x%x]", p_track->i_track_ID ); return; } - + p_track->b_ok = VLC_TRUE; #if 0 { int i; @@ -1903,7 +2105,6 @@ static void MP4_TrackCreate( demux_t *p_demux, mp4_track_t *p_track, } } #endif - p_track->b_ok = VLC_TRUE; } /**************************************************************************** @@ -1925,25 +2126,25 @@ static void MP4_TrackDestroy( demux_t *p_demux, mp4_track_t *p_track ) { if( p_track->chunk ) { - FREE(p_track->chunk[i_chunk].p_sample_count_dts); - FREE(p_track->chunk[i_chunk].p_sample_delta_dts ); + FREENULL(p_track->chunk[i_chunk].p_sample_count_dts); + FREENULL(p_track->chunk[i_chunk].p_sample_delta_dts ); - FREE(p_track->chunk[i_chunk].p_sample_count_pts); - FREE(p_track->chunk[i_chunk].p_sample_offset_pts ); + FREENULL(p_track->chunk[i_chunk].p_sample_count_pts); + FREENULL(p_track->chunk[i_chunk].p_sample_offset_pts ); } } - FREE( p_track->chunk ); + FREENULL( p_track->chunk ); if( !p_track->i_sample_size ) { - FREE( p_track->p_sample_size ); + FREENULL( p_track->p_sample_size ); } } static int MP4_TrackSelect( demux_t *p_demux, mp4_track_t *p_track, mtime_t i_start ) { - if( !p_track->b_ok ) + if( !p_track->b_ok || p_track->b_chapter ) { return VLC_EGENERIC; } @@ -1960,7 +2161,7 @@ static int MP4_TrackSelect( demux_t *p_demux, mp4_track_t *p_track, static void MP4_TrackUnselect( demux_t *p_demux, mp4_track_t *p_track ) { - if( !p_track->b_ok ) + if( !p_track->b_ok || p_track->b_chapter ) { return; } @@ -1986,10 +2187,8 @@ static int MP4_TrackSeek( demux_t *p_demux, mp4_track_t *p_track, uint32_t i_chunk; uint32_t i_sample; - if( !p_track->b_ok ) - { - return( VLC_EGENERIC ); - } + if( !p_track->b_ok || p_track->b_chapter ) + return VLC_EGENERIC; p_track->b_selected = VLC_FALSE; @@ -1998,7 +2197,7 @@ static int MP4_TrackSeek( demux_t *p_demux, mp4_track_t *p_track, { msg_Warn( p_demux, "cannot select track[Id 0x%x]", p_track->i_track_ID ); - return( VLC_EGENERIC ); + return VLC_EGENERIC; } p_track->b_selected = VLC_TRUE; @@ -2012,13 +2211,13 @@ static int MP4_TrackSeek( demux_t *p_demux, mp4_track_t *p_track, p_track->p_es, i_start ); } - return( p_track->b_selected ? VLC_SUCCESS : VLC_EGENERIC ); + return p_track->b_selected ? VLC_SUCCESS : VLC_EGENERIC; } /* * 3 types: for audio - * + * */ #define QT_V0_MAX_SAMPLES 1024 static int MP4_TrackSampleSize( mp4_track_t *p_track ) @@ -2163,10 +2362,10 @@ static int MP4_TrackNextSample( demux_t *p_demux, mp4_track_t *p_track ) { demux_sys_t *p_sys = p_demux->p_sys; MP4_Box_data_elst_t *elst = p_track->p_elst->data.p_elst; - int64_t i_mvt = MP4_TrackGetDTS( p_demux, p_track ) * + uint64_t i_mvt = MP4_TrackGetDTS( p_demux, p_track ) * p_sys->i_timescale / (int64_t)1000000; - if( p_track->i_elst < elst->i_entry_count && + if( (unsigned int)p_track->i_elst < elst->i_entry_count && i_mvt >= p_track->i_elst_time + elst->i_segment_duration[p_track->i_elst] ) { @@ -2192,7 +2391,7 @@ static void MP4_TrackSetELST( demux_t *p_demux, mp4_track_t *tk, MP4_Box_data_elst_t *elst = tk->p_elst->data.p_elst; int64_t i_mvt= i_time * p_sys->i_timescale / (int64_t)1000000; - for( tk->i_elst = 0; tk->i_elst < elst->i_entry_count; tk->i_elst++ ) + for( tk->i_elst = 0; (unsigned int)tk->i_elst < elst->i_entry_count; tk->i_elst++ ) { mtime_t i_dur = elst->i_segment_duration[tk->i_elst]; @@ -2203,7 +2402,7 @@ static void MP4_TrackSetELST( demux_t *p_demux, mp4_track_t *tk, tk->i_elst_time += i_dur; } - if( tk->i_elst >= elst->i_entry_count ) + if( (unsigned int)tk->i_elst >= elst->i_entry_count ) { /* msg_Dbg( p_demux, "invalid number of entry in elst" ); */ tk->i_elst = elst->i_entry_count - 1; @@ -2221,3 +2420,37 @@ 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 vlc_bool_t FindItem( demux_t *p_demux, playlist_t *p_playlist, + playlist_item_t **pp_item ) +{ + input_thread_t *p_input = (input_thread_t *)vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT ); + vlc_bool_t b_play = var_CreateGetBool( p_demux, "playlist-autostart" ); + + *pp_item = NULL; + if( p_input ) + { + if( b_play && p_playlist->status.p_item && + p_playlist->status.p_item->p_input == input_GetItem(p_input) ) + { + msg_Dbg( p_playlist, "starting playlist playback" ); + *pp_item = p_playlist->status.p_item; + b_play = VLC_TRUE; + } + else + { + input_item_t *p_current = input_GetItem( p_input ); + + *pp_item = playlist_ItemGetByInput( p_playlist, p_current, VLC_FALSE ); + if( !*pp_item ) + msg_Dbg( p_playlist, "unable to find item in playlist"); + + msg_Dbg( p_playlist, "not starting playlist playback"); + b_play = VLC_FALSE; + } + vlc_object_release( p_input ); + } + return b_play; +} + +