X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fmp4%2Fmp4.c;h=d3af967172288a4d86a7963f65427ed449fae475;hb=857b51f9c9ace345a6b6a9a45a20829101830abb;hp=a025b158debb4430f64fcbcd050b2c2089afc2fa;hpb=8b90225cdca1865015170229bff83e9215237f3f;p=vlc diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c index a025b158de..d3af967172 100644 --- a/modules/demux/mp4/mp4.c +++ b/modules/demux/mp4/mp4.c @@ -1,8 +1,8 @@ /***************************************************************************** * mp4.c : MP4 file input module for vlc ***************************************************************************** - * Copyright (C) 2001 VideoLAN - * $Id: mp4.c,v 1.32 2003/05/22 21:42:44 gbazin Exp $ + * Copyright (C) 2001-2004 the VideoLAN team + * $Id$ * Authors: Laurent Aimar * * This program is free software; you can redistribute it and/or modify @@ -17,180 +17,312 @@ * * 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 /* strdup() */ -#include -#include #include -#include -#include -#include "codecs.h" -#include "libmp4.h" -#include "mp4.h" -/***************************************************************************** - * Local prototypes - *****************************************************************************/ -static int MP4Init ( vlc_object_t * ); -static void __MP4End ( vlc_object_t * ); -static int MP4Demux ( input_thread_t * ); +#include +#include /* malloc(), free() */ -static int MP4DemuxRef( input_thread_t *p_input ) -{ - return 0; -} +#include +#include +#include +#include "charset.h" +#include "iso_lang.h" +#include "vlc_meta.h" -/* New input could have something like that... */ -static int MP4Seek ( input_thread_t *, mtime_t ); +#include "libmp4.h" +#include "drms.h" -#define MP4End(a) __MP4End(VLC_OBJECT(a)) +#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_description( _("MP4 demuxer") ); - set_capability( "demux", 242 ); - set_callbacks( MP4Init, __MP4End ); + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_DEMUX ); + set_description( _("MP4 stream demuxer") ); + set_capability( "demux2", 242 ); + set_callbacks( Open, Close ); vlc_module_end(); /***************************************************************************** - * Declaration of local function + * Local prototypes *****************************************************************************/ +static int Demux ( demux_t * ); +static int DemuxRef( demux_t *p_demux ){ return 0;} +static int Seek ( demux_t *, mtime_t ); +static int Control ( demux_t *, int, va_list ); + +/* Contain all information about a chunk */ +typedef struct +{ + uint64_t i_offset; /* absolute position of this chunk in the file */ + uint32_t i_sample_description_index; /* index for SampleEntry to use */ + 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 */ + + /* with this we can calculate dts/pts without waste memory */ + uint64_t i_first_dts; + uint32_t *p_sample_count_dts; + uint32_t *p_sample_delta_dts; /* dts delta */ + + uint32_t *p_sample_count_pts; + int32_t *p_sample_offset_pts; /* pts-dts */ + + /* TODO if needed add pts + but quickly *add* support for edts and seeking */ + +} mp4_chunk_t; + + /* Contain all needed information for read all track with vlc */ +typedef struct +{ + 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 */ + + es_format_t fmt; + es_out_id_t *p_es; + + /* display size only ! */ + int i_width; + int i_height; + + /* more internal data */ + uint64_t i_timescale; /* time scale for this track only */ + + /* elst */ + int i_elst; /* current elst */ + int64_t i_elst_time; /* current elst start time (in movie time scale)*/ + MP4_Box_t *p_elst; /* elst (could be NULL) */ + + /* give the next sample to read, i_chunk is to find quickly where + the sample is located */ + uint32_t i_sample; /* next sample to read */ + uint32_t i_chunk; /* chunk where next sample is stored */ + /* total count of chunk and sample */ + uint32_t i_chunk_count; + uint32_t i_sample_count; + + mp4_chunk_t *chunk; /* always defined for each chunk */ -static void MP4_TrackCreate ( input_thread_t *, - track_data_mp4_t *, - MP4_Box_t * ); -static void MP4_TrackDestroy( input_thread_t *, - track_data_mp4_t * ); + /* sample size, p_sample_size defined only if i_sample_size == 0 + else i_sample_size is size for all sample */ + uint32_t i_sample_size; + uint32_t *p_sample_size; /* XXX perhaps add file offset if take + too much time to do sumations each time*/ -static int MP4_TrackSelect ( input_thread_t *, - track_data_mp4_t *, - mtime_t ); -static void MP4_TrackUnselect(input_thread_t *, - track_data_mp4_t * ); + MP4_Box_t *p_stbl; /* will contain all timing information */ + MP4_Box_t *p_stsd; /* will contain all data to initialize decoder */ + MP4_Box_t *p_sample;/* point on actual sdsd */ -static int MP4_TrackSeek ( input_thread_t *, - track_data_mp4_t *, - mtime_t ); + vlc_bool_t b_drms; + void *p_drms; -static uint64_t MP4_GetTrackPos( track_data_mp4_t * ); -static int MP4_TrackSampleSize( track_data_mp4_t * ); -static int MP4_TrackNextSample( input_thread_t *, - track_data_mp4_t * ); +} mp4_track_t; -#define MP4_Set4BytesLE( p, dw ) \ - *((uint8_t*)p) = ( (dw)&0xff ); \ - *((uint8_t*)p+1) = ( ((dw)>> 8)&0xff ); \ - *((uint8_t*)p+2) = ( ((dw)>>16)&0xff ); \ - *((uint8_t*)p+3) = ( ((dw)>>24)&0xff ) -#define MP4_Set2BytesLE( p, dw ) \ - *((uint8_t*)p) = ( (dw)&0xff ); \ - *((uint8_t*)p+1) = ( ((dw)>> 8)&0xff ) +struct demux_sys_t +{ + MP4_Box_t *p_root; /* container for the whole file */ + + mtime_t i_pcr; -#define FREE( p ) \ - if( p ) { free( p ); (p) = NULL;} + 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 */ +}; /***************************************************************************** - * MP4Init: check file and initializes MP4 structures + * Declaration of local function *****************************************************************************/ -static int MP4Init( vlc_object_t * p_this ) -{ - input_thread_t *p_input = (input_thread_t *)p_this; - uint8_t *p_peek; +static void MP4_TrackCreate ( demux_t *, mp4_track_t *, MP4_Box_t *); +static void MP4_TrackDestroy( demux_t *, mp4_track_t * ); - demux_sys_t *p_demux; +static int MP4_TrackSelect ( demux_t *, mp4_track_t *, mtime_t ); +static void MP4_TrackUnselect(demux_t *, mp4_track_t * ); - MP4_Box_t *p_ftyp; +static int MP4_TrackSeek ( demux_t *, mp4_track_t *, mtime_t ); - MP4_Box_t *p_rmra; +static uint64_t MP4_TrackGetPos ( mp4_track_t * ); +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 ); - MP4_Box_t *p_mvhd; - MP4_Box_t *p_trak; +/* Return time in s of a track */ +static inline int64_t MP4_TrackGetDTS( demux_t *p_demux, mp4_track_t *p_track ) +{ +#define chunk p_track->chunk[p_track->i_chunk] - unsigned int i; - vlc_bool_t b_audio; + unsigned int i_index = 0; + unsigned int i_sample = p_track->i_sample - chunk.i_sample_first; + int64_t i_dts = chunk.i_first_dts; - /* I need to seek */ - if( !p_input->stream.b_seekable ) + while( i_sample > 0 ) { - msg_Warn( p_input, "MP4 plugin discarded (unseekable)" ); - return( VLC_EGENERIC ); - + if( i_sample > chunk.p_sample_count_dts[i_index] ) + { + i_dts += chunk.p_sample_count_dts[i_index] * + chunk.p_sample_delta_dts[i_index]; + i_sample -= chunk.p_sample_count_dts[i_index]; + i_index++; + } + else + { + i_dts += i_sample * chunk.p_sample_delta_dts[i_index]; + i_sample = 0; + break; + } } - /* Initialize access plug-in structures. */ - if( p_input->i_mtu == 0 ) + +#undef chunk + + /* now handle elst */ + if( p_track->p_elst ) { - /* Improve speed. */ - p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE ; + demux_sys_t *p_sys = p_demux->p_sys; + MP4_Box_data_elst_t *elst = p_track->p_elst->data.p_elst; + + /* convert to offset */ + if( ( elst->i_media_rate_integer[p_track->i_elst] > 0 || + elst->i_media_rate_fraction[p_track->i_elst] > 0 ) && + elst->i_media_time[p_track->i_elst] > 0 ) + { + i_dts -= elst->i_media_time[p_track->i_elst]; + } + + /* add i_elst_time */ + i_dts += p_track->i_elst_time * p_track->i_timescale / + p_sys->i_timescale; + + if( i_dts < 0 ) i_dts = 0; } - p_input->pf_demux = MP4Demux; + return I64C(1000000) * i_dts / p_track->i_timescale; +} + +static inline int64_t MP4_TrackGetPTSDelta( demux_t *p_demux, mp4_track_t *p_track ) +{ + mp4_chunk_t *ck = &p_track->chunk[p_track->i_chunk]; + unsigned int i_index = 0; + unsigned int i_sample = p_track->i_sample - ck->i_sample_first; + + if( ck->p_sample_count_pts == NULL || ck->p_sample_offset_pts == NULL ) + return -1; - /* a little test to see if it could be a mp4 */ - if( input_Peek( p_input, &p_peek, 8 ) < 8 ) + for( i_index = 0;; i_index++ ) { - msg_Warn( p_input, "MP4 plugin discarded (cannot peek)" ); - return( VLC_EGENERIC ); + if( i_sample < ck->p_sample_count_pts[i_index] ) + return ck->p_sample_offset_pts[i_index] * I64C(1000000) / + (int64_t)p_track->i_timescale; + + i_sample -= ck->p_sample_count_pts[i_index]; } +} + +static inline int64_t MP4_GetMoviePTS(demux_sys_t *p_sys ) +{ + return I64C(1000000) * p_sys->i_time / p_sys->i_timescale; +} +/* 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 ); + +/***************************************************************************** + * Open: check file and initializes MP4 structures + *****************************************************************************/ +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; + + MP4_Box_t *p_ftyp; + MP4_Box_t *p_rmra; + MP4_Box_t *p_mvhd; + MP4_Box_t *p_trak; + + unsigned int i; + vlc_bool_t b_seekable; + + /* A little test to see if it could be a mp4 */ + if( stream_Peek( p_demux->s, &p_peek, 8 ) < 8 ) return VLC_EGENERIC; switch( VLC_FOURCC( p_peek[4], p_peek[5], p_peek[6], p_peek[7] ) ) { - case( FOURCC_ftyp ): - case( FOURCC_moov ): - case( FOURCC_foov ): - case( FOURCC_moof ): - case( FOURCC_mdat ): - case( FOURCC_udta ): - case( FOURCC_free ): - case( FOURCC_skip ): - case( FOURCC_wide ): + case FOURCC_ftyp: + case FOURCC_moov: + case FOURCC_foov: + case FOURCC_moof: + case FOURCC_mdat: + case FOURCC_udta: + case FOURCC_free: + case FOURCC_skip: + case FOURCC_wide: + case VLC_FOURCC( 'p', 'n', 'o', 't' ): break; default: - msg_Warn( p_input, "MP4 plugin discarded (not a valid file)" ); - return( VLC_EGENERIC ); + return VLC_EGENERIC; } - /* create our structure that will contains all data */ - if( !( p_input->p_demux_data = - p_demux = malloc( sizeof( demux_sys_t ) ) ) ) + /* I need to seek */ + stream_Control( p_demux->s, STREAM_CAN_SEEK, &b_seekable ); + if( !b_seekable ) { - msg_Err( p_input, "out of memory" ); - return( VLC_EGENERIC ); + msg_Warn( p_demux, "MP4 plugin discarded (unseekable)" ); + return VLC_EGENERIC; } - memset( p_demux, 0, sizeof( demux_sys_t ) ); - p_input->p_demux_data = p_demux; + /*Set exported functions */ + p_demux->pf_demux = Demux; + 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 ) ); /* Now load all boxes ( except raw data ) */ - if( !MP4_BoxGetRoot( p_input, &p_demux->box_root ) ) + if( ( p_sys->p_root = MP4_BoxGetRoot( p_demux->s ) ) == NULL ) { - msg_Warn( p_input, "MP4 plugin discarded (not a valid file)" ); - return( VLC_EGENERIC ); + msg_Warn( p_demux, "MP4 plugin discarded (not a valid file)" ); + goto error; } - MP4_BoxDumpStructure( p_input, &p_demux->box_root ); + MP4_BoxDumpStructure( p_demux->s, p_sys->p_root ); - if( ( p_ftyp = MP4_BoxGet( &p_demux->box_root, "/ftyp" ) ) ) + if( ( p_ftyp = MP4_BoxGet( p_sys->p_root, "/ftyp" ) ) ) { switch( p_ftyp->data.p_ftyp->i_major_brand ) { case( FOURCC_isom ): - msg_Dbg( p_input, + msg_Dbg( p_demux, "ISO Media file (isom) version %d.", p_ftyp->data.p_ftyp->i_minor_version ); break; default: - msg_Dbg( p_input, + msg_Dbg( p_demux, "unrecognized major file specification (%4.4s).", (char*)&p_ftyp->data.p_ftyp->i_major_brand ); break; @@ -198,179 +330,159 @@ static int MP4Init( vlc_object_t * p_this ) } else { - msg_Dbg( p_input, "file type box missing (assuming ISO Media file)" ); + msg_Dbg( p_demux, "file type box missing (assuming ISO Media file)" ); } /* the file need to have one moov box */ - if( MP4_BoxCount( &p_demux->box_root, "/moov" ) <= 0 ) + if( MP4_BoxCount( p_sys->p_root, "/moov" ) <= 0 ) { - MP4_Box_t *p_foov = MP4_BoxGet( &p_demux->box_root, "/foov" ); + MP4_Box_t *p_foov = MP4_BoxGet( p_sys->p_root, "/foov" ); if( !p_foov ) { - msg_Err( p_input, "MP4 plugin discarded (no moov box)" ); - MP4End( p_input ); - return( VLC_EGENERIC ); + msg_Err( p_demux, "MP4 plugin discarded (no moov box)" ); + goto error; } /* we have a free box as a moov, rename it */ p_foov->i_type = FOURCC_moov; } - if( ( p_rmra = MP4_BoxGet( &p_demux->box_root, "/moov/rmra" ) ) ) + if( ( p_rmra = MP4_BoxGet( p_sys->p_root, "/moov/rmra" ) ) ) { playlist_t *p_playlist; + 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_input, "detected playlist mov file (%d ref)", i_count ); + msg_Dbg( p_demux, "detected playlist mov file (%d ref)", i_count ); p_playlist = - (playlist_t *)vlc_object_find( p_input, + (playlist_t *)vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); if( p_playlist ) { - //p_playlist->pp_items[p_playlist->i_index]->b_autodeletion = VLC_TRUE; + b_play = FindItem( p_demux, p_playlist, &p_current ); + p_item_in_category = playlist_ItemToNode( p_playlist, p_current ); + p_current->p_input->i_type = ITEM_TYPE_PLAYLIST; + for( i = 0; i < i_count; i++ ) { MP4_Box_t *p_rdrf = MP4_BoxGet( p_rmra, "rmda[%d]/rdrf", i ); 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; } i_ref_type = p_rdrf->data.p_rdrf->i_ref_type; - msg_Dbg( p_input, "new ref=`%s' type=%4.4s", + msg_Dbg( p_demux, "new ref=`%s' type=%4.4s", psz_ref, (char*)&i_ref_type ); if( i_ref_type == VLC_FOURCC( 'u', 'r', 'l', ' ' ) ) { if( strstr( psz_ref, "qt5gateQT" ) ) { - msg_Dbg( p_input, "ignoring pseudo ref =`%s'", psz_ref ); + msg_Dbg( p_demux, "ignoring pseudo ref =`%s'", psz_ref ); continue; } if( !strncmp( psz_ref, "http://", 7 ) || !strncmp( psz_ref, "rtsp://", 7 ) ) { - msg_Dbg( p_input, "adding ref = `%s'", psz_ref ); - playlist_Add( p_playlist, psz_ref, PLAYLIST_APPEND, PLAYLIST_END ); + ; } else { - /* msg dbg relative ? */ - char *psz_absolute = alloca( strlen( p_input->psz_source ) + strlen( psz_ref ) + 1); - char *end = strrchr( p_input->psz_source, '/' ); + 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'; - if( end ) - { - int i_len = end + 1 - p_input->psz_source; + asprintf( &psz_absolute, "%s://%s%s", + p_demux->psz_access, psz_path, psz_ref ); - strncpy( psz_absolute, p_input->psz_source, i_len); - psz_absolute[i_len] = '\0'; - } - else - { - strcpy( psz_absolute, "" ); - } - strcat( psz_absolute, psz_ref ); - msg_Dbg( p_input, "adding ref = `%s'", psz_absolute ); - playlist_Add( p_playlist, psz_absolute, PLAYLIST_APPEND, PLAYLIST_END ); + 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_AddWhereverNeeded( p_playlist, p_input, p_current, + p_item_in_category, VLC_FALSE, PLAYLIST_APPEND ); } } else { - msg_Err( p_input, "unknown ref type=%4.4s FIXME (send a bug report)", (char*)&p_rdrf->data.p_rdrf->i_ref_type ); + 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 && p_playlist->status.p_item && + p_playlist->status.p_item->i_children > 0) + { + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, + p_playlist->status.p_item, NULL ); } vlc_object_release( p_playlist ); } else { - msg_Err( p_input, "can't find playlist" ); + msg_Err( p_demux, "can't find playlist" ); } } - if( !(p_mvhd = MP4_BoxGet( &p_demux->box_root, "/moov/mvhd" ) ) ) + if( !(p_mvhd = MP4_BoxGet( p_sys->p_root, "/moov/mvhd" ) ) ) { if( !p_rmra ) { - msg_Err( p_input, "cannot find /moov/mvhd" ); - MP4End( p_input ); - return VLC_EGENERIC; + msg_Err( p_demux, "cannot find /moov/mvhd" ); + goto error; } else { - msg_Warn( p_input, "cannot find /moov/mvhd (pure ref file)" ); - p_input->pf_demux = MP4DemuxRef; + msg_Warn( p_demux, "cannot find /moov/mvhd (pure ref file)" ); + p_demux->pf_demux = DemuxRef; return VLC_SUCCESS; } } else { - p_demux->i_timescale = p_mvhd->data.p_mvhd->i_timescale; - p_demux->i_duration = p_mvhd->data.p_mvhd->i_duration; - } - - if( !( p_demux->i_tracks = - MP4_BoxCount( &p_demux->box_root, "/moov/trak" ) ) ) - { - msg_Err( p_input, "cannot find any /moov/trak" ); - MP4End( p_input ); - return( VLC_EGENERIC ); + p_sys->i_timescale = p_mvhd->data.p_mvhd->i_timescale; + p_sys->i_duration = p_mvhd->data.p_mvhd->i_duration; } - msg_Dbg( p_input, "find %d track%c", - p_demux->i_tracks, - p_demux->i_tracks ? 's':' ' ); - /* create one program */ - vlc_mutex_lock( &p_input->stream.stream_lock ); - if( input_InitStream( p_input, 0 ) == -1) - { - vlc_mutex_unlock( &p_input->stream.stream_lock ); - msg_Err( p_input, "cannot init stream" ); - MP4End( p_input ); - return( VLC_EGENERIC ); - } - /* Needed to create program _before_ MP4_TrackCreate */ - if( input_AddProgram( p_input, 0, 0) == NULL ) - { - vlc_mutex_unlock( &p_input->stream.stream_lock ); - msg_Err( p_input, "cannot add program" ); - MP4End( p_input ); - return( VLC_EGENERIC ); - } - p_input->stream.p_selected_program = p_input->stream.pp_programs[0]; - /* XXX beurk and beurk, see MP4Demux and MP4Seek */ - if( p_demux->i_duration/p_demux->i_timescale > 0 ) - { - p_input->stream.i_mux_rate = - p_input->stream.p_selected_area->i_size / 50 / - ( p_demux->i_duration / p_demux->i_timescale ); - } - else + if( !( p_sys->i_tracks = MP4_BoxCount( p_sys->p_root, "/moov/trak" ) ) ) { - p_input->stream.i_mux_rate = 0; + msg_Err( p_demux, "cannot find any /moov/trak" ); + goto error; } - vlc_mutex_unlock( &p_input->stream.stream_lock ); - + msg_Dbg( p_demux, "find %d track%c", + p_sys->i_tracks, + p_sys->i_tracks ? 's':' ' ); /* allocate memory */ - p_demux->track = calloc( p_demux->i_tracks, sizeof( track_data_mp4_t ) ); + 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 ) ); - /* now process each track and extract all usefull informations */ - for( i = 0; i < p_demux->i_tracks; i++ ) + /* now process each track and extract all usefull information */ + for( i = 0; i < p_sys->i_tracks; i++ ) { - p_trak = MP4_BoxGet( &p_demux->box_root, "/moov/trak[%d]", i ); - MP4_TrackCreate( p_input, &p_demux->track[i], p_trak ); + p_trak = MP4_BoxGet( p_sys->p_root, "/moov/trak[%d]", i ); + MP4_TrackCreate( p_demux, &p_sys->track[i], p_trak ); - if( p_demux->track[i].b_ok ) + if( p_sys->track[i].b_ok ) { char *psz_cat; - switch( p_demux->track[i].i_cat ) + switch( p_sys->track[i].fmt.i_cat ) { case( VIDEO_ES ): psz_cat = "video"; @@ -378,294 +490,411 @@ static int MP4Init( vlc_object_t * p_this ) case( AUDIO_ES ): psz_cat = "audio"; break; + case( SPU_ES ): + psz_cat = "subtitle"; + break; + default: psz_cat = "unknown"; break; } - msg_Dbg( p_input, "adding track[Id 0x%x] %s (%s) language %c%c%c", - p_demux->track[i].i_track_ID, - psz_cat, - p_demux->track[i].b_enable ? "enable":"disable", - p_demux->track[i].i_language[0], - p_demux->track[i].i_language[1], - p_demux->track[i].i_language[2] ); + msg_Dbg( p_demux, "adding track[Id 0x%x] %s (%s) language %s", + p_sys->track[i].i_track_ID, psz_cat, + p_sys->track[i].b_enable ? "enable":"disable", + p_sys->track[i].fmt.psz_language ? + p_sys->track[i].fmt.psz_language : "undef" ); } else { - msg_Dbg( p_input, "ignoring track[Id 0x%x]", p_demux->track[i].i_track_ID ); + msg_Dbg( p_demux, "ignoring track[Id 0x%x]", + p_sys->track[i].i_track_ID ); } } + return VLC_SUCCESS; - for( i = 0, b_audio = VLC_FALSE; i < p_demux->i_tracks; i++ ) +error: + if( p_sys->p_root ) { -#define track p_demux->track[i] - /* start decoder for this track if enable by default*/ - if( track.b_ok && track.b_enable && - ( track.i_cat != AUDIO_ES || !b_audio ) ) - { - if( !MP4_TrackSelect( p_input, &track, 0 ) ) - { - if(track.i_cat == AUDIO_ES ) - { - b_audio = VLC_TRUE; - } - } - } -#undef track + MP4_BoxFree( p_demux->s, p_sys->p_root ); } - - vlc_mutex_lock( &p_input->stream.stream_lock ); - p_input->stream.p_selected_program->b_is_ok = 1; - vlc_mutex_unlock( &p_input->stream.stream_lock ); - - return( VLC_SUCCESS ); + free( p_sys ); + return VLC_EGENERIC; } /***************************************************************************** - * MP4Demux: read packet and send them to decoders + * Demux: read packet and send them to decoders ***************************************************************************** * TODO check for newly selected track (ie audio upt to now ) *****************************************************************************/ -static int MP4Demux( input_thread_t *p_input ) +static int Demux( demux_t *p_demux ) { - demux_sys_t *p_demux = p_input->p_demux_data; + demux_sys_t *p_sys = p_demux->p_sys; unsigned int i_track; unsigned int i_track_selected; - vlc_bool_t b_video; - vlc_bool_t b_play_audio; /* check for newly selected/unselected track */ - for( i_track = 0, i_track_selected = 0, b_video = VLC_FALSE; - i_track < p_demux->i_tracks; i_track++ ) + for( i_track = 0, i_track_selected = 0; i_track < p_sys->i_tracks; + i_track++ ) { -#define track p_demux->track[i_track] - if( track.b_selected && track.i_sample >= track.i_sample_count ) + mp4_track_t *tk = &p_sys->track[i_track]; + vlc_bool_t b; + + if( !tk->b_ok || + ( tk->b_selected && tk->i_sample >= tk->i_sample_count ) ) { - msg_Warn( p_input, "track[0x%x] will be disabled", track.i_track_ID ); - MP4_TrackUnselect( p_input, &track ); + continue; } - else if( track.b_ok ) - { - if( track.b_selected && track.p_es->p_decoder_fifo == NULL ) - { - MP4_TrackUnselect( p_input, &track ); - } - else if( !track.b_selected && track.p_es->p_decoder_fifo != NULL ) - { - MP4_TrackSelect( p_input, &track, MP4_GetMoviePTS( p_demux ) ); - } - if( track.b_selected ) - { - i_track_selected++; + es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b ); - if( track.i_cat == VIDEO_ES ) - { - b_video = VLC_TRUE; - } - } + if( tk->b_selected && !b ) + { + MP4_TrackUnselect( p_demux, tk ); + } + else if( !tk->b_selected && b) + { + MP4_TrackSelect( p_demux, tk, MP4_GetMoviePTS( p_sys ) ); } -#undef track - } - if( i_track_selected <= 0 ) - { - msg_Warn( p_input, "no track selected, exiting..." ); - return( 0 ); + if( tk->b_selected ) + { + i_track_selected++; + } } - - /* XXX beurk, beuRK and BEURK, - but only way I've found to detect seek from interface */ - if( p_input->stream.p_selected_program->i_synchro_state == SYNCHRO_REINIT ) + if( i_track_selected <= 0 ) { - mtime_t i_date; - - /* first wait for empty buffer, arbitrary time FIXME */ - msleep( DEFAULT_PTS_DELAY ); - /* *** calculate new date *** */ + p_sys->i_time += __MAX( p_sys->i_timescale / 10 , 1 ); + if( p_sys->i_timescale > 0 ) + { + int64_t i_length = (mtime_t)1000000 * + (mtime_t)p_sys->i_duration / + (mtime_t)p_sys->i_timescale; + if( MP4_GetMoviePTS( p_sys ) >= i_length ) + return 0; + return 1; + } - i_date = (mtime_t)1000000 * - (mtime_t)p_demux->i_duration / - (mtime_t)p_demux->i_timescale * - (mtime_t)MP4_TellAbsolute( p_input ) / - (mtime_t)p_input->stream.p_selected_area->i_size; - MP4Seek( p_input, i_date ); + msg_Warn( p_demux, "no track selected, exiting..." ); + return 0; } /* first wait for the good time to read a packet */ - input_ClockManageRef( p_input, - p_input->stream.p_selected_program, - p_demux->i_pcr ); - - - /* update pcr XXX in mpeg scale so in 90000 unit/s */ - p_demux->i_pcr = MP4_GetMoviePTS( p_demux ) * 9 / 100; + es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pcr + 1 ); + p_sys->i_pcr = MP4_GetMoviePTS( p_sys ); /* we will read 100ms for each stream so ...*/ - p_demux->i_time += __MAX( p_demux->i_timescale / 10 , 1 ); - + p_sys->i_time += __MAX( p_sys->i_timescale / 10 , 1 ); - /* Check if we need to send the audio data to decoder */ - b_play_audio = !p_input->stream.control.b_mute; - - for( i_track = 0; i_track < p_demux->i_tracks; i_track++ ) + for( i_track = 0; i_track < p_sys->i_tracks; i_track++ ) { -#define track p_demux->track[i_track] - if( !track.b_ok || - !track.b_selected || - MP4_GetTrackPTS( &track ) >= MP4_GetMoviePTS( 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 ) { continue; } - while( MP4_GetTrackPTS( &track ) < MP4_GetMoviePTS( p_demux ) ) + + while( MP4_TrackGetDTS( p_demux, tk ) < MP4_GetMoviePTS( p_sys ) ) { +#if 0 + msg_Dbg( p_demux, "tk(%i)=%lld mv=%lld", i_track, + MP4_TrackGetDTS( p_demux, tk ), + MP4_GetMoviePTS( p_sys ) ); +#endif - if( !b_play_audio && track.i_cat == AUDIO_ES ) - { - if( MP4_TrackNextSample( p_input, &track ) ) - { - break; - } - } - else + if( MP4_TrackSampleSize( tk ) > 0 ) { - size_t i_size; - off_t i_pos; - - data_packet_t *p_data; - pes_packet_t *p_pes; - - /* caculate size and position for this sample */ - i_size = MP4_TrackSampleSize( &track ); - - i_pos = MP4_GetTrackPos( &track ); - - //msg_Dbg( p_input, "stream %d size=%6d pos=%8lld", i_track, i_size, i_pos ); + block_t *p_block; + int64_t i_delta; /* go,go go ! */ - if( MP4_SeekAbsolute( p_input, i_pos ) ) + if( stream_Seek( p_demux->s, MP4_TrackGetPos( tk ) ) ) { - msg_Warn( p_input, "track[0x%x] will be disabled (eof?)", track.i_track_ID ); - MP4_TrackUnselect( p_input, &track ); + msg_Warn( p_demux, "track[0x%x] will be disabled (eof?)", + tk->i_track_ID ); + MP4_TrackUnselect( p_demux, tk ); break; } - - /* now create a pes */ - if( !(p_pes = input_NewPES( p_input->p_method_data ) ) ) + /* now read pes */ + if( !(p_block = + stream_Block( p_demux->s, MP4_TrackSampleSize(tk) )) ) { + msg_Warn( p_demux, "track[0x%x] will be disabled (eof?)", + tk->i_track_ID ); + MP4_TrackUnselect( p_demux, tk ); break; } - /* and a data packet for the data */ - if( !(p_data = input_NewPacket( p_input->p_method_data, i_size ) ) ) + + if( tk->b_drms && tk->p_drms ) { - input_DeletePES( p_input->p_method_data, p_pes ); - break; + drms_decrypt( tk->p_drms, (uint32_t*)p_block->p_buffer, + p_block->i_buffer ); } - p_data->p_payload_end = p_data->p_payload_start + i_size; - - /* initialisation of all the field */ - p_pes->i_dts = p_pes->i_pts = 0; - p_pes->p_first = p_pes->p_last = p_data; - p_pes->i_nb_data = 1; - p_pes->i_pes_size = i_size; - if( i_size > 0 ) + else if( tk->fmt.i_cat == SPU_ES ) { - if( MP4_ReadData( p_input, p_data->p_payload_start, i_size ) ) + if( tk->fmt.i_codec == VLC_FOURCC( 's', 'u', 'b', 't' ) && + p_block->i_buffer >= 2 ) { - input_DeletePES( p_input->p_method_data, p_pes ); + uint16_t i_size = GetWBE( p_block->p_buffer ); - msg_Warn( p_input, "track[0x%x] will be disabled (eof?)", track.i_track_ID ); - MP4_TrackUnselect( p_input, &track ); - break; + if( i_size + 2 <= p_block->i_buffer ) + { + char *p; + /* remove the length field, and append a '\0' */ + memmove( &p_block->p_buffer[0], + &p_block->p_buffer[2], i_size ); + p_block->p_buffer[i_size] = '\0'; + p_block->i_buffer = i_size + 1; + + /* convert \r -> \n */ + while( ( p = strchr((char *) p_block->p_buffer, '\r' ) ) ) + { + *p = '\n'; + } + } + else + { + /* Invalid */ + p_block->i_buffer = 0; + } } } - - p_pes->i_dts = - p_pes->i_pts = input_ClockGetTS( p_input, - p_input->stream.p_selected_program, - MP4_GetTrackPTS( &track ) * 9/100); - - if( track.p_es->p_decoder_fifo ) - { - - p_pes->i_rate = p_input->stream.control.i_rate; - input_DecodePES( track.p_es->p_decoder_fifo, p_pes ); - } + /* dts */ + p_block->i_dts = MP4_TrackGetDTS( p_demux, tk ) + 1; + /* pts */ + i_delta = MP4_TrackGetPTSDelta( p_demux, 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 - { - input_DeletePES( p_input->p_method_data, p_pes ); - } + p_block->i_pts = 0; - if( MP4_TrackNextSample( p_input, &track ) ) - { - break; - } + if( !tk->b_drms || ( tk->b_drms && tk->p_drms ) ) + es_out_Send( p_demux->out, tk->p_es, p_block ); + } + + /* Next sample */ + if( MP4_TrackNextSample( p_demux, tk ) ) + { + break; } } -#undef track } - return( 1 ); + return 1; } /***************************************************************************** - * MP4Seek: Got to i_date - ******************************************************************************/ -static int MP4Seek ( input_thread_t *p_input, mtime_t i_date ) + * Seek: Got to i_date +******************************************************************************/ +static int Seek( demux_t *p_demux, mtime_t i_date ) { - demux_sys_t *p_demux = p_input->p_demux_data; + demux_sys_t *p_sys = p_demux->p_sys; unsigned int i_track; + /* First update update global time */ - p_demux->i_time = i_date * p_demux->i_timescale / 1000000; - p_demux->i_pcr = i_date* 9 / 100; + p_sys->i_time = i_date * p_sys->i_timescale / 1000000; + p_sys->i_pcr = i_date; /* Now for each stream try to go to this time */ - for( i_track = 0; i_track < p_demux->i_tracks; i_track++ ) + for( i_track = 0; i_track < p_sys->i_tracks; i_track++ ) { -#define track p_demux->track[i_track] - if( track.b_ok && track.b_selected ) + mp4_track_t *tk = &p_sys->track[i_track]; + MP4_TrackSeek( p_demux, tk, i_date ); + } + return VLC_SUCCESS; +} + +/***************************************************************************** + * Control: + *****************************************************************************/ +static int Control( demux_t *p_demux, int i_query, va_list args ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + + double f, *pf; + int64_t i64, *pi64; + + switch( i_query ) + { + case DEMUX_GET_POSITION: + pf = (double*)va_arg( args, double * ); + if( p_sys->i_duration > 0 ) + { + *pf = (double)p_sys->i_time / (double)p_sys->i_duration; + } + else + { + *pf = 0.0; + } + return VLC_SUCCESS; + + case DEMUX_SET_POSITION: + f = (double)va_arg( args, double ); + if( p_sys->i_timescale > 0 ) + { + i64 = (int64_t)( f * (double)1000000 * + (double)p_sys->i_duration / + (double)p_sys->i_timescale ); + return Seek( p_demux, i64 ); + } + else return VLC_SUCCESS; + + case DEMUX_GET_TIME: + pi64 = (int64_t*)va_arg( args, int64_t * ); + if( p_sys->i_timescale > 0 ) + { + *pi64 = (mtime_t)1000000 * + (mtime_t)p_sys->i_time / + (mtime_t)p_sys->i_timescale; + } + else *pi64 = 0; + return VLC_SUCCESS; + + case DEMUX_SET_TIME: + i64 = (int64_t)va_arg( args, int64_t ); + return Seek( p_demux, i64 ); + + case DEMUX_GET_LENGTH: + pi64 = (int64_t*)va_arg( args, int64_t * ); + if( p_sys->i_timescale > 0 ) + { + *pi64 = (mtime_t)1000000 * + (mtime_t)p_sys->i_duration / + (mtime_t)p_sys->i_timescale; + } + else *pi64 = 0; + return VLC_SUCCESS; + + case DEMUX_GET_FPS: + msg_Warn( p_demux, "DEMUX_GET_FPS unimplemented !!" ); + return VLC_EGENERIC; + + case DEMUX_GET_META: { - MP4_TrackSeek( p_input, &track, i_date ); + vlc_meta_t *p_meta = (vlc_meta_t *)va_arg( args, vlc_meta_t*); + MP4_Box_t *p_udta = MP4_BoxGet( p_sys->p_root, "/moov/udta" ); + MP4_Box_t *p_0xa9xxx; + if( p_udta == NULL ) + { + return VLC_EGENERIC; + } + for( p_0xa9xxx = p_udta->p_first; p_0xa9xxx != NULL; + p_0xa9xxx = p_0xa9xxx->p_next ) + { + char *psz_utf; + if( !p_0xa9xxx || !p_0xa9xxx->data.p_0xa9xxx ) + continue; + psz_utf = strdup( p_0xa9xxx->data.p_0xa9xxx->psz_text ); + if( psz_utf == NULL ) + continue; + /* FIXME FIXME: should convert from whatever the character + * encoding of MP4 meta data is to UTF-8. */ + EnsureUTF8( psz_utf ); + + switch( p_0xa9xxx->i_type ) + { + case FOURCC_0xa9nam: /* Full name */ + vlc_meta_SetArtist( p_meta, psz_utf ); + break; + case FOURCC_0xa9aut: + vlc_meta_SetAuthor( p_meta, psz_utf ); + break; + case FOURCC_0xa9ART: + vlc_meta_SetArtist( p_meta, psz_utf ); + break; + case FOURCC_0xa9cpy: + vlc_meta_SetCopyright( p_meta, psz_utf ); + break; + case FOURCC_0xa9day: /* Creation Date */ + vlc_meta_SetDate( p_meta, psz_utf ); + break; + case FOURCC_0xa9des: /* Description */ + vlc_meta_SetDescription( p_meta, psz_utf ); + break; + case FOURCC_0xa9gen: /* Genre */ + vlc_meta_SetGenre( p_meta, psz_utf ); + 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 */ + case FOURCC_0xa9trk: /* Track */ + case FOURCC_0xa9cmt: /* Commment */ + case FOURCC_0xa9url: /* URL */ + case FOURCC_0xa9req: /* Requirements */ + case FOURCC_0xa9fmt: /* Original Format */ + case FOURCC_0xa9dsa: /* Display Source As */ + case FOURCC_0xa9hst: /* Host Computer */ + case FOURCC_0xa9prd: /* Producer */ + case FOURCC_0xa9prf: /* Performers */ + case FOURCC_0xa9ope: /* Original Performer */ + case FOURCC_0xa9src: /* Providers Source Content */ + case FOURCC_0xa9wrt: /* Writer */ + case FOURCC_0xa9com: /* Composer */ + case FOURCC_WLOC: /* Window Location */ + /* TODO one day, but they aren't really meaningfull */ + break; + + default: + break; + } + free( psz_utf ); + } + return VLC_SUCCESS; } -#undef track + + case DEMUX_GET_TITLE_INFO: + case DEMUX_SET_NEXT_DEMUX_TIME: + case DEMUX_SET_GROUP: + return VLC_EGENERIC; + + default: + msg_Warn( p_demux, "control query %u unimplemented", i_query ); + return VLC_EGENERIC; } - return( 1 ); } /***************************************************************************** - * MP4End: frees unused data + * Close: frees unused data *****************************************************************************/ -static void __MP4End ( vlc_object_t * p_this ) +static void Close ( vlc_object_t * p_this ) { unsigned int i_track; - input_thread_t * p_input = (input_thread_t *)p_this; - demux_sys_t *p_demux = p_input->p_demux_data; + demux_t * p_demux = (demux_t *)p_this; + demux_sys_t *p_sys = p_demux->p_sys; + + msg_Dbg( p_demux, "freeing all memory" ); - msg_Dbg( p_input, "freeing all memory" ); - MP4_BoxFree( p_input, &p_demux->box_root ); - for( i_track = 0; i_track < p_demux->i_tracks; i_track++ ) + MP4_BoxFree( p_demux->s, p_sys->p_root ); + for( i_track = 0; i_track < p_sys->i_tracks; i_track++ ) { - MP4_TrackDestroy( p_input, &p_demux->track[i_track] ); + MP4_TrackDestroy( p_demux, &p_sys->track[i_track] ); } - FREE( p_demux->track ); + FREENULL( p_sys->track ); - FREE( p_input->p_demux_data ); + free( p_sys ); } + /**************************************************************************** * Local functions, specific to vlc ****************************************************************************/ /* now create basic chunk data, the rest will be filled by MP4_CreateSamplesIndex */ -static int TrackCreateChunksIndex( input_thread_t *p_input, - track_data_mp4_t *p_demux_track ) +static int TrackCreateChunksIndex( demux_t *p_demux, + mp4_track_t *p_demux_track ) { MP4_Box_t *p_co64; /* give offset for each chunk, same for stco and co64 */ MP4_Box_t *p_stsc; @@ -683,17 +912,24 @@ static int TrackCreateChunksIndex( input_thread_t *p_input, p_demux_track->i_chunk_count = p_co64->data.p_co64->i_entry_count; if( !p_demux_track->i_chunk_count ) { - msg_Warn( p_input, "no chunk defined" ); + msg_Warn( p_demux, "no chunk defined" ); return( VLC_EGENERIC ); } p_demux_track->chunk = calloc( p_demux_track->i_chunk_count, - sizeof( chunk_data_mp4_t ) ); + sizeof( mp4_chunk_t ) ); /* first we read chunk offset */ for( i_chunk = 0; i_chunk < p_demux_track->i_chunk_count; i_chunk++ ) { - p_demux_track->chunk[i_chunk].i_offset = - p_co64->data.p_co64->i_chunk_offset[i_chunk]; + mp4_chunk_t *ck = &p_demux_track->chunk[i_chunk]; + + ck->i_offset = p_co64->data.p_co64->i_chunk_offset[i_chunk]; + + ck->i_first_dts = 0; + ck->p_sample_count_dts = NULL; + ck->p_sample_delta_dts = NULL; + ck->p_sample_count_pts = NULL; + ck->p_sample_offset_pts = NULL; } /* now we read index for SampleEntry( soun vide mp4a mp4v ...) @@ -703,15 +939,14 @@ static int TrackCreateChunksIndex( input_thread_t *p_input, i_index = p_stsc->data.p_stsc->i_entry_count; if( !i_index ) { - msg_Warn( p_input, "cannot read chunk table or table empty" ); + msg_Warn( p_demux, "cannot read chunk table or table empty" ); return( VLC_EGENERIC ); } - while( i_index ) + while( i_index-- ) { - i_index--; for( i_chunk = p_stsc->data.p_stsc->i_first_chunk[i_index] - 1; - i_chunk < i_last; i_chunk++ ) + i_chunk < i_last; i_chunk++ ) { p_demux_track->chunk[i_chunk].i_sample_description_index = p_stsc->data.p_stsc->i_sample_description_index[i_index]; @@ -729,22 +964,18 @@ static int TrackCreateChunksIndex( input_thread_t *p_input, p_demux_track->chunk[i_chunk-1].i_sample_count; } - msg_Dbg( p_input, - "track[Id 0x%x] read %d chunk", - p_demux_track->i_track_ID, - p_demux_track->i_chunk_count ); + msg_Dbg( p_demux, "track[Id 0x%x] read %d chunk", + p_demux_track->i_track_ID, p_demux_track->i_chunk_count ); - return( VLC_SUCCESS ); + return VLC_SUCCESS; } -static int TrackCreateSamplesIndex( input_thread_t *p_input, - track_data_mp4_t *p_demux_track ) + +static int TrackCreateSamplesIndex( demux_t *p_demux, + mp4_track_t *p_demux_track ) { - MP4_Box_t *p_stts; /* makes mapping between sample and decoding time, - ctts make same mapping but for composition time, - not yet used and probably not usefull */ - MP4_Box_t *p_stsz; /* gives sample size of each samples, there is also stz2 - that uses a compressed form FIXME make them in libmp4 - as a unique type */ + MP4_Box_t *p_box; + MP4_Box_data_stsz_t *stsz; + MP4_Box_data_stts_t *stts; /* TODO use also stss and stsh table for seeking */ /* FIXME use edit table */ int64_t i_sample; @@ -755,23 +986,35 @@ static int TrackCreateSamplesIndex( input_thread_t *p_input, int64_t i_last_dts; - p_stts = MP4_BoxGet( p_demux_track->p_stbl, "stts" ); - p_stsz = MP4_BoxGet( p_demux_track->p_stbl, "stsz" ); /* FIXME and stz2 */ - - if( ( !p_stts )||( !p_stsz ) ) + /* Find stsz + * Gives the sample size for each samples. There is also a stz2 table + * (compressed form) that we need to implement TODO */ + p_box = MP4_BoxGet( p_demux_track->p_stbl, "stsz" ); + if( !p_box ) { - msg_Warn( p_input, "cannot read sample table" ); - return( VLC_EGENERIC ); + /* FIXME and stz2 */ + msg_Warn( p_demux, "cannot find STSZ box" ); + return VLC_EGENERIC; } + stsz = p_box->data.p_stsz; - p_demux_track->i_sample_count = p_stsz->data.p_stsz->i_sample_count; - + /* Find stts + * Gives mapping between sample and decoding time + */ + p_box = MP4_BoxGet( p_demux_track->p_stbl, "stts" ); + if( !p_box ) + { + msg_Warn( p_demux, "cannot find STTS box" ); + return VLC_EGENERIC; + } + stts = p_box->data.p_stts; - /* for sample size, there are 2 case */ - if( p_stsz->data.p_stsz->i_sample_size ) + /* Use stsz table to create a sample number -> sample size table */ + p_demux_track->i_sample_count = stsz->i_sample_count; + if( stsz->i_sample_size ) { /* 1: all sample have the same size, so no need to construct a table */ - p_demux_track->i_sample_size = p_stsz->data.p_stsz->i_sample_size; + p_demux_track->i_sample_size = stsz->i_sample_size; p_demux_track->p_sample_size = NULL; } else @@ -784,140 +1027,177 @@ static int TrackCreateSamplesIndex( input_thread_t *p_input, for( i_sample = 0; i_sample < p_demux_track->i_sample_count; i_sample++ ) { p_demux_track->p_sample_size[i_sample] = - p_stsz->data.p_stsz->i_entry_size[i_sample]; + stsz->i_entry_size[i_sample]; } } - /* we have extract all information from stsz, - now use stts */ - /* if we don't want to waste too much memory, we can't expand - the box !, so each chunk will contain an "extract" of this table - for fast research */ + /* Use stts table to create a sample number -> dts table. + * XXX: if we don't want to waste too much memory, we can't expand + * the box! so each chunk will contain an "extract" of this table + * for fast research (problem with raw stream where a sample is sometime + * just channels*bits_per_sample/8 */ i_last_dts = 0; - i_index = 0; i_index_sample_used =0; - - /* create and init last data for each chunk */ - for(i_chunk = 0 ; i_chunk < p_demux_track->i_chunk_count; i_chunk++ ) + 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 */ - p_demux_track->chunk[i_chunk].i_first_dts = i_last_dts; - /* count how many entries needed for this chunk - for p_sample_delta_dts and p_sample_count_dts */ + ck->i_first_dts = i_last_dts; - i_sample_count = p_demux_track->chunk[i_chunk].i_sample_count; + /* count how many entries are needed for this chunk + * for p_sample_delta_dts and p_sample_count_dts */ + i_sample_count = ck->i_sample_count; i_entry = 0; while( i_sample_count > 0 ) { - i_sample_count -= p_stts->data.p_stts->i_sample_count[i_index+i_entry]; + i_sample_count -= stts->i_sample_count[i_index+i_entry]; + /* don't count already used sample in this entry */ if( i_entry == 0 ) - { - i_sample_count += i_index_sample_used; /* don't count already used sample - int this entry */ - } + i_sample_count += i_index_sample_used; + i_entry++; } /* allocate them */ - p_demux_track->chunk[i_chunk].p_sample_count_dts = - calloc( i_entry, sizeof( uint32_t ) ); - p_demux_track->chunk[i_chunk].p_sample_delta_dts = - calloc( i_entry, sizeof( uint32_t ) ); + ck->p_sample_count_dts = calloc( i_entry, sizeof( uint32_t ) ); + ck->p_sample_delta_dts = calloc( i_entry, sizeof( uint32_t ) ); /* now copy */ - i_sample_count = p_demux_track->chunk[i_chunk].i_sample_count; + i_sample_count = ck->i_sample_count; for( i = 0; i < i_entry; i++ ) { int64_t i_used; int64_t i_rest; - i_rest = p_stts->data.p_stts->i_sample_count[i_index] - i_index_sample_used; + i_rest = stts->i_sample_count[i_index] - i_index_sample_used; i_used = __MIN( i_rest, i_sample_count ); i_index_sample_used += i_used; i_sample_count -= i_used; - p_demux_track->chunk[i_chunk].p_sample_count_dts[i] = i_used; - - p_demux_track->chunk[i_chunk].p_sample_delta_dts[i] = - p_stts->data.p_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 * - p_demux_track->chunk[i_chunk].p_sample_delta_dts[i]; + i_last_dts += i_used * ck->p_sample_delta_dts[i]; - if( i_index_sample_used >= - p_stts->data.p_stts->i_sample_count[i_index] ) + if( i_index_sample_used >= stts->i_sample_count[i_index] ) { - i_index++; i_index_sample_used = 0; } } + } + + /* Find ctts + * Gives the delta between decoding time (dts) and composition table (pts) + */ + p_box = MP4_BoxGet( p_demux_track->p_stbl, "ctts" ); + if( p_box ) + { + MP4_Box_data_ctts_t *ctts = p_box->data.p_ctts; + + msg_Warn( p_demux, "CTTS table" ); + + /* Create pts-dts table per chunk */ + 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; + + /* count how many entries are needed for this chunk + * for p_sample_delta_dts and p_sample_count_dts */ + i_sample_count = ck->i_sample_count; + + i_entry = 0; + while( i_sample_count > 0 ) + { + i_sample_count -= ctts->i_sample_count[i_index+i_entry]; + + /* don't count already used sample in this entry */ + if( i_entry == 0 ) + i_sample_count += i_index_sample_used; + + i_entry++; + } + + /* allocate them */ + ck->p_sample_count_pts = calloc( i_entry, sizeof( uint32_t ) ); + ck->p_sample_offset_pts = calloc( i_entry, sizeof( int32_t ) ); + + /* now copy */ + i_sample_count = ck->i_sample_count; + for( i = 0; i < i_entry; i++ ) + { + int64_t i_used; + int64_t i_rest; + + i_rest = ctts->i_sample_count[i_index] - + i_index_sample_used; + i_used = __MIN( i_rest, i_sample_count ); + + i_index_sample_used += i_used; + i_sample_count -= i_used; + + ck->p_sample_count_pts[i] = i_used; + ck->p_sample_offset_pts[i] = ctts->i_sample_offset[i_index]; + + if( i_index_sample_used >= ctts->i_sample_count[i_index] ) + { + i_index++; + i_index_sample_used = 0; + } + } + } } - msg_Dbg( p_input, - "track[Id 0x%x] read %d samples length:"I64Fd"s", - p_demux_track->i_track_ID, - p_demux_track->i_sample_count, + msg_Dbg( p_demux, "track[Id 0x%x] read %d samples length:"I64Fd"s", + p_demux_track->i_track_ID, p_demux_track->i_sample_count, i_last_dts / p_demux_track->i_timescale ); - return( VLC_SUCCESS ); + return VLC_SUCCESS; } /* * TrackCreateES: - * Create ES and PES to init decoder if needed, for a track starting at i_chunk + * Create ES and PES to init decoder if needed, for a track starting at i_chunk */ -static int TrackCreateES ( input_thread_t *p_input, - track_data_mp4_t *p_track, - unsigned int i_chunk, - es_descriptor_t **pp_es, - pes_packet_t **pp_pes ) +static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, + unsigned int i_chunk, es_out_id_t **pp_es ) { - MP4_Box_t * p_sample; - unsigned int i; - char psz_lang[4]; - - unsigned int i_decoder_specific_info_len; - uint8_t * p_decoder_specific_info; - - es_descriptor_t *p_es; - pes_packet_t *p_pes_init; - - uint8_t *p_init; - BITMAPINFOHEADER *p_bih; - WAVEFORMATEX *p_wf; - + MP4_Box_t *p_sample; MP4_Box_t *p_esds; + MP4_Box_t *p_box; + + *pp_es = NULL; if( !p_track->chunk[i_chunk].i_sample_description_index ) { - msg_Warn( p_input, - "invalid SampleEntry index (track[Id 0x%x])", + msg_Warn( p_demux, "invalid SampleEntry index (track[Id 0x%x])", p_track->i_track_ID ); - return( VLC_EGENERIC ); + return VLC_EGENERIC; } - p_sample = MP4_BoxGet( p_track->p_stsd, - "[%d]", + p_sample = MP4_BoxGet( p_track->p_stsd, "[%d]", p_track->chunk[i_chunk].i_sample_description_index - 1 ); - if( !p_sample || !p_sample->data.p_data ) + if( !p_sample || + ( !p_sample->data.p_data && p_track->fmt.i_cat != SPU_ES ) ) { - msg_Warn( p_input, - "cannot find SampleEntry (track[Id 0x%x])", + msg_Warn( p_demux, "cannot find SampleEntry (track[Id 0x%x])", p_track->i_track_ID ); - return( VLC_EGENERIC ); + return VLC_EGENERIC; } p_track->p_sample = p_sample; - if( p_track->i_sample_size == 1 ) + if( p_track->fmt.i_cat == AUDIO_ES && p_track->i_sample_size == 1 ) { MP4_Box_data_sample_soun_t *p_soun; @@ -948,52 +1228,73 @@ static int TrackCreateES ( input_thread_t *p_input, p_soun->i_bytes_per_frame = 2 * p_soun->i_channelcount; p_soun->i_bytes_per_sample = 2; break; + case VLC_FOURCC( 'a', 'l', 'a', 'w' ): + case VLC_FOURCC( 'u', 'l', 'a', 'w' ): + p_soun->i_samplesize = 8; + break; default: break; } - } - } - /* Initialise ES, first language as description */ - for( i = 0; i < 3; i++ ) - { - psz_lang[i] = p_track->i_language[i]; + } + else if( p_soun->i_qt_version == 1 && p_soun->i_sample_per_packet <= 0 ) + { + p_soun->i_qt_version = 0; + } } - psz_lang[3] = '\0'; - - vlc_mutex_lock( &p_input->stream.stream_lock ); - p_es = input_AddES( p_input, p_input->stream.p_selected_program, - p_track->i_track_ID, p_track->i_cat, psz_lang, 0 ); - vlc_mutex_unlock( &p_input->stream.stream_lock ); - p_es->i_stream_id = p_track->i_track_ID; /* 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_es->i_fourcc = VLC_FOURCC( 'm', 'p', 'g', 'a' ); + p_track->fmt.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'a' ); break; + case( VLC_FOURCC( 'r', 'a', 'w', ' ' ) ): - p_es->i_fourcc = VLC_FOURCC( 'a', '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_es->i_fourcc = VLC_FOURCC( 'h', '2', '6', '3' ); + p_track->fmt.i_codec = VLC_FOURCC( 'h', '2', '6', '3' ); break; + + case( VLC_FOURCC( 't', 'e', 'x', 't' ) ): + case( VLC_FOURCC( 't', 'x', '3', 'g' ) ): + 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" ); + break; + default: - p_es->i_fourcc = p_sample->i_type; + p_track->fmt.i_codec = p_sample->i_type; break; } - i_decoder_specific_info_len = 0; - p_decoder_specific_info = NULL; - p_pes_init = NULL; - /* now see if esds is present and if so create a data packet with decoder_specific_info */ #define p_decconfig p_esds->data.p_esds->es_descriptor.p_decConfigDescr - if( ( p_esds = MP4_BoxGet( p_sample, "esds" ) )&& + if( ( ( p_esds = MP4_BoxGet( p_sample, "esds" ) ) || + ( p_esds = MP4_BoxGet( p_sample, "wave/esds" ) ) )&& ( p_esds->data.p_esds )&& ( p_decconfig ) ) { @@ -1001,10 +1302,10 @@ static int TrackCreateES ( input_thread_t *p_input, switch( p_decconfig->i_objectTypeIndication ) { case( 0x20 ): /* MPEG4 VIDEO */ - p_es->i_fourcc = VLC_FOURCC( 'm','p','4','v' ); + p_track->fmt.i_codec = VLC_FOURCC( 'm','p','4','v' ); break; case( 0x40): - p_es->i_fourcc = VLC_FOURCC( 'm','p','4','a' ); + p_track->fmt.i_codec = VLC_FOURCC( 'm','p','4','a' ); break; case( 0x60): case( 0x61): @@ -1012,39 +1313,55 @@ static int TrackCreateES ( input_thread_t *p_input, case( 0x63): case( 0x64): case( 0x65): /* MPEG2 video */ - p_es->i_fourcc = VLC_FOURCC( 'm','p','g','v' ); + p_track->fmt.i_codec = VLC_FOURCC( 'm','p','g','v' ); break; /* Theses are MPEG2-AAC */ case( 0x66): /* main profile */ case( 0x67): /* Low complexity profile */ case( 0x68): /* Scaleable Sampling rate profile */ - p_es->i_fourcc = VLC_FOURCC( 'm','p','4','a' ); + p_track->fmt.i_codec = VLC_FOURCC( 'm','p','4','a' ); break; /* true MPEG 2 audio */ case( 0x69): - p_es->i_fourcc = VLC_FOURCC( 'm','p','g','a' ); + p_track->fmt.i_codec = VLC_FOURCC( 'm','p','g','a' ); break; case( 0x6a): /* MPEG1 video */ - p_es->i_fourcc = VLC_FOURCC( 'm','p','g','v' ); + p_track->fmt.i_codec = VLC_FOURCC( 'm','p','g','v' ); break; case( 0x6b): /* MPEG1 audio */ - p_es->i_fourcc = VLC_FOURCC( 'm','p','g','a' ); + p_track->fmt.i_codec = VLC_FOURCC( 'm','p','g','a' ); break; case( 0x6c ): /* jpeg */ - p_es->i_fourcc = VLC_FOURCC( 'j','p','e','g' ); + p_track->fmt.i_codec = VLC_FOURCC( 'j','p','e','g' ); break; + + /* Private ID */ + case( 0xe0 ): /* NeroDigital: dvd subs */ + 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 */ default: /* Unknown entry, but don't touch i_fourcc */ - msg_Warn( p_input, + msg_Warn( p_demux, "unknown objectTypeIndication(0x%x) (Track[ID 0x%x])", p_decconfig->i_objectTypeIndication, p_track->i_track_ID ); break; } - i_decoder_specific_info_len = - p_decconfig->i_decoder_specific_info_len; - p_decoder_specific_info = - p_decconfig->p_decoder_specific_info; + p_track->fmt.i_extra = p_decconfig->i_decoder_specific_info_len; + if( p_track->fmt.i_extra > 0 ) + { + p_track->fmt.p_extra = malloc( p_track->fmt.i_extra ); + memcpy( p_track->fmt.p_extra, p_decconfig->p_decoder_specific_info, + p_track->fmt.i_extra ); + } } else { @@ -1052,16 +1369,55 @@ static int TrackCreateES ( input_thread_t *p_input, { /* qt decoder, send the complete chunk */ case VLC_FOURCC( 'S', 'V', 'Q', '3' ): + case VLC_FOURCC( 'S', 'V', 'Q', '1' ): + case VLC_FOURCC( 'V', 'P', '3', '1' ): + case VLC_FOURCC( '3', 'I', 'V', '1' ): case VLC_FOURCC( 'Z', 'y', 'G', 'o' ): - i_decoder_specific_info_len = p_sample->data.p_sample_vide->i_qt_image_description; - p_decoder_specific_info = p_sample->data.p_sample_vide->p_qt_image_description; + p_track->fmt.i_extra = + p_sample->data.p_sample_vide->i_qt_image_description; + if( p_track->fmt.i_extra > 0 ) + { + p_track->fmt.p_extra = malloc( p_track->fmt.i_extra ); + memcpy( p_track->fmt.p_extra, + p_sample->data.p_sample_vide->p_qt_image_description, + p_track->fmt.i_extra); + } break; case VLC_FOURCC( 'Q', 'D', 'M', 'C' ): case VLC_FOURCC( 'Q', 'D', 'M', '2' ): case VLC_FOURCC( 'Q', 'c', 'l', 'p' ): - i_decoder_specific_info_len = p_sample->data.p_sample_soun->i_qt_description; - p_decoder_specific_info = p_sample->data.p_sample_soun->p_qt_description; + case VLC_FOURCC( 's', 'a', 'm', 'r' ): + case VLC_FOURCC( 'a', 'l', 'a', 'c' ): + p_track->fmt.i_extra = + p_sample->data.p_sample_soun->i_qt_description; + if( p_track->fmt.i_extra > 0 ) + { + p_track->fmt.p_extra = malloc( p_track->fmt.i_extra ); + memcpy( p_track->fmt.p_extra, + p_sample->data.p_sample_soun->p_qt_description, + p_track->fmt.i_extra); + } + break; + + /* avc1: send avcC (h264 without annexe B, ie without start code)*/ + case VLC_FOURCC( 'a', 'v', 'c', '1' ): + { + MP4_Box_t *p_avcC = MP4_BoxGet( p_sample, "avcC" ); + + 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 ); + } + else + { + msg_Err( p_demux, "missing avcC" ); + } break; + } + default: break; } @@ -1070,152 +1426,124 @@ static int TrackCreateES ( input_thread_t *p_input, #undef p_decconfig /* some last initialisation */ - /* XXX I create a bitmapinfoheader_t or - waveformatex_t for each stream, up to now it's the best thing - I've found but it could exist a better solution :) as something - like adding some new fields in p_es ... - - XXX I don't set all values, only thoses that are interesting or known - --> bitmapinfoheader_t : width and height - --> waveformatex_t : channels, samplerate, bitspersample - and at the end I add p_decoder_specific_info - - TODO set more values - - */ - - switch( p_track->i_cat ) - { - case( VIDEO_ES ): - /* now create a bitmapinfoheader_t for decoder and - add information found in p_esds */ - /* XXX XXX + 16 are for avoid segfault when ffmpeg access beyong the data */ - p_init = malloc( sizeof( BITMAPINFOHEADER ) + i_decoder_specific_info_len + 16 ); - p_bih = (BITMAPINFOHEADER*)p_init; - - p_bih->biSize = sizeof( BITMAPINFOHEADER ) + i_decoder_specific_info_len; - p_bih->biWidth = p_sample->data.p_sample_vide->i_width; - p_bih->biHeight = p_sample->data.p_sample_vide->i_height; - p_bih->biPlanes = 1; // FIXME - p_bih->biBitCount = 0; // FIXME - p_bih->biCompression = 0; // FIXME - p_bih->biSizeImage = 0; // FIXME - p_bih->biXPelsPerMeter = 0; // FIXME - p_bih->biYPelsPerMeter = 0; // FIXME - p_bih->biClrUsed = 0; // FIXME - p_bih->biClrImportant = 0; // FIXME - - if( p_bih->biWidth == 0 ) - { - // fall on display size - p_bih->biWidth = p_track->i_width; - } - if( p_bih->biHeight == 0 ) - { - // fall on display size - p_bih->biHeight = p_track->i_height; - } - - if( i_decoder_specific_info_len ) - { - data_packet_t *p_data; - - memcpy( p_init + sizeof( BITMAPINFOHEADER ), - p_decoder_specific_info, - i_decoder_specific_info_len); - - /* If stream is mpeg4 video we send specific_info, - as it's needed to decode it (vol) */ - switch( p_es->i_fourcc ) - { - case VLC_FOURCC( 'm','p','4','v' ): - case VLC_FOURCC( 'D','I','V','X' ): - case VLC_FOURCC( 'd','i','v','x' ): - p_pes_init = input_NewPES( p_input->p_method_data ); - p_data = input_NewPacket( p_input->p_method_data, - i_decoder_specific_info_len); - p_data->p_payload_end = p_data->p_payload_start + i_decoder_specific_info_len; - - memcpy( p_data->p_payload_start, - p_decoder_specific_info, - i_decoder_specific_info_len ); - p_pes_init->i_dts = p_pes_init->i_pts = 0; - p_pes_init->p_first = p_pes_init->p_last = p_data; - p_pes_init->i_nb_data = 1; - p_pes_init->i_pes_size = i_decoder_specific_info_len; - break; - default: - break; - } - - } - 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_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]; + } - case( AUDIO_ES ): - p_init = malloc( sizeof( WAVEFORMATEX ) + i_decoder_specific_info_len + 16 ); - p_wf = (WAVEFORMATEX*)p_init; - - p_wf->wFormatTag = 1; - p_wf->nChannels = p_sample->data.p_sample_soun->i_channelcount; - p_wf->nSamplesPerSec = p_sample->data.p_sample_soun->i_sampleratehi; - p_wf->nAvgBytesPerSec = p_sample->data.p_sample_soun->i_channelcount * - p_sample->data.p_sample_soun->i_sampleratehi * - p_sample->data.p_sample_soun->i_samplesize / 8; - p_wf->nBlockAlign = 0; - p_wf->wBitsPerSample = p_sample->data.p_sample_soun->i_samplesize; - p_wf->cbSize = i_decoder_specific_info_len; - - if( i_decoder_specific_info_len ) - { - memcpy( p_init + sizeof( WAVEFORMATEX ), - p_decoder_specific_info, - i_decoder_specific_info_len); - } + break; - 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: - p_init = NULL; - break; - } - if( p_es->i_cat == AUDIO_ES ) - { - p_es->p_bitmapinfoheader = NULL; - p_es->p_waveformatex = (void*)p_init; - } - else if( p_es->i_cat == VIDEO_ES ) - { - p_es->p_bitmapinfoheader = (void*)p_init; - p_es->p_waveformatex = NULL; + default: + break; } - *pp_es = p_es; - *pp_pes = p_pes_init; - return( VLC_SUCCESS ); + *pp_es = es_out_Add( p_demux->out, &p_track->fmt ); + + return VLC_SUCCESS; } -/* given a time it return sample/chunk */ -static int TrackTimeToSampleChunk( input_thread_t *p_input, - track_data_mp4_t *p_track, - uint64_t i_start, - uint32_t *pi_chunk, - uint32_t *pi_sample ) +/* given a time it return sample/chunk + * it also update elst field of the track + */ +static int TrackTimeToSampleChunk( demux_t *p_demux, mp4_track_t *p_track, + int64_t i_start, uint32_t *pi_chunk, + uint32_t *pi_sample ) { - MP4_Box_t *p_stss; + demux_sys_t *p_sys = p_demux->p_sys; + MP4_Box_t *p_stss; uint64_t i_dts; unsigned int i_sample; unsigned int i_chunk; int i_index; - /* convert absolute time to in timescale unit */ - i_start = i_start * (mtime_t)p_track->i_timescale / (mtime_t)1000000; - /* FIXME see if it's needed to check p_track->i_chunk_count */ if( !p_track->b_ok || p_track->i_chunk_count == 0 ) { return( VLC_EGENERIC ); } + /* handle elst (find the correct one) */ + MP4_TrackSetELST( p_demux, p_track, i_start ); + if( p_track->p_elst && p_track->p_elst->data.p_elst->i_entry_count > 0 ) + { + MP4_Box_data_elst_t *elst = p_track->p_elst->data.p_elst; + int64_t i_mvt= i_start * p_sys->i_timescale / (int64_t)1000000; + + /* now calculate i_start for this elst */ + /* offset */ + i_start -= p_track->i_elst_time * I64C(1000000) / p_sys->i_timescale; + if( i_start < 0 ) + { + *pi_chunk = 0; + *pi_sample= 0; + + return VLC_SUCCESS; + } + /* to track time scale */ + i_start = i_start * p_track->i_timescale / (int64_t)1000000; + /* add elst offset */ + if( ( elst->i_media_rate_integer[p_track->i_elst] > 0 || + elst->i_media_rate_fraction[p_track->i_elst] > 0 ) && + elst->i_media_time[p_track->i_elst] > 0 ) + { + i_start += elst->i_media_time[p_track->i_elst]; + } + + msg_Dbg( p_demux, "elst (%d) gives "I64Fd"ms (movie)-> "I64Fd + "ms (track)", p_track->i_elst, + i_mvt * 1000 / p_sys->i_timescale, + i_start * 1000 / p_track->i_timescale ); + } + else + { + /* convert absolute time to in timescale unit */ + i_start = i_start * p_track->i_timescale / (int64_t)1000000; + } + /* we start from sample 0/chunk 0, hope it won't take too much time */ /* *** find good chunk *** */ for( i_chunk = 0; ; i_chunk++ ) @@ -1228,8 +1556,8 @@ static int TrackTimeToSampleChunk( input_thread_t *p_input, 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; } @@ -1242,7 +1570,7 @@ static int TrackTimeToSampleChunk( input_thread_t *p_input, { 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] * @@ -1257,15 +1585,16 @@ static int TrackTimeToSampleChunk( input_thread_t *p_input, { break; } - i_sample += ( i_start - i_dts ) / p_track->chunk[i_chunk].p_sample_delta_dts[i_index]; + i_sample += ( i_start - i_dts ) / + p_track->chunk[i_chunk].p_sample_delta_dts[i_index]; break; } } if( i_sample >= p_track->i_sample_count ) { - msg_Warn( p_input, - "track[Id 0x%x] will be disabled (seeking too far) chunk=%d sample=%d", + msg_Warn( p_demux, "track[Id 0x%x] will be disabled " + "(seeking too far) chunk=%d sample=%d", p_track->i_track_ID, i_chunk, i_sample ); return( VLC_EGENERIC ); } @@ -1275,7 +1604,7 @@ static int TrackTimeToSampleChunk( input_thread_t *p_input, if( ( p_stss = MP4_BoxGet( p_track->p_stbl, "stss" ) ) ) { unsigned int i_index; - msg_Dbg( p_input, + 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++ ) @@ -1284,7 +1613,7 @@ static int TrackTimeToSampleChunk( input_thread_t *p_input, { if( i_index > 0 ) { - msg_Dbg( p_input, "stts gives %d --> %d (sample number)", + 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]; @@ -1297,14 +1626,14 @@ static int TrackTimeToSampleChunk( input_thread_t *p_input, } else { - msg_Dbg( p_input, "stts gives %d --> %d (sample number)", + 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 ) + p_track->chunk[i_chunk].i_sample_count ) { i_chunk++; } @@ -1315,88 +1644,58 @@ static int TrackTimeToSampleChunk( input_thread_t *p_input, } else { - msg_Dbg( p_input, - "track[Id 0x%x] does not provide Sync Sample Box (stss)", - p_track->i_track_ID ); + msg_Dbg( p_demux, "track[Id 0x%x] does not provide Sync " + "Sample Box (stss)", p_track->i_track_ID ); } - if( pi_chunk ) *pi_chunk = i_chunk; - if( pi_sample ) *pi_sample = i_sample; - return( VLC_SUCCESS ); + *pi_chunk = i_chunk; + *pi_sample = i_sample; + + return VLC_SUCCESS; } -static int TrackGotoChunkSample( input_thread_t *p_input, - track_data_mp4_t *p_track, - unsigned int i_chunk, - unsigned int i_sample ) +static int TrackGotoChunkSample( demux_t *p_demux, mp4_track_t *p_track, + unsigned int i_chunk, unsigned int i_sample ) { + 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 || + 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_input, "Recreate ES" ); + msg_Warn( p_demux, "recreate ES for track[Id 0x%x]", + p_track->i_track_ID ); - /* no :( recreate es */ - vlc_mutex_lock( &p_input->stream.stream_lock ); - input_DelES( p_input, p_track->p_es ); - vlc_mutex_unlock( &p_input->stream.stream_lock ); + es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, + p_track->p_es, &b_reselect ); - if( p_track->p_pes_init ) - { - input_DeletePES( p_input->p_method_data, p_track->p_pes_init ); - } + es_out_Del( p_demux->out, p_track->p_es ); - if( TrackCreateES( p_input, - p_track, i_chunk, - &p_track->p_es, - &p_track->p_pes_init ) ) + p_track->p_es = NULL; + + if( TrackCreateES( p_demux, p_track, i_chunk, &p_track->p_es ) ) { - msg_Err( p_input, "cannot create es for track[Id 0x%x]", + msg_Err( p_demux, "cannot create es for track[Id 0x%x]", p_track->i_track_ID ); p_track->b_ok = VLC_FALSE; p_track->b_selected = VLC_FALSE; - return( VLC_EGENERIC ); + return VLC_EGENERIC; } } /* select again the new decoder */ - if( p_track->b_selected && p_track->p_es && p_track->p_es->p_decoder_fifo == NULL ) + if( b_reselect ) { - vlc_mutex_lock( &p_input->stream.stream_lock ); - input_SelectES( p_input, p_track->p_es ); - vlc_mutex_unlock( &p_input->stream.stream_lock ); - - if( p_track->p_es->p_decoder_fifo ) - { - if( p_track->p_pes_init != NULL ) - { - p_track->p_pes_init->i_rate = p_input->stream.control.i_rate; - - input_DecodePES( p_track->p_es->p_decoder_fifo, - p_track->p_pes_init ); - p_track->p_pes_init = NULL; - } - p_track->b_selected = VLC_TRUE; - } - else - { - msg_Dbg( p_input, "Argg cannot select this stream" ); - if( p_track->p_pes_init != NULL ) - { - input_DeletePES( p_input->p_method_data, p_track->p_pes_init ); - p_track->p_pes_init = NULL; - } - p_track->b_selected = VLC_FALSE; - } + es_out_Control( p_demux->out, ES_OUT_SET_ES, p_track->p_es ); } p_track->i_chunk = i_chunk; p_track->i_sample = i_sample; - return( p_track->b_selected ? VLC_SUCCESS : VLC_EGENERIC ); + return p_track->b_selected ? VLC_SUCCESS : VLC_EGENERIC; } /**************************************************************************** @@ -1405,30 +1704,35 @@ static int TrackGotoChunkSample( input_thread_t *p_input, * Parse track information and create all needed data to run a track * If it succeed b_ok is set to 1 else to 0 ****************************************************************************/ -static void MP4_TrackCreate( input_thread_t *p_input, - track_data_mp4_t *p_track, - MP4_Box_t * p_box_trak ) +static void MP4_TrackCreate( demux_t *p_demux, mp4_track_t *p_track, + MP4_Box_t *p_box_trak ) { - unsigned int i; + demux_sys_t *p_sys = p_demux->p_sys; MP4_Box_t *p_tkhd = MP4_BoxGet( p_box_trak, "tkhd" ); MP4_Box_t *p_tref = MP4_BoxGet( p_box_trak, "tref" ); MP4_Box_t *p_elst; MP4_Box_t *p_mdhd; + MP4_Box_t *p_udta; MP4_Box_t *p_hdlr; MP4_Box_t *p_vmhd; MP4_Box_t *p_smhd; - /* hint track unsuported */ + MP4_Box_t *p_drms; + + unsigned int i; + char language[4]; + + /* hint track unsupported */ /* set default value (-> track unusable) */ p_track->b_ok = VLC_FALSE; p_track->b_enable = VLC_FALSE; p_track->b_selected = VLC_FALSE; - p_track->i_cat = UNKNOWN_ES; + es_format_Init( &p_track->fmt, UNKNOWN_ES, 0 ); if( !p_tkhd ) { @@ -1443,14 +1747,9 @@ static void MP4_TrackCreate( input_thread_t *p_input, p_track->i_width = p_tkhd->data.p_tkhd->i_width / 65536; p_track->i_height = p_tkhd->data.p_tkhd->i_height / 65536; - if( ( p_elst = MP4_BoxGet( p_box_trak, "edts/elst" ) ) ) - { -/* msg_Warn( p_input, "unhandled box: edts --> FIXME" ); */ - } - if( p_tref ) { -/* msg_Warn( p_input, "unhandled box: tref --> FIXME" ); */ +/* msg_Warn( p_demux, "unhandled box: tref --> FIXME" ); */ } p_mdhd = MP4_BoxGet( p_box_trak, "mdia/mdhd" ); @@ -1465,9 +1764,9 @@ static void MP4_TrackCreate( input_thread_t *p_input, for( i = 0; i < 3; i++ ) { - p_track->i_language[i] = p_mdhd->data.p_mdhd->i_language[i]; + language[i] = p_mdhd->data.p_mdhd->i_language[i]; } - p_mdhd->data.p_mdhd->i_language[3] = 0; + language[3] = '\0'; switch( p_hdlr->data.p_hdlr->i_handler_type ) { @@ -1476,7 +1775,7 @@ static void MP4_TrackCreate( input_thread_t *p_input, { return; } - p_track->i_cat = AUDIO_ES; + p_track->fmt.i_cat = AUDIO_ES; break; case( FOURCC_vide ): @@ -1484,76 +1783,107 @@ static void MP4_TrackCreate( input_thread_t *p_input, { return; } - p_track->i_cat = VIDEO_ES; + p_track->fmt.i_cat = VIDEO_ES; + break; + + case( FOURCC_text ): + case( FOURCC_subp ): + case( FOURCC_tx3g ): + p_track->fmt.i_cat = SPU_ES; break; default: return; } + + p_track->i_elst = 0; + p_track->i_elst_time = 0; + 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; + unsigned int i; + + msg_Warn( p_demux, "elst box found" ); + for( i = 0; i < elst->i_entry_count; i++ ) + { + msg_Dbg( p_demux, " - [%d] duration="I64Fd"ms media time="I64Fd + "ms) rate=%d.%d", i, + elst->i_segment_duration[i] * 1000 / p_sys->i_timescale, + elst->i_media_time[i] >= 0 ? + (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] ); + } + } + + /* TODO add support for: p_dinf = MP4_BoxGet( p_minf, "dinf" ); */ - if( !( p_track->p_stbl = MP4_BoxGet( p_box_trak,"mdia/minf/stbl" ) ) ) + if( !( p_track->p_stbl = MP4_BoxGet( p_box_trak,"mdia/minf/stbl" ) ) || + !( p_track->p_stsd = MP4_BoxGet( p_box_trak,"mdia/minf/stbl/stsd") ) ) { return; } - if( !( p_track->p_stsd = MP4_BoxGet( p_box_trak,"mdia/minf/stbl/stsd") ) ) + p_drms = MP4_BoxGet( p_track->p_stsd, "drms" ); + p_track->b_drms = p_drms != NULL; + p_track->p_drms = p_track->b_drms ? + p_drms->data.p_sample_soun->p_drms : NULL; + + /* Set language */ + if( strcmp( language, "```" ) && strcmp( language, "und" ) ) { - return; + p_track->fmt.psz_language = strdup( language ); } - /* fxi i_timescale for AUDIO_ES with i_qt_version == 0 */ - if( p_track->i_cat == AUDIO_ES ) //&& p_track->i_sample_size == 1 ) + p_udta = MP4_BoxGet( p_box_trak, "udta" ); + if( p_udta ) { - 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_t *p_0xa9xxx; + for( p_0xa9xxx = p_udta->p_first; p_0xa9xxx != NULL; + p_0xa9xxx = p_0xa9xxx->p_next ) { - 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 ) + switch( p_0xa9xxx->i_type ) { - msg_Warn( p_input, "i_timescale != i_sampleratehi with qt_version == 0\nMaking both equal ? (report any problem)" ); - p_track->i_timescale = p_soun->i_sampleratehi; + case FOURCC_0xa9nam: + p_track->fmt.psz_description = + strdup( p_0xa9xxx->data.p_0xa9xxx->psz_text ); + break; } } } - - /* Create chunk index table */ - if( TrackCreateChunksIndex( p_input,p_track ) ) + /* Create chunk index table and sample index table */ + if( TrackCreateChunksIndex( p_demux,p_track ) || + TrackCreateSamplesIndex( p_demux, p_track ) ) { return; /* cannot create chunks index */ } - /* create sample index table needed for reading and seeking */ - if( TrackCreateSamplesIndex( p_input, p_track ) ) - { - return; /* cannot create samples index */ - } - p_track->i_chunk = 0; p_track->i_sample = 0; - /* now create es but does not select it */ - /* XXX needed else vlc won't know this track exist */ - if( TrackCreateES( p_input, + + /* now create es */ + if( TrackCreateES( p_demux, p_track, p_track->i_chunk, - &p_track->p_es, - &p_track->p_pes_init ) ) + &p_track->p_es ) ) { - msg_Err( p_input, "cannot create es for track[Id 0x%x]", + msg_Err( p_demux, "cannot create es for track[Id 0x%x]", p_track->i_track_ID ); return; } + #if 0 { int i; - for( i = 0; i < p_track->i_chunk_count; i++ ) { - fprintf( stderr, "%-5d sample_count=%d pts=%lld\n", i, p_track->chunk[i].i_sample_count, p_track->chunk[i].i_first_dts ); + fprintf( stderr, "%-5d sample_count=%d pts=%lld\n", + i, p_track->chunk[i].i_sample_count, + p_track->chunk[i].i_first_dts ); } } @@ -1566,8 +1896,7 @@ static void MP4_TrackCreate( input_thread_t *p_input, **************************************************************************** * Destroy a track created by MP4_TrackCreate. ****************************************************************************/ -static void MP4_TrackDestroy( input_thread_t *p_input, - track_data_mp4_t *p_track ) +static void MP4_TrackDestroy( demux_t *p_demux, mp4_track_t *p_track ) { unsigned int i_chunk; @@ -1575,71 +1904,46 @@ static void MP4_TrackDestroy( input_thread_t *p_input, p_track->b_enable = VLC_FALSE; p_track->b_selected = VLC_FALSE; - p_track->i_cat = UNKNOWN_ES; - - if( p_track->p_pes_init ) - { - input_DeletePES( p_input->p_method_data, p_track->p_pes_init ); - } + es_format_Clean( &p_track->fmt ); for( i_chunk = 0; i_chunk < p_track->i_chunk_count; i_chunk++ ) { 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 ); + + 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 ( input_thread_t *p_input, - track_data_mp4_t *p_track, - mtime_t i_start ) +static int MP4_TrackSelect( demux_t *p_demux, mp4_track_t *p_track, + mtime_t i_start ) { - uint32_t i_chunk; - uint32_t i_sample; - if( !p_track->b_ok ) { - return( VLC_EGENERIC ); + return VLC_EGENERIC; } if( p_track->b_selected ) { - msg_Warn( p_input, - "track[Id 0x%x] already selected", - p_track->i_track_ID ); - return( VLC_SUCCESS ); - } - - if( TrackTimeToSampleChunk( p_input, - p_track, i_start, - &i_chunk, &i_sample ) ) - { - msg_Warn( p_input, - "cannot select track[Id 0x%x]", + msg_Warn( p_demux, "track[Id 0x%x] already selected", p_track->i_track_ID ); - return( VLC_EGENERIC ); - } - - p_track->b_selected = VLC_TRUE; - - if( TrackGotoChunkSample( p_input, p_track, i_chunk, i_sample ) ) - { - p_track->b_selected = VLC_FALSE; + return VLC_SUCCESS; } - return( p_track->b_selected ? VLC_SUCCESS : VLC_EGENERIC ); + return MP4_TrackSeek( p_demux, p_track, i_start ); } -static void MP4_TrackUnselect(input_thread_t *p_input, - track_data_mp4_t *p_track ) +static void MP4_TrackUnselect( demux_t *p_demux, mp4_track_t *p_track ) { if( !p_track->b_ok ) { @@ -1648,25 +1952,21 @@ static void MP4_TrackUnselect(input_thread_t *p_input, if( !p_track->b_selected ) { - msg_Warn( p_input, - "track[Id 0x%x] already unselected", + msg_Warn( p_demux, "track[Id 0x%x] already unselected", p_track->i_track_ID ); return; } - - if( p_track->p_es->p_decoder_fifo ) + if( p_track->p_es ) { - vlc_mutex_lock( &p_input->stream.stream_lock ); - input_UnselectES( p_input, p_track->p_es ); - vlc_mutex_unlock( &p_input->stream.stream_lock ); + es_out_Control( p_demux->out, ES_OUT_SET_ES_STATE, + p_track->p_es, VLC_FALSE ); } p_track->b_selected = VLC_FALSE; } -static int MP4_TrackSeek ( input_thread_t *p_input, - track_data_mp4_t *p_track, - mtime_t i_start ) +static int MP4_TrackSeek( demux_t *p_demux, mp4_track_t *p_track, + mtime_t i_start ) { uint32_t i_chunk; uint32_t i_sample; @@ -1676,33 +1976,37 @@ static int MP4_TrackSeek ( input_thread_t *p_input, return( VLC_EGENERIC ); } - if( TrackTimeToSampleChunk( p_input, - p_track, i_start, + p_track->b_selected = VLC_FALSE; + + if( TrackTimeToSampleChunk( p_demux, p_track, i_start, &i_chunk, &i_sample ) ) { - msg_Warn( p_input, - "cannot select track[Id 0x%x]", + msg_Warn( p_demux, "cannot select track[Id 0x%x]", p_track->i_track_ID ); return( VLC_EGENERIC ); } p_track->b_selected = VLC_TRUE; - TrackGotoChunkSample( p_input, p_track, i_chunk, i_sample ); + if( TrackGotoChunkSample( p_demux, p_track, i_chunk, i_sample ) == + VLC_SUCCESS ) + { + p_track->b_selected = VLC_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 ); } - - - /* * 3 types: for audio * */ -#define QT_V0_MAX_SAMPLES 1500 -static int MP4_TrackSampleSize( track_data_mp4_t *p_track ) +#define QT_V0_MAX_SAMPLES 1024 +static int MP4_TrackSampleSize( mp4_track_t *p_track ) { int i_size; MP4_Box_data_sample_soun_t *p_soun; @@ -1710,58 +2014,58 @@ static int MP4_TrackSampleSize( track_data_mp4_t *p_track ) if( p_track->i_sample_size == 0 ) { /* most simple case */ - return( p_track->p_sample_size[p_track->i_sample] ); - } - if( p_track->i_cat != AUDIO_ES ) - { - return( p_track->i_sample_size ); + return p_track->p_sample_size[p_track->i_sample]; } - - if( p_track->i_sample_size != 1 ) + if( p_track->fmt.i_cat != AUDIO_ES ) { - //msg_Warn( p_input, "SampleSize != 1" ); - return( p_track->i_sample_size ); + return p_track->i_sample_size; } p_soun = p_track->p_sample->data.p_sample_soun; 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; + i_size = p_track->chunk[p_track->i_chunk].i_sample_count / + p_soun->i_sample_per_packet * p_soun->i_bytes_per_frame; + } + else if( p_track->i_sample_size > 256 ) + { + /* We do that so we don't read too much data + * (in this case we are likely dealing with compressed data) */ + i_size = p_track->i_sample_size; } else { - /* FIXME */ + /* Read a bunch of samples at once */ int i_samples = p_track->chunk[p_track->i_chunk].i_sample_count - - ( p_track->i_sample - p_track->chunk[p_track->i_chunk].i_sample_first ); - if( i_samples > QT_V0_MAX_SAMPLES ) - { - i_samples = QT_V0_MAX_SAMPLES; - } - i_size = i_samples * p_soun->i_channelcount * p_soun->i_samplesize / 8; + ( p_track->i_sample - + p_track->chunk[p_track->i_chunk].i_sample_first ); + + i_samples = __MIN( QT_V0_MAX_SAMPLES, i_samples ); + i_size = i_samples * p_track->i_sample_size; } //fprintf( stderr, "size=%d\n", i_size ); - return( i_size ); + return i_size; } - -static uint64_t MP4_GetTrackPos( track_data_mp4_t *p_track ) +static uint64_t MP4_TrackGetPos( mp4_track_t *p_track ) { unsigned int i_sample; uint64_t i_pos; - i_pos = p_track->chunk[p_track->i_chunk].i_offset; if( p_track->i_sample_size ) { - MP4_Box_data_sample_soun_t *p_soun = p_track->p_sample->data.p_sample_soun; + MP4_Box_data_sample_soun_t *p_soun = + p_track->p_sample->data.p_sample_soun; if( p_soun->i_qt_version == 0 ) { - i_pos += ( p_track->i_sample - p_track->chunk[p_track->i_chunk].i_sample_first ) * - p_soun->i_channelcount * p_soun->i_samplesize / 8; + i_pos += ( p_track->i_sample - + p_track->chunk[p_track->i_chunk].i_sample_first ) * + p_track->i_sample_size; } else { @@ -1772,21 +2076,18 @@ static uint64_t MP4_GetTrackPos( track_data_mp4_t *p_track ) else { for( i_sample = p_track->chunk[p_track->i_chunk].i_sample_first; - i_sample < p_track->i_sample; i_sample++ ) + i_sample < p_track->i_sample; i_sample++ ) { i_pos += p_track->p_sample_size[i_sample]; } - } - return( i_pos ); + + return i_pos; } -static int MP4_TrackNextSample( input_thread_t *p_input, - track_data_mp4_t *p_track ) +static int MP4_TrackNextSample( demux_t *p_demux, mp4_track_t *p_track ) { - - if( p_track->i_cat == AUDIO_ES && - p_track->i_sample_size != 0 ) + if( p_track->fmt.i_cat == AUDIO_ES && p_track->i_sample_size != 0 ) { MP4_Box_data_sample_soun_t *p_soun; @@ -1799,11 +2100,19 @@ static int MP4_TrackNextSample( input_thread_t *p_input, p_track->chunk[p_track->i_chunk].i_sample_first + p_track->chunk[p_track->i_chunk].i_sample_count; } + else if( p_track->i_sample_size > 256 ) + { + /* We do that so we don't read too much data + * (in this case we are likely dealing with compressed data) */ + p_track->i_sample += 1; + } else { /* FIXME */ p_track->i_sample += QT_V0_MAX_SAMPLES; - if( p_track->i_sample > p_track->chunk[p_track->i_chunk].i_sample_first + p_track->chunk[p_track->i_chunk].i_sample_count ) + if( p_track->i_sample > + p_track->chunk[p_track->i_chunk].i_sample_first + + p_track->chunk[p_track->i_chunk].i_sample_count ) { p_track->i_sample = p_track->chunk[p_track->i_chunk].i_sample_first + @@ -1817,30 +2126,113 @@ static int MP4_TrackNextSample( input_thread_t *p_input, } if( p_track->i_sample >= p_track->i_sample_count ) - { - /* we have reach end of the track so free decoder stuff */ - msg_Warn( p_input, "track[0x%x] will be disabled", p_track->i_track_ID ); - MP4_TrackUnselect( p_input, p_track ); - return( VLC_EGENERIC ); - } + return VLC_EGENERIC; /* Have we changed chunk ? */ if( p_track->i_sample >= p_track->chunk[p_track->i_chunk].i_sample_first + p_track->chunk[p_track->i_chunk].i_sample_count ) { - if( TrackGotoChunkSample( p_input, - p_track, - p_track->i_chunk + 1, + if( TrackGotoChunkSample( p_demux, p_track, p_track->i_chunk + 1, p_track->i_sample ) ) { - msg_Warn( p_input, "track[0x%x] will be disabled (cannot restart decoder)", p_track->i_track_ID ); - MP4_TrackUnselect( p_input, p_track ); - return( VLC_EGENERIC ); + msg_Warn( p_demux, "track[0x%x] will be disabled " + "(cannot restart decoder)", p_track->i_track_ID ); + MP4_TrackUnselect( p_demux, p_track ); + return VLC_EGENERIC; + } + } + + /* Have we changed elst */ + if( p_track->p_elst && p_track->p_elst->data.p_elst->i_entry_count > 0 ) + { + demux_sys_t *p_sys = p_demux->p_sys; + MP4_Box_data_elst_t *elst = p_track->p_elst->data.p_elst; + uint64_t i_mvt = MP4_TrackGetDTS( p_demux, p_track ) * + p_sys->i_timescale / (int64_t)1000000; + + 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] ) + { + MP4_TrackSetELST( p_demux, p_track, + MP4_TrackGetDTS( p_demux, p_track ) ); + } + } + + return VLC_SUCCESS; +} + +static void MP4_TrackSetELST( demux_t *p_demux, mp4_track_t *tk, + int64_t i_time ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + int i_elst_last = tk->i_elst; + + /* handle elst (find the correct one) */ + tk->i_elst = 0; + tk->i_elst_time = 0; + if( tk->p_elst && tk->p_elst->data.p_elst->i_entry_count > 0 ) + { + 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; (unsigned int)tk->i_elst < elst->i_entry_count; tk->i_elst++ ) + { + mtime_t i_dur = elst->i_segment_duration[tk->i_elst]; + + if( tk->i_elst_time <= i_mvt && i_mvt < tk->i_elst_time + i_dur ) + { + break; + } + tk->i_elst_time += i_dur; + } + + 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; + tk->i_elst_time -= elst->i_segment_duration[tk->i_elst]; + } + + if( elst->i_media_time[tk->i_elst] < 0 ) + { + /* track offset */ + tk->i_elst_time += elst->i_segment_duration[tk->i_elst]; } } + if( i_elst_last != tk->i_elst ) + { + msg_Warn( p_demux, "elst old=%d new=%d", i_elst_last, tk->i_elst ); + } +} - return( VLC_SUCCESS ); +static vlc_bool_t FindItem( demux_t *p_demux, playlist_t *p_playlist, + playlist_item_t **pp_item ) +{ + vlc_bool_t b_play = var_CreateGetBool( p_demux, "playlist-autostart" ); + + if( b_play && p_playlist->status.p_item && + p_playlist->status.p_item->p_input == + ((input_thread_t *)p_demux->p_parent)->input.p_item ) + { + 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_thread_t*)p_demux->p_parent)-> + input.p_item; + *pp_item = playlist_LockItemGetByInput( p_playlist, p_current ); + 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; + } + return b_play; }