/*****************************************************************************
* mp4.c : MP4 file input module for vlc
*****************************************************************************
- * Copyright (C) 2001-2004, 2010 the VideoLAN team
+ * Copyright (C) 2001-2004, 2010 VLC authors and VideoLAN
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include <vlc_charset.h> /* EnsureUTF8 */
#include <vlc_meta.h> /* vlc_meta_t, vlc_meta_ */
#include <vlc_input.h>
+#include <assert.h>
#include "libmp4.h"
-#include "drms.h"
#include "id3genres.h" /* for ATOM_gnre */
/*****************************************************************************
*****************************************************************************/
static int Demux ( demux_t * );
static int DemuxRef( demux_t *p_demux ){ (void)p_demux; return 0;}
+static int DemuxFrg( demux_t * );
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 too
- much memory and with fast access */
-
- /* with this we can calculate dts/pts without waste memory */
- uint64_t i_first_dts; /* DTS of the first sample */
- uint64_t i_last_dts; /* DTS of the last sample */
- uint32_t *p_sample_count_dts;
- uint32_t *p_sample_delta_dts; /* dts delta */
-
- 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
-{
- 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 */
- bool b_selected; /* is the trak being played */
- bool b_chapter; /* True when used for chapter only */
-
- bool b_mac_encoding;
-
- es_format_t fmt;
- es_out_id_t *p_es;
-
- /* 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 */
-
- /* 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*/
-
- 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 */
-
- bool b_drms;
- void *p_drms;
- MP4_Box_t *p_skcr;
-
-} mp4_track_t;
-
-
struct demux_sys_t
{
MP4_Box_t *p_root; /* container for the whole file */
mp4_track_t *track; /* array of track */
float f_fps; /* number of frame per seconds */
+ bool b_fragmented; /* fMP4 */
+
/* */
MP4_Box_t *p_tref_chap;
* Declaration of local function
*****************************************************************************/
static void MP4_TrackCreate ( demux_t *, mp4_track_t *, MP4_Box_t *, bool b_force_enable );
+static int MP4_frg_TrackCreate( demux_t *, mp4_track_t *, MP4_Box_t *);
static void MP4_TrackDestroy( mp4_track_t * );
static int MP4_TrackSelect ( demux_t *, mp4_track_t *, mtime_t );
static void MP4_UpdateSeekpoint( demux_t * );
static const char *MP4_ConvertMacCode( uint16_t );
-/* Return time in s of a track */
+/* Return time in microsecond 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]
+ demux_sys_t *p_sys = p_demux->p_sys;
+ mp4_chunk_t chunk;
+ if( p_sys->b_fragmented )
+ chunk = *p_track->cchunk;
+ else
+ chunk = p_track->chunk[p_track->i_chunk];
unsigned int i_index = 0;
unsigned int i_sample = p_track->i_sample - chunk.i_sample_first;
}
}
-#undef chunk
-
/* now handle elst */
if( p_track->p_elst )
{
return INT64_C(1000000) * i_dts / p_track->i_timescale;
}
-static inline int64_t MP4_TrackGetPTSDelta( mp4_track_t *p_track )
+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];
+ demux_sys_t *p_sys = p_demux->p_sys;
+ mp4_chunk_t *ck;
+ if( p_sys->b_fragmented )
+ ck = p_track->cchunk;
+ else
+ 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;
static void LoadChapter( demux_t *p_demux );
+static int LoadInitFrag( demux_t *p_demux, const bool b_smooth )
+{
+ demux_sys_t *p_sys = p_demux->p_sys;
+
+ if( b_smooth ) /* Smooth Streaming */
+ {
+ if( ( p_sys->p_root = MP4_BoxGetSmooBox( p_demux->s ) ) == NULL )
+ {
+ goto LoadInitFragError;
+ }
+ else
+ {
+ MP4_Box_t *p_smoo = MP4_BoxGet( p_sys->p_root, "uuid" );
+ if( !p_smoo || CmpUUID( &p_smoo->i_uuid, &SmooBoxUUID ) )
+ goto LoadInitFragError;
+ /* Get number of tracks */
+ p_sys->i_tracks = 0;
+ for( int i = 0; i < 3; i++ )
+ {
+ MP4_Box_t *p_stra = MP4_BoxGet( p_smoo, "uuid[%d]", i );
+ if( p_stra && p_stra->data.p_stra->i_track_ID )
+ p_sys->i_tracks++;
+ /* Get timescale and duration of the video track; */
+ if( p_sys->i_timescale == 0 )
+ {
+ p_sys->i_timescale = p_stra->data.p_stra->i_timescale;
+ p_sys->i_duration = p_stra->data.p_stra->i_duration;
+ if( p_sys->i_timescale == 0 )
+ {
+ msg_Err( p_demux, "bad timescale" );
+ goto LoadInitFragError;
+ }
+ }
+ }
+ }
+ }
+ else
+ {
+ /* Load all boxes ( except raw data ) */
+ if( ( p_sys->p_root = MP4_BoxGetRoot( p_demux->s ) ) == NULL )
+ {
+ goto LoadInitFragError;
+ }
+ }
+ return VLC_SUCCESS;
+
+LoadInitFragError:
+ msg_Warn( p_demux, "MP4 plugin discarded (not a valid initialization chunk)" );
+ return VLC_EGENERIC;
+}
+
+static int InitTracks( demux_t *p_demux )
+{
+ demux_sys_t *p_sys = p_demux->p_sys;
+
+ p_sys->track = calloc( p_sys->i_tracks, sizeof( mp4_track_t ) );
+ if( p_sys->track == NULL )
+ return VLC_EGENERIC;
+
+ if( p_sys->b_fragmented )
+ {
+ mp4_track_t *p_track;
+ for( uint16_t i = 0; i < p_sys->i_tracks; i++ )
+ {
+ p_track = &p_sys->track[i];
+ p_track->cchunk = calloc( 1, sizeof( mp4_chunk_t ) );
+ if( unlikely( !p_track->cchunk ) )
+ {
+ free( p_sys->track );
+ return VLC_EGENERIC;
+ }
+ }
+ }
+ return VLC_SUCCESS;
+}
+
+static void CreateTracksFromSmooBox( demux_t *p_demux )
+{
+ demux_sys_t *p_sys = p_demux->p_sys;
+
+ MP4_Box_t *p_smoo = MP4_BoxGet( p_sys->p_root, "uuid" );
+ mp4_track_t *p_track;
+ int j = 0;
+ for( int i = 0; i < 3; i++ )
+ {
+ MP4_Box_t *p_stra = MP4_BoxGet( p_smoo, "uuid[%d]", i );
+ if( !p_stra || p_stra->data.p_stra->i_track_ID == 0 )
+ continue;
+ else
+ {
+ p_track = &p_sys->track[j]; j++;
+ MP4_frg_TrackCreate( p_demux, p_track, p_stra );
+ p_track->p_es = es_out_Add( p_demux->out, &p_track->fmt );
+ }
+ }
+}
+
/*****************************************************************************
* Open: check file and initializes MP4 structures
*****************************************************************************/
bool b_enabled_es;
/* A little test to see if it could be a mp4 */
- if( stream_Peek( p_demux->s, &p_peek, 8 ) < 8 ) return VLC_EGENERIC;
+ if( stream_Peek( p_demux->s, &p_peek, 11 ) < 11 ) return VLC_EGENERIC;
switch( VLC_FOURCC( p_peek[4], p_peek[5], p_peek[6], p_peek[7] ) )
{
- case ATOM_ftyp:
case ATOM_moov:
case ATOM_foov:
case ATOM_moof:
case ATOM_free:
case ATOM_skip:
case ATOM_wide:
+ case ATOM_uuid:
case VLC_FOURCC( 'p', 'n', 'o', 't' ):
break;
+ case ATOM_ftyp:
+ /* We don't yet support f4v, but avformat does. */
+ if( p_peek[8] == 'f' && p_peek[9] == '4' && p_peek[10] == 'v' )
+ return VLC_EGENERIC;
+ break;
default:
return VLC_EGENERIC;
}
/* I need to seek */
- stream_Control( p_demux->s, STREAM_CAN_FASTSEEK, &b_seekable );
+ stream_Control( p_demux->s, STREAM_CAN_SEEK, &b_seekable );
if( !b_seekable )
{
- msg_Warn( p_demux, "MP4 plugin discarded (not fastseekable)" );
+ msg_Warn( p_demux, "MP4 plugin discarded (not seekable)" );
return VLC_EGENERIC;
}
/* create our structure that will contains all data */
p_demux->p_sys = p_sys = calloc( 1, sizeof( demux_sys_t ) );
- /* Now load all boxes ( except raw data ) */
- if( ( p_sys->p_root = MP4_BoxGetRoot( p_demux->s ) ) == NULL )
+ /* Is it Smooth Streaming? */
+ bool b_smooth = false;
+ if( stream_Peek( p_demux->s, &p_peek, 24 ) < 24 ) return VLC_EGENERIC;
+ if( !CmpUUID( (UUID_t *)(p_peek + 8), &SmooBoxUUID ) )
+ {
+ b_smooth = true;
+ p_sys->b_fragmented = true;
+ }
+
+ if( LoadInitFrag( p_demux, b_smooth ) != VLC_SUCCESS )
+ goto error;
+
+ if( MP4_BoxCount( p_sys->p_root, "/moov/mvex" ) > 0 )
+ {
+ p_sys->b_fragmented = true;
+ }
+ if( p_sys->b_fragmented )
+ {
+ p_demux->pf_demux = DemuxFrg;
+ }
+
+ stream_Control( p_demux->s, STREAM_CAN_FASTSEEK, &b_seekable );
+ if( b_smooth )
+ {
+ if( InitTracks( p_demux ) != VLC_SUCCESS )
+ goto error;
+ CreateTracksFromSmooBox( p_demux );
+ return VLC_SUCCESS;
+ }
+ else if( p_sys->b_fragmented && b_seekable )
+ {
+ /* We are not yet able to demux a fragmented MP4 file, using the 'mfra'
+ * box. So if STREAM_CAN_FASTSEEK is true, we're assuming we've got such
+ * a file, and we let avformat do the job. */
+ msg_Warn( p_demux, "MP4 plugin discarded "\
+ "(fast-seekable and fragmented, let avformat demux it)" );
+ stream_Seek( p_demux->s, 0 ); /* rewind, for other demux */
+ goto error;
+ }
+ else if( !p_sys->b_fragmented && !b_seekable )
{
- msg_Warn( p_demux, "MP4 plugin discarded (not a valid file)" );
+ msg_Warn( p_demux, "MP4 plugin discarded (not fast-seekable)" );
+ stream_Seek( p_demux->s, 0 ); /* rewind, for other demux */
goto error;
}
if( !p_foov )
{
- /* search also for moof box used by smoothstreaming */
- p_foov = MP4_BoxGet( p_sys->p_root, "/moof" );
- if( !p_foov )
- {
- msg_Err( p_demux, "MP4 plugin discarded (no moov,foov,moof box)" );
- goto error;
- }
+ msg_Err( p_demux, "MP4 plugin discarded (no moov,foov,moof box)" );
+ goto error;
}
/* we have a free box as a moov, rename it */
p_foov->i_type = ATOM_moov;
free( psz_path );
}
msg_Dbg( p_demux, "adding ref = `%s'", psz_ref );
- input_item_t *p_input = input_item_New( psz_ref, NULL );
- input_item_CopyOptions( p_current, p_input );
- input_item_node_AppendItem( p_subitems, p_input );
- vlc_gc_decref( p_input );
+ input_item_t *p_item = input_item_New( psz_ref, NULL );
+ input_item_CopyOptions( p_current, p_item );
+ input_item_node_AppendItem( p_subitems, p_item );
+ vlc_gc_decref( p_item );
}
else
{
p_sys->i_tracks,
p_sys->i_tracks ? 's':' ' );
- /* allocate memory */
- p_sys->track = calloc( p_sys->i_tracks, sizeof( mp4_track_t ) );
- if( p_sys->track == NULL )
+ if( InitTracks( p_demux ) != VLC_SUCCESS )
goto error;
- memset( p_sys->track, 0, p_sys->i_tracks * sizeof( mp4_track_t ) );
/* Search the first chap reference (like quicktime) and
* check that at least 1 stream is enabled */
break;
}
- if( tk->b_drms && tk->p_drms )
- {
- if( tk->p_skcr )
- {
- uint32_t p_key[4];
- drms_get_p_key( tk->p_drms, p_key );
-
- for( size_t i_pos = tk->p_skcr->data.p_skcr->i_init; i_pos < p_block->i_buffer; )
- {
- int n = __MIN( tk->p_skcr->data.p_skcr->i_encr, p_block->i_buffer - i_pos );
- drms_decrypt( tk->p_drms, (uint32_t*)&p_block->p_buffer[i_pos], n, p_key );
- i_pos += n;
- i_pos += __MIN( tk->p_skcr->data.p_skcr->i_decr, p_block->i_buffer - i_pos );
- }
- }
- else
- {
- drms_decrypt( tk->p_drms, (uint32_t*)p_block->p_buffer,
- p_block->i_buffer, NULL );
- }
- }
else if( tk->fmt.i_cat == SPU_ES )
{
- if( tk->fmt.i_codec == VLC_FOURCC( 's', 'u', 'b', 't' ) &&
+ if( tk->fmt.i_codec == VLC_CODEC_SUBT &&
p_block->i_buffer >= 2 )
{
size_t i_size = GetWBE( p_block->p_buffer );
/* dts */
p_block->i_dts = VLC_TS_0 + MP4_TrackGetDTS( p_demux, tk );
/* pts */
- i_delta = MP4_TrackGetPTSDelta( tk );
+ 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 )
else
p_block->i_pts = VLC_TS_INVALID;
- if( !tk->b_drms || ( tk->b_drms && tk->p_drms ) )
- es_out_Send( p_demux->out, tk->p_es, p_block );
+ es_out_Send( p_demux->out, tk->p_es, p_block );
}
/* Next sample */
demux_sys_t *p_sys = p_demux->p_sys;
unsigned int i_track;
- /* First update update global time */
+ /* First update global time */
p_sys->i_time = i_date * p_sys->i_timescale / 1000000;
p_sys->i_pcr = i_date;
return VLC_SUCCESS;
}
+static int MP4_frg_Seek( demux_t *p_demux, double f )
+{
+ demux_sys_t *p_sys = p_demux->p_sys;
+
+ int64_t i64 = stream_Size( p_demux->s );
+ if( stream_Seek( p_demux->s, (int64_t)(i64 * f) ) )
+ {
+ return VLC_EGENERIC;
+ }
+ else
+ {
+ /* update global time */
+ p_sys->i_time = (uint64_t)(f * (double)p_sys->i_duration);
+ p_sys->i_pcr = MP4_GetMoviePTS( p_sys );
+
+ for( unsigned i_track = 0; i_track < p_sys->i_tracks; i_track++ )
+ {
+ mp4_track_t *tk = &p_sys->track[i_track];
+
+ /* We don't want the current chunk to be flushed */
+ tk->cchunk->i_sample = tk->cchunk->i_sample_count;
+
+ /* reset/update some values */
+ tk->i_sample = tk->i_sample_first = 0;
+ tk->i_first_dts = p_sys->i_time;
+
+ /* We want to discard the current chunk and get the next one at once */
+ tk->b_has_non_empty_cchunk = false;
+ }
+ es_out_Control( p_demux->out, ES_OUT_SET_NEXT_DISPLAY_TIME, p_sys->i_pcr );
+ return VLC_SUCCESS;
+ }
+}
+
/*****************************************************************************
* Control:
*****************************************************************************/
case DEMUX_SET_POSITION:
f = (double)va_arg( args, double );
- if( p_sys->i_timescale > 0 )
+ if( p_sys->b_fragmented )
+ {
+ return MP4_frg_Seek( p_demux, f );
+ }
+ else if( p_sys->i_timescale > 0 )
{
i64 = (int64_t)( f * (double)1000000 *
(double)p_sys->i_duration /
snprintf( psz_trck, sizeof( psz_trck ), "%i",
p_0xa9xxx->data.p_trkn->i_track_number );
vlc_meta_SetTrackNum( p_meta, psz_trck );
+ snprintf( psz_trck, sizeof( psz_trck ), "%i",
+ p_0xa9xxx->data.p_trkn->i_track_total );
+ vlc_meta_Set( p_meta, vlc_meta_TrackTotal, psz_trck );
break;
}
case ATOM_0xa9cmt: /* Commment */
SET( vlc_meta_SetEncodedBy );
break;
+ case ATOM_0xa9pub:
+ SET( vlc_meta_SetPublisher );
+ break;
+
default:
break;
}
static const struct { uint32_t xa9_type; char metadata[25]; } xa9typetoextrameta[] =
{
{ ATOM_0xa9wrt, N_("Writer") },
- { ATOM_0xa9com, N_("Composr") },
+ { ATOM_0xa9com, N_("Composer") },
{ ATOM_0xa9prd, N_("Producer") },
{ ATOM_0xa9inf, N_("Information") },
{ ATOM_0xa9dir, N_("Director") },
{ ATOM_0xa9wrn, N_("Warning") },
{ ATOM_0xa9swr, N_("Software") },
{ ATOM_0xa9lyr, N_("Lyrics") },
- { ATOM_0xa9mak, N_("Make") },
+ { ATOM_0xa9mak, N_("Record Company") },
{ ATOM_0xa9mod, N_("Model") },
{ ATOM_0xa9PRD, N_("Product") },
{ ATOM_0xa9grp, N_("Grouping") },
+ { ATOM_0xa9gen, N_("Genre") },
+ { ATOM_0xa9st3, N_("Sub-Title") },
+ { ATOM_0xa9arg, N_("Arranger") },
+ { ATOM_0xa9ard, N_("Art Director") },
+ { ATOM_0xa9cak, N_("Copyright Acknowledgement") },
+ { ATOM_0xa9con, N_("Conductor") },
+ { ATOM_0xa9des, N_("Song Description") },
+ { ATOM_0xa9lnt, N_("Liner Notes") },
+ { ATOM_0xa9phg, N_("Phonogram Rights") },
+ { ATOM_0xa9pub, N_("Publisher") },
+ { ATOM_0xa9sne, N_("Sound Engineer") },
+ { ATOM_0xa9sol, N_("Soloist") },
+ { ATOM_0xa9thx, N_("Thanks") },
+ { ATOM_0xa9xpd, N_("Executive Producer") },
{ 0, "" },
};
for( unsigned i = 0; xa9typetoextrameta[i].xa9_type; i++ )
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( 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 ) ) )
{
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' ) )
+ tk->fmt.i_cat == SPU_ES && tk->fmt.i_codec == VLC_CODEC_SUBT )
break;
}
if( j < p_sys->i_tracks )
static int TrackCreateChunksIndex( demux_t *p_demux,
mp4_track_t *p_demux_track )
{
+ demux_sys_t *p_sys = p_demux->p_sys;
+ if( p_sys->b_fragmented )
+ return VLC_SUCCESS;
+
MP4_Box_t *p_co64; /* give offset for each chunk, same for stco and co64 */
MP4_Box_t *p_stsc;
static int TrackCreateSamplesIndex( demux_t *p_demux,
mp4_track_t *p_demux_track )
{
+ demux_sys_t *p_sys = p_demux->p_sys;
+ if( p_sys->b_fragmented )
+ return VLC_SUCCESS;
+
MP4_Box_t *p_box;
MP4_Box_data_stsz_t *stsz;
MP4_Box_data_stts_t *stts;
static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track,
unsigned int i_chunk, es_out_id_t **pp_es )
{
- const unsigned i_sample_description_index =
- p_track->chunk[i_chunk].i_sample_description_index;
+ demux_sys_t *p_sys = p_demux->p_sys;
+ unsigned int i_sample_description_index;
+
+ if( p_sys->b_fragmented )
+ i_sample_description_index = 1; /* XXX */
+ else
+ i_sample_description_index =
+ p_track->chunk[i_chunk].i_sample_description_index;
+
MP4_Box_t *p_sample;
MP4_Box_t *p_esds;
MP4_Box_t *p_frma;
p_pasp = MP4_BoxGet( p_sample, "pasp" );
- if( p_track->fmt.i_cat == AUDIO_ES && ( p_track->i_sample_size == 1 || p_track->i_sample_size == 2 ) )
- {
- MP4_Box_data_sample_soun_t *p_soun;
-
- p_soun = p_sample->data.p_sample_soun;
-
- if( p_soun->i_qt_version == 0 )
- {
- switch( p_sample->i_type )
- {
- case VLC_FOURCC( 'i', 'm', 'a', '4' ):
- p_soun->i_qt_version = 1;
- p_soun->i_sample_per_packet = 64;
- p_soun->i_bytes_per_packet = 34;
- p_soun->i_bytes_per_frame = 34 * p_soun->i_channelcount;
- p_soun->i_bytes_per_sample = 2;
- break;
- case VLC_FOURCC( 'M', 'A', 'C', '3' ):
- p_soun->i_qt_version = 1;
- p_soun->i_sample_per_packet = 6;
- p_soun->i_bytes_per_packet = 2;
- p_soun->i_bytes_per_frame = 2 * p_soun->i_channelcount;
- p_soun->i_bytes_per_sample = 2;
- break;
- case VLC_FOURCC( 'M', 'A', 'C', '6' ):
- p_soun->i_qt_version = 1;
- p_soun->i_sample_per_packet = 12;
- p_soun->i_bytes_per_packet = 2;
- 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;
- p_track->i_sample_size = p_soun->i_channelcount;
- break;
- case VLC_FOURCC( 'N', 'O', 'N', 'E' ):
- case VLC_FOURCC( 'r', 'a', 'w', ' ' ):
- case VLC_FOURCC( 't', 'w', 'o', 's' ):
- case VLC_FOURCC( 's', 'o', 'w', 't' ):
- /* What would be the fun if you could trust the .mov */
- p_track->i_sample_size = ((p_soun->i_samplesize+7)/8) * p_soun->i_channelcount;
- break;
- default:
- break;
- }
-
- }
- else if( p_soun->i_qt_version == 1 && p_soun->i_sample_per_packet <= 0 )
- {
- p_soun->i_qt_version = 0;
- }
- }
- else if( p_track->fmt.i_cat == AUDIO_ES && p_sample->data.p_sample_soun->i_qt_version == 1 )
- {
- MP4_Box_data_sample_soun_t *p_soun = p_sample->data.p_sample_soun;
-
- switch( p_sample->i_type )
- {
- case( VLC_FOURCC( '.', 'm', 'p', '3' ) ):
- case( VLC_FOURCC( 'm', 's', 0x00, 0x55 ) ):
- {
- if( p_track->i_sample_size > 1 )
- p_soun->i_qt_version = 0;
- break;
- }
- case( VLC_FOURCC( 'a', 'c', '-', '3' ) ):
- case( VLC_FOURCC( 'e', 'c', '-', '3' ) ):
- case( VLC_FOURCC( 'm', 's', 0x20, 0x00 ) ):
- p_soun->i_qt_version = 0;
- break;
- default:
- break;
- }
- }
-
/* */
switch( p_track->fmt.i_cat )
{
p_track, i_sample_description_index, i_chunk );
p_demux->p_sys->f_fps = (float)p_track->fmt.video.i_frame_rate /
(float)p_track->fmt.video.i_frame_rate_base;
+
+ /* Rotation */
+ switch( (int)p_track->f_rotation ) {
+ case 90:
+ p_track->fmt.video.orientation = ORIENT_ROTATED_90;
+ break;
+ case 180:
+ p_track->fmt.video.orientation = ORIENT_ROTATED_180;
+ break;
+ case 270:
+ p_track->fmt.video.orientation = ORIENT_ROTATED_270;
+ break;
+ }
+
break;
case AUDIO_ES:
p_track->fmt.audio.i_bitspersample =
p_sample->data.p_sample_soun->i_samplesize;
+ if( ( p_track->i_sample_size == 1 || p_track->i_sample_size == 2 ) )
+ {
+ MP4_Box_data_sample_soun_t *p_soun;
+ p_soun = p_sample->data.p_sample_soun;
+
+ if( p_soun->i_qt_version == 0 )
+ {
+ switch( p_sample->i_type )
+ {
+ case VLC_FOURCC( 'i', 'm', 'a', '4' ):
+ p_soun->i_qt_version = 1;
+ p_soun->i_sample_per_packet = 64;
+ p_soun->i_bytes_per_packet = 34;
+ p_soun->i_bytes_per_frame = 34 * p_soun->i_channelcount;
+ p_soun->i_bytes_per_sample = 2;
+ break;
+ case VLC_FOURCC( 'M', 'A', 'C', '3' ):
+ p_soun->i_qt_version = 1;
+ p_soun->i_sample_per_packet = 6;
+ p_soun->i_bytes_per_packet = 2;
+ p_soun->i_bytes_per_frame = 2 * p_soun->i_channelcount;
+ p_soun->i_bytes_per_sample = 2;
+ break;
+ case VLC_FOURCC( 'M', 'A', 'C', '6' ):
+ p_soun->i_qt_version = 1;
+ p_soun->i_sample_per_packet = 12;
+ p_soun->i_bytes_per_packet = 2;
+ 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;
+ p_track->i_sample_size = p_soun->i_channelcount;
+ break;
+ case VLC_FOURCC( 'N', 'O', 'N', 'E' ):
+ case VLC_FOURCC( 'r', 'a', 'w', ' ' ):
+ case VLC_FOURCC( 't', 'w', 'o', 's' ):
+ case VLC_FOURCC( 's', 'o', 'w', 't' ):
+ /* What would be the fun if you could trust the .mov */
+ p_track->i_sample_size = ((p_soun->i_samplesize+7)/8) * p_soun->i_channelcount;
+ break;
+ default:
+ break;
+ }
+
+ }
+ else if( p_soun->i_qt_version == 1 && p_soun->i_sample_per_packet <= 0 )
+ {
+ p_soun->i_qt_version = 0;
+ }
+ }
+ else if( p_sample->data.p_sample_soun->i_qt_version == 1 )
+ {
+ MP4_Box_data_sample_soun_t *p_soun = p_sample->data.p_sample_soun;
+
+ switch( p_sample->i_type )
+ {
+ case( VLC_FOURCC( '.', 'm', 'p', '3' ) ):
+ case( VLC_FOURCC( 'm', 's', 0x00, 0x55 ) ):
+ {
+ if( p_track->i_sample_size > 1 )
+ p_soun->i_qt_version = 0;
+ break;
+ }
+ case( VLC_FOURCC( 'a', 'c', '-', '3' ) ):
+ case( VLC_FOURCC( 'e', 'c', '-', '3' ) ):
+ case( VLC_FOURCC( 'm', 's', 0x20, 0x00 ) ):
+ p_soun->i_qt_version = 0;
+ break;
+ default:
+ break;
+ }
+ }
+
if( p_track->i_sample_size != 0 &&
- p_sample->data.p_sample_soun->i_qt_version == 1 && p_sample->data.p_sample_soun->i_sample_per_packet <= 0 )
+ p_sample->data.p_sample_soun->i_qt_version == 1 &&
+ p_sample->data.p_sample_soun->i_sample_per_packet <= 0 )
{
- msg_Err( p_demux, "Invalid sample per packet value for qt_version 1" );
- return VLC_EGENERIC;
+ msg_Err( p_demux, "Invalid sample per packet value for qt_version 1. Broken muxer!" );
+ p_sample->data.p_sample_soun->i_qt_version = 0;
}
break;
case( VLC_FOURCC( '.', 'm', 'p', '3' ) ):
case( VLC_FOURCC( 'm', 's', 0x00, 0x55 ) ):
{
- p_track->fmt.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'a' );
+ p_track->fmt.i_codec = VLC_CODEC_MPGA;
break;
}
case( VLC_FOURCC( 'a', 'c', '-', '3' ) ):
{
MP4_Box_t *p_dac3_box = MP4_BoxGet( p_sample, "dac3", 0 );
- p_track->fmt.i_codec = VLC_FOURCC( 'a', '5', '2', ' ' );
+ p_track->fmt.i_codec = VLC_CODEC_A52;
if( p_dac3_box )
{
static const int pi_bitrate[] = {
}
case( VLC_FOURCC( 'e', 'c', '-', '3' ) ):
{
- p_track->fmt.i_codec = VLC_FOURCC( 'e', 'a', 'c', '3' );
+ p_track->fmt.i_codec = VLC_CODEC_EAC3;
break;
}
"(%u), making both equal (report any problem).",
p_track->i_timescale, p_soun->i_sampleratehi );
- if( p_soun->i_sampleratehi )
+ if( p_soun->i_sampleratehi != 0 )
p_track->i_timescale = p_soun->i_sampleratehi;
else
p_soun->i_sampleratehi = p_track->i_timescale;
}
case( VLC_FOURCC( 's', '2', '6', '3' ) ):
- p_track->fmt.i_codec = VLC_FOURCC( 'h', '2', '6', '3' );
+ p_track->fmt.i_codec = VLC_CODEC_H263;
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' );
+ p_track->fmt.i_codec = VLC_CODEC_SUBT;
/* FIXME: Not true, could be UTF-16 with a Byte Order Mark (0xfeff) */
/* FIXME UTF-8 doesn't work here ? */
if( p_track->b_mac_encoding )
break;
case VLC_FOURCC('y','v','1','2'):
- p_track->fmt.i_codec = VLC_FOURCC('Y','V','1','2');
+ p_track->fmt.i_codec = VLC_CODEC_YV12;
break;
case VLC_FOURCC('y','u','v','2'):
p_track->fmt.i_codec = VLC_FOURCC('Y','U','Y','2');
switch( p_decconfig->i_objectTypeIndication )
{
case( 0x20 ): /* MPEG4 VIDEO */
- p_track->fmt.i_codec = VLC_FOURCC( 'm','p','4','v' );
+ p_track->fmt.i_codec = VLC_CODEC_MP4V;
+ break;
+ case( 0x21 ): /* H.264 */
+ p_track->fmt.i_codec = VLC_CODEC_H264;
break;
case( 0x40):
- p_track->fmt.i_codec = VLC_FOURCC( 'm','p','4','a' );
+ p_track->fmt.i_codec = VLC_CODEC_MP4A;
if( p_decconfig->i_decoder_specific_info_len >= 2 &&
p_decconfig->p_decoder_specific_info[0] == 0xF8 &&
(p_decconfig->p_decoder_specific_info[1]&0xE0) == 0x80 )
case( 0x63):
case( 0x64):
case( 0x65): /* MPEG2 video */
- p_track->fmt.i_codec = VLC_FOURCC( 'm','p','g','v' );
+ p_track->fmt.i_codec = VLC_CODEC_MPGV;
break;
/* Theses are MPEG2-AAC */
case( 0x66): /* main profile */
case( 0x67): /* Low complexity profile */
case( 0x68): /* Scaleable Sampling rate profile */
- p_track->fmt.i_codec = VLC_FOURCC( 'm','p','4','a' );
+ p_track->fmt.i_codec = VLC_CODEC_MP4A;
break;
- /* true MPEG 2 audio */
+ /* True MPEG 2 audio */
case( 0x69):
- p_track->fmt.i_codec = VLC_FOURCC( 'm','p','g','a' );
+ p_track->fmt.i_codec = VLC_CODEC_MPGA;
break;
case( 0x6a): /* MPEG1 video */
p_track->fmt.i_codec = VLC_FOURCC( 'm','p','g','v' );
break;
case( 0x6b): /* MPEG1 audio */
- p_track->fmt.i_codec = VLC_FOURCC( 'm','p','g','a' );
+ p_track->fmt.i_codec = VLC_CODEC_MPGA;
break;
case( 0x6c ): /* jpeg */
p_track->fmt.i_codec = VLC_FOURCC( 'j','p','e','g' );
case( 0x6d ): /* png */
p_track->fmt.i_codec = VLC_FOURCC( 'p','n','g',' ' );
break;
- case( 0x6e ): /* jpeg200 */
+ case( 0x6e ): /* jpeg2000 */
p_track->fmt.i_codec = VLC_FOURCC( 'M','J','2','C' );
break;
case( 0xa3 ): /* vc1 */
- p_track->fmt.i_codec = VLC_FOURCC( 'W','V','C','1' );
+ p_track->fmt.i_codec = VLC_CODEC_VC1;
+ break;
+ case( 0xa4 ):
+ p_track->fmt.i_codec = VLC_CODEC_DIRAC;
+ break;
+ case( 0xa5 ):
+ p_track->fmt.i_codec = VLC_CODEC_A52;
+ break;
+ case( 0xa6 ):
+ p_track->fmt.i_codec = VLC_CODEC_EAC3;
+ break;
+ case( 0xa9 ): /* dts */
+ case( 0xaa ): /* DTS-HD HRA */
+ case( 0xab ): /* DTS-HD Master Audio */
+ p_track->fmt.i_codec = VLC_CODEC_DTS;
+ break;
+ case( 0xDD ):
+ p_track->fmt.i_codec = VLC_CODEC_VORBIS;
break;
/* Private ID */
p_track->fmt.i_extra);
}
break;
- case VLC_FOURCC( 's', 'a', 'm', 'r' ):
+
+ case VLC_CODEC_AMR_NB:
p_track->fmt.audio.i_rate = 8000;
+ break;
+ case VLC_CODEC_AMR_WB:
+ p_track->fmt.audio.i_rate = 16000;
+ break;
case VLC_FOURCC( 'Q', 'D', 'M', 'C' ):
- case VLC_FOURCC( 'Q', 'D', 'M', '2' ):
- case VLC_FOURCC( 'a', 'l', 'a', 'c' ):
+ case VLC_CODEC_QDM2:
+ case VLC_CODEC_ALAC:
p_track->fmt.i_extra =
p_sample->data.p_sample_soun->i_qt_description;
if( p_track->fmt.i_extra > 0 )
}
break;
+ case VLC_FOURCC( 'v', 'c', '-', '1' ):
+ {
+ MP4_Box_t *p_dvc1 = MP4_BoxGet( p_sample, "dvc1" );
+ if( p_dvc1 )
+ {
+ p_track->fmt.i_extra = p_dvc1->data.p_dvc1->i_vc1;
+ if( p_track->fmt.i_extra > 0 )
+ {
+ p_track->fmt.p_extra = malloc( p_dvc1->data.p_dvc1->i_vc1 );
+ memcpy( p_track->fmt.p_extra, p_dvc1->data.p_dvc1->p_vc1,
+ p_track->fmt.i_extra );
+ }
+ }
+ else
+ {
+ msg_Err( p_demux, "missing dvc1" );
+ }
+ break;
+ }
+
/* avc1: send avcC (h264 without annexe B, ie without start code)*/
case VLC_FOURCC( 'a', 'v', 'c', '1' ):
{
break;
}
- case VLC_FOURCC('m','s',0x00,0x02):
- case VLC_FOURCC('m','s',0x00,0x11):
- case VLC_FOURCC('Q','c','l','p'):
+ case VLC_CODEC_ADPCM_MS:
+ case VLC_CODEC_ADPCM_IMA_WAV:
+ case VLC_CODEC_QCELP:
p_track->fmt.audio.i_blockalign = p_sample->data.p_sample_soun->i_bytes_per_frame;
break;
default:
+ msg_Dbg( p_demux, "Unrecognized FourCC %4.4s", (char *)&p_sample->i_type );
break;
}
}
MP4_Box_t *p_vmhd;
MP4_Box_t *p_smhd;
- MP4_Box_t *p_drms;
-
- unsigned int i;
char language[4];
/* hint track unsupported */
p_track->fmt.i_priority = -1;
p_track->i_track_ID = p_tkhd->data.p_tkhd->i_track_ID;
+
p_track->i_width = p_tkhd->data.p_tkhd->i_width / 65536;
p_track->i_height = p_tkhd->data.p_tkhd->i_height / 65536;
+ p_track->f_rotation = p_tkhd->data.p_tkhd->f_rotation;
if( p_tref )
{
}
p_track->i_timescale = p_mdhd->data.p_mdhd->i_timescale;
- if( !p_track->i_timescale )
+ if( p_track->i_timescale == 0 )
return;
if( p_mdhd->data.p_mdhd->i_language_code < 0x800 )
}
else
{
- for( i = 0; i < 3; i++ )
+ for( unsigned i = 0; i < 3; i++ )
language[i] = p_mdhd->data.p_mdhd->i_language[i];
language[3] = '\0';
}
return;
}
- 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;
-
- if ( !p_drms )
- {
- p_drms = MP4_BoxGet( p_track->p_stsd, "drmi" );
- p_track->b_drms = p_drms != NULL;
- p_track->p_drms = p_track->b_drms ?
- p_drms->data.p_sample_vide->p_drms : NULL;
- }
-
- if( p_drms )
- p_track->p_skcr = MP4_BoxGet( p_drms, "sinf/skcr" );
-
- /* Set language */
- if( *language && strcmp( language, "```" ) && strcmp( language, "und" ) )
+ /* Set language */
+ if( *language && strcmp( language, "```" ) && strcmp( language, "und" ) )
{
p_track->fmt.psz_language = strdup( language );
}
#endif
}
+static void FreeAndResetChunk( mp4_chunk_t *ck )
+{
+ free( ck->p_sample_count_dts );
+ free( ck->p_sample_delta_dts );
+ free( ck->p_sample_count_pts );
+ free( ck->p_sample_offset_pts );
+ free( ck->p_sample_size );
+ for( uint32_t i = 0; i < ck->i_sample_count; i++ )
+ free( ck->p_sample_data[i] );
+ free( ck->p_sample_data );
+ memset( ck, 0, sizeof( mp4_chunk_t ) );
+}
+
/****************************************************************************
* MP4_TrackDestroy:
****************************************************************************
}
}
FREENULL( p_track->chunk );
+ if( p_track->cchunk ) {
+ FreeAndResetChunk( p_track->cchunk );
+ FREENULL( p_track->cchunk );
+ }
if( !p_track->i_sample_size )
{
}
return "";
}
+
+/******************************************************************************
+ * Here are the functions used for fragmented MP4
+ *****************************************************************************/
+
+/**
+ * It computes the sample rate for a video track using current video chunk
+ */
+static void ChunkGetESSampleRate( unsigned *pi_num, unsigned *pi_den,
+ const mp4_track_t *p_track )
+{
+ if( p_track->cchunk->i_last_dts == 0 )
+ return;
+
+ *pi_num = 0;
+ *pi_den = 0;
+
+ /* */
+ const mp4_chunk_t *p_chunk = p_track->cchunk;
+
+ uint32_t i_sample = p_chunk->i_sample_count;
+ uint64_t i_first_dts = p_chunk->i_first_dts;
+ uint64_t i_last_dts = p_chunk->i_last_dts;
+
+ if( i_sample > 1 && i_first_dts < i_last_dts )
+ vlc_ureduce( pi_num, pi_den,
+ ( i_sample - 1) * p_track->i_timescale,
+ i_last_dts - i_first_dts,
+ UINT16_MAX);
+}
+
+/**
+ * Build raw avcC box (without the 8 bytes header)
+ * \return The size of the box.
+ */
+static int build_raw_avcC( uint8_t **p_extra, const uint8_t *CodecPrivateData,
+ const unsigned cpd_len )
+{
+ uint8_t *avcC;
+ unsigned sps_len = 0, pps_len = 0;
+ const uint32_t mark = 0x00000001;
+
+ assert( CodecPrivateData[0] == 0 );
+ assert( CodecPrivateData[1] == 0 );
+ assert( CodecPrivateData[2] == 0 );
+ assert( CodecPrivateData[3] == 1 );
+
+ uint32_t length = cpd_len + 3;
+ avcC = calloc( length, 1 );
+ if( unlikely( avcC == NULL ) )
+ return 0;
+
+ uint8_t *sps = avcC + 8;
+
+ uint32_t candidate = ~mark;
+ CodecPrivateData += 4;
+ for( unsigned i = 0; i < cpd_len - 4; i++ )
+ {
+ sps[i] = CodecPrivateData[i];
+ candidate = (candidate << 8) | CodecPrivateData[i];
+ if( candidate == mark )
+ {
+ sps_len = i - 3;
+ break;
+ }
+ }
+ if( sps_len == 0 )
+ return 0;
+ uint8_t *pps = sps + sps_len + 3;
+ pps_len = cpd_len - sps_len - 4 * 2;
+ memcpy( pps, CodecPrivateData + sps_len + 4, pps_len );
+
+ /* XXX */
+ uint8_t AVCProfileIndication = 0x64;
+ uint8_t profile_compatibility = 0x40;
+ uint8_t AVCLevelIndication = 0x1f;
+ uint8_t lengthSizeMinusOne = 0x03;
+
+ avcC[0] = 1;
+ avcC[1] = AVCProfileIndication;
+ avcC[2] = profile_compatibility;
+ avcC[3] = AVCLevelIndication;
+ avcC[4] = 0xfc + lengthSizeMinusOne;
+ avcC[5] = 0xe0 + 1;
+ avcC[6] = (sps_len & 0xff00)>>8;
+ avcC[7] = sps_len & 0xff;
+
+ avcC[8+sps_len] = 1;
+ avcC[9+sps_len] = (pps_len & 0xff00) >> 8;
+ avcC[10+sps_len] = pps_len & 0xff;
+
+ *p_extra = avcC;
+ return length;
+}
+
+/**
+ * Build a mp4_track_t from a StraBox
+ */
+
+static inline int MP4_SetCodecExtraData( es_format_t *fmt, MP4_Box_data_stra_t *p_data )
+{
+ fmt->i_extra = p_data->cpd_len;
+ fmt->p_extra = malloc( p_data->cpd_len );
+ if( unlikely( !fmt->p_extra ) )
+ return VLC_ENOMEM;
+ memcpy( fmt->p_extra, p_data->CodecPrivateData, p_data->cpd_len );
+ return VLC_SUCCESS;
+ }
+
+static int MP4_frg_TrackCreate( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_stra )
+{
+ demux_sys_t *p_sys = p_demux->p_sys;
+ int ret;
+ MP4_Box_data_stra_t *p_data = p_stra->data.p_stra;
+ if( !p_data )
+ return VLC_EGENERIC;
+
+ p_track->b_ok = true;
+ p_track->b_selected = false;
+ p_track->i_sample_count = UINT32_MAX;
+
+ p_track->i_timescale = p_sys->i_timescale;
+ p_track->i_width = p_data->MaxWidth;
+ p_track->i_height = p_data->MaxHeight;
+ p_track->i_track_ID = p_data->i_track_ID;
+
+ es_format_t *fmt = &p_track->fmt;
+ if( fmt == NULL )
+ return VLC_EGENERIC;
+
+ es_format_Init( fmt, p_data->i_es_cat, 0 );
+
+ /* Set language FIXME */
+ fmt->psz_language = strdup( "en" );
+
+ fmt->i_original_fourcc = p_data->FourCC;
+ fmt->i_codec = vlc_fourcc_GetCodec( fmt->i_cat, p_data->FourCC );
+
+ uint8_t **p_extra = (uint8_t **)&fmt->p_extra;
+ /* See http://msdn.microsoft.com/en-us/library/ff728116%28v=vs.90%29.aspx
+ * for MS weird use of FourCC*/
+ switch( fmt->i_cat )
+ {
+ case VIDEO_ES:
+ if( p_data->FourCC == VLC_FOURCC( 'A', 'V', 'C', '1' ) ||
+ p_data->FourCC == VLC_FOURCC( 'A', 'V', 'C', 'B' ) ||
+ p_data->FourCC == VLC_FOURCC( 'H', '2', '6', '4' ) )
+ {
+ fmt->i_extra = build_raw_avcC( p_extra,
+ p_data->CodecPrivateData, p_data->cpd_len );
+ }
+ else
+ {
+ ret = MP4_SetCodecExtraData( fmt, p_data );
+ if( ret != VLC_SUCCESS )
+ return ret;
+ }
+
+ fmt->video.i_width = p_data->MaxWidth;
+ fmt->video.i_height = p_data->MaxHeight;
+ fmt->video.i_bits_per_pixel = 0x18;
+ fmt->video.i_visible_width = p_data->MaxWidth;
+ fmt->video.i_visible_height = p_data->MaxHeight;
+
+ /* Frame rate */
+ ChunkGetESSampleRate( &fmt->video.i_frame_rate,
+ &fmt->video.i_frame_rate_base, p_track );
+
+ if( fmt->video.i_frame_rate_base != 0 )
+ {
+ p_demux->p_sys->f_fps = (float)fmt->video.i_frame_rate /
+ (float)fmt->video.i_frame_rate_base;
+ }
+ else
+ p_demux->p_sys->f_fps = 24;
+
+ break;
+
+ case AUDIO_ES:
+ fmt->audio.i_channels = p_data->Channels;
+ fmt->audio.i_rate = p_data->SamplingRate;
+ fmt->audio.i_bitspersample = p_data->BitsPerSample;
+ fmt->audio.i_blockalign = p_data->nBlockAlign;
+
+ fmt->i_bitrate = p_data->Bitrate;
+
+ ret = MP4_SetCodecExtraData( fmt, p_data );
+ if( ret != VLC_SUCCESS )
+ return ret;
+
+ break;
+
+ default:
+ break;
+ }
+
+ return VLC_SUCCESS;
+}
+
+/**
+ * Return the track identified by tid
+ */
+static mp4_track_t *MP4_frg_GetTrack( demux_t *p_demux, const uint16_t tid )
+{
+ demux_sys_t *p_sys = p_demux->p_sys;
+
+ mp4_track_t *ret = NULL;
+ for( unsigned i = 0; i < p_sys->i_tracks; i++ )
+ {
+ ret = &p_sys->track[i];
+ if( !ret )
+ return NULL;
+ if( ret->i_track_ID == tid )
+ return ret;
+ }
+ msg_Err( p_demux, "MP4_frg_GetTrack: track %"PRIu16" not found!", tid );
+ return NULL;
+}
+
+static void FlushChunk( demux_t *p_demux, mp4_track_t *tk )
+{
+ msg_Dbg( p_demux, "Flushing chunk for track id %u", tk->i_track_ID );
+ mp4_chunk_t *ck = tk->cchunk;
+ while( ck->i_sample < ck->i_sample_count )
+ {
+ block_t *p_block;
+ int64_t i_delta;
+
+ if( ck->p_sample_size == NULL || ck->p_sample_data == NULL )
+ return;
+
+ uint32_t sample_size = ck->p_sample_size[ck->i_sample];
+ assert( sample_size > 0 );
+ p_block = block_Alloc( sample_size );
+ if( unlikely( !p_block ) )
+ return;
+
+ uint8_t *src = ck->p_sample_data[ck->i_sample];
+ memcpy( p_block->p_buffer, src, sample_size );
+ ck->i_sample++;
+
+ /* dts */
+ p_block->i_dts = VLC_TS_0 + MP4_TrackGetDTS( p_demux, tk );
+ /* 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
+ p_block->i_pts = VLC_TS_INVALID;
+
+ es_out_Send( p_demux->out, tk->p_es, p_block );
+
+ tk->i_sample++;
+ }
+}
+
+/**
+ * Re-init decoder.
+ * \Note If we call that function too soon,
+ * before the track has been selected by MP4_TrackSelect
+ * (during the first execution of Demux), then the track gets disabled
+ */
+static int ReInitDecoder( demux_t *p_demux, mp4_track_t *p_track )
+{
+ demux_sys_t *p_sys = p_demux->p_sys;
+
+ uint32_t i_sample = 0;
+ bool b_smooth = false;
+ MP4_Box_t *p_stra = NULL, *p_trak = NULL;
+
+ if( !CmpUUID( &p_sys->p_root->p_first->i_uuid, &SmooBoxUUID ) )
+ b_smooth = true;
+
+ if( b_smooth )
+ {
+ p_stra = MP4_BoxGet( p_sys->p_root, "uuid/uuid[0]" );
+ if( !p_stra || CmpUUID( &p_stra->i_uuid, &StraBoxUUID ) )
+ return VLC_EGENERIC;
+ }
+ else /* DASH */
+ {
+ p_trak = MP4_BoxGet( p_sys->p_root, "/moov/trak[0]" );
+ if( !p_trak )
+ return VLC_EGENERIC;
+ }
+
+ i_sample = p_track->i_sample;
+ es_out_Del( p_demux->out, p_track->p_es );
+ es_format_Clean( &p_track->fmt );
+
+ if( b_smooth )
+ MP4_frg_TrackCreate( p_demux, p_track, p_stra );
+ else /* DASH */
+ MP4_TrackCreate( p_demux, p_track, p_trak, true );
+
+ p_track->i_sample = i_sample;
+
+ /* Temporary hack until we support track selection */
+ p_track->b_selected = true;
+ p_track->b_ok = true;
+ p_track->b_enable = true;
+
+ p_track->p_es = es_out_Add( p_demux->out, &p_track->fmt );
+ p_track->b_codec_need_restart = false;
+
+ return VLC_SUCCESS;
+}
+
+/**
+ * This function fills a mp4_chunk_t structure from a MP4_Box_t (p_chunk).
+ * The 'i_tk_id' argument returns the ID of the track the chunk belongs to.
+ * \note p_chunk usually contains a 'moof' and a 'mdat', and might contain a 'sidx'.
+ * \return VLC_SUCCESS, VLC_EGENERIC or VLC_ENOMEM.
+ */
+static int MP4_frg_GetChunk( demux_t *p_demux, MP4_Box_t *p_chunk, unsigned *i_tk_id )
+{
+ MP4_Box_t *p_sidx = MP4_BoxGet( p_chunk, "sidx" );
+ MP4_Box_t *p_moof = MP4_BoxGet( p_chunk, "moof" );
+ if( p_moof == NULL)
+ {
+ msg_Warn( p_demux, "no moof box found!" );
+ return VLC_EGENERIC;
+ }
+
+ MP4_Box_t *p_traf = MP4_BoxGet( p_moof, "traf" );
+ if( p_traf == NULL)
+ {
+ msg_Warn( p_demux, "no traf box found!" );
+ return VLC_EGENERIC;
+ }
+
+ MP4_Box_t *p_tfhd = MP4_BoxGet( p_traf, "tfhd" );
+ if( p_tfhd == NULL)
+ {
+ msg_Warn( p_demux, "no tfhd box found!" );
+ return VLC_EGENERIC;
+ }
+
+ uint32_t i_track_ID = p_tfhd->data.p_tfhd->i_track_ID;
+ *i_tk_id = i_track_ID;
+ assert( i_track_ID > 0 );
+ msg_Dbg( p_demux, "GetChunk: track ID is %"PRIu32"", i_track_ID );
+
+ mp4_track_t *p_track = MP4_frg_GetTrack( p_demux, i_track_ID );
+ if( !p_track )
+ return VLC_EGENERIC;
+
+ mp4_chunk_t *ret = p_track->cchunk;
+
+ if( p_tfhd->data.p_tfhd->b_empty )
+ msg_Warn( p_demux, "No samples in this chunk!" );
+
+ /* Usually we read 100 ms of each track. However, suppose we have two tracks,
+ * Ta and Tv (audio and video). Suppose also that Ta is the first track to be
+ * read, i.e. we read 100 ms of Ta, then 100 ms of Tv, then 100 ms of Ta,
+ * and so on. Finally, suppose that we get the chunks the other way around,
+ * i.e. first a chunk of Tv, then a chunk of Ta, then a chunk of Tv, and so on.
+ * In that case, it is very likely that at some point, Ta->cchunk or Tv->cchunk
+ * is not emptied when MP4_frg_GetChunks is called. It is therefore necessary to
+ * flush it, i.e. send to the decoder the samples not yet sent.
+ * Note that all the samples to be flushed should worth less than 100 ms,
+ * (though I did not do the formal proof) and thus this flushing mechanism
+ * should not cause A/V sync issues, or delays or whatever.
+ */
+ if( ret->i_sample < ret->i_sample_count )
+ FlushChunk( p_demux, p_track );
+
+ if( ret->i_sample_count )
+ FreeAndResetChunk( ret );
+
+ uint32_t default_duration = 0;
+ if( p_tfhd->data.p_tfhd->i_flags & MP4_TFHD_DFLT_SAMPLE_DURATION )
+ default_duration = p_tfhd->data.p_tfhd->i_default_sample_duration;
+
+ uint32_t default_size = 0;
+ if( p_tfhd->data.p_tfhd->i_flags & MP4_TFHD_DFLT_SAMPLE_SIZE )
+ default_size = p_tfhd->data.p_tfhd->i_default_sample_size;
+
+ MP4_Box_t *p_trun = MP4_BoxGet( p_traf, "trun");
+ if( p_trun == NULL)
+ {
+ msg_Warn( p_demux, "no trun box found!" );
+ return VLC_EGENERIC;
+ }
+ MP4_Box_data_trun_t *p_trun_data = p_trun->data.p_trun;
+
+ ret->i_sample_count = p_trun_data->i_sample_count;
+ assert( ret->i_sample_count > 0 );
+ ret->i_sample_description_index = 1; /* seems to be always 1, is it? */
+ ret->i_sample_first = p_track->i_sample_first;
+ p_track->i_sample_first += ret->i_sample_count;
+
+ ret->i_first_dts = p_track->i_first_dts;
+
+ /* XXX I already saw DASH content with no default_duration and no
+ * MP4_TRUN_SAMPLE_DURATION flag, but a sidx box was present.
+ * This chunk of code might be buggy with segments having
+ * more than one subsegment. */
+ if( !default_duration )
+ {
+ if( p_sidx )
+ {
+ MP4_Box_data_sidx_t *p_sidx_data = p_sidx->data.p_sidx;
+ assert( p_sidx_data->i_reference_count == 1 );
+
+ if( p_sidx_data->i_timescale == 0 )
+ return VLC_EGENERIC;
+
+ unsigned i_chunk_duration = p_sidx_data->p_items[0].i_subsegment_duration /
+ p_sidx_data->i_timescale;
+ default_duration = i_chunk_duration * p_track->i_timescale / ret->i_sample_count;
+
+ }
+ }
+
+ msg_Dbg( p_demux, "Default sample duration is %"PRIu32, default_duration );
+
+ ret->p_sample_count_dts = calloc( ret->i_sample_count, sizeof( uint32_t ) );
+ ret->p_sample_delta_dts = calloc( ret->i_sample_count, sizeof( uint32_t ) );
+
+ if( !ret->p_sample_count_dts || !ret->p_sample_delta_dts )
+ return VLC_ENOMEM;
+
+ ret->p_sample_count_pts = calloc( ret->i_sample_count, sizeof( uint32_t ) );
+ if( !ret->p_sample_count_pts )
+ return VLC_ENOMEM;
+
+ if( p_trun_data->i_flags & MP4_TRUN_SAMPLE_TIME_OFFSET )
+ {
+ ret->p_sample_offset_pts = calloc( ret->i_sample_count, sizeof( int32_t ) );
+ if( !ret->p_sample_offset_pts )
+ return VLC_ENOMEM;
+ }
+
+ ret->p_sample_size = calloc( ret->i_sample_count, sizeof( uint32_t ) );
+ if( !ret->p_sample_size )
+ return VLC_ENOMEM;
+
+ ret->p_sample_data = calloc( ret->i_sample_count, sizeof( uint8_t * ) );
+ if( !ret->p_sample_data )
+ return VLC_ENOMEM;
+
+ uint32_t dur = 0, len;
+ uint32_t chunk_duration = 0, chunk_size = 0;
+
+ /* Skip header of mdat */
+ stream_Read( p_demux->s, NULL, 8 );
+
+ for( uint32_t i = 0; i < ret->i_sample_count; i++)
+ {
+ if( p_trun_data->i_flags & MP4_TRUN_SAMPLE_DURATION )
+ dur = p_trun_data->p_samples[i].i_duration;
+ else
+ dur = default_duration;
+ ret->p_sample_delta_dts[i] = dur;
+ chunk_duration += dur;
+
+ ret->p_sample_count_dts[i] = ret->p_sample_count_pts[i] = 1;
+
+ if( ret->p_sample_offset_pts )
+ {
+ ret->p_sample_offset_pts[i] =
+ p_trun_data->p_samples[i].i_composition_time_offset;
+ }
+
+ if( p_trun_data->i_flags & MP4_TRUN_SAMPLE_SIZE )
+ len = ret->p_sample_size[i] = p_trun_data->p_samples[i].i_size;
+ else
+ len = ret->p_sample_size[i] = default_size;
+
+ ret->p_sample_data[i] = malloc( len );
+ if( ret->p_sample_data[i] == NULL )
+ return VLC_ENOMEM;
+ int read = stream_Read( p_demux->s, ret->p_sample_data[i], len );
+ if( read < (int)len )
+ return VLC_EGENERIC;
+ chunk_size += len;
+ }
+ ret->i_last_dts = ret->i_first_dts + chunk_duration - dur;
+ p_track->i_first_dts = chunk_duration + ret->i_first_dts;
+
+ if( p_track->b_codec_need_restart &&
+ p_track->fmt.i_cat == VIDEO_ES )
+ ReInitDecoder( p_demux, p_track );
+
+ p_track->b_has_non_empty_cchunk = true;
+ return VLC_SUCCESS;
+}
+
+/**
+ * Get the next chunk of the track identified by i_tk_id.
+ * \Note We don't want to seek all the time, so if the first chunk given by the
+ * input method doesn't belong to the right track, we don't throw it away,
+ * and so, in general, this function fetch more than one chunk.
+ * Not to mention that a new init segment might be put everywhere
+ * between two chunks by the input method.
+ */
+static int MP4_frg_GetChunks( demux_t *p_demux, const unsigned i_tk_id )
+{
+ demux_sys_t *p_sys = p_demux->p_sys;
+ mp4_track_t *p_track;
+
+ for( unsigned i = 0; i < p_sys->i_tracks; i++ )
+ {
+ MP4_Box_t *p_chunk = MP4_BoxGetNextChunk( p_demux->s );
+ if( !p_chunk )
+ return VLC_EGENERIC;
+
+ if( !p_chunk->p_first )
+ goto MP4_frg_GetChunks_Error;
+ uint32_t i_type = p_chunk->p_first->i_type;
+ uint16_t tid = 0;
+ if( i_type == ATOM_uuid || i_type == ATOM_ftyp )
+ {
+ MP4_BoxFree( p_demux->s, p_sys->p_root );
+ p_sys->p_root = p_chunk;
+
+ if( i_type == ATOM_ftyp ) /* DASH */
+ {
+ MP4_Box_t *p_tkhd = MP4_BoxGet( p_chunk, "/moov/trak[0]/tkhd" );
+ if( !p_tkhd )
+ {
+ msg_Warn( p_demux, "No tkhd found!" );
+ goto MP4_frg_GetChunks_Error;
+ }
+ tid = p_tkhd->data.p_tkhd->i_track_ID;
+ }
+ else /* Smooth Streaming */
+ {
+ assert( !CmpUUID( &p_chunk->p_first->i_uuid, &SmooBoxUUID ) );
+ MP4_Box_t *p_stra = MP4_BoxGet( p_chunk, "/uuid/uuid[0]" );
+ if( !p_stra || CmpUUID( &p_stra->i_uuid, &StraBoxUUID ) )
+ {
+ msg_Warn( p_demux, "No StraBox found!" );
+ goto MP4_frg_GetChunks_Error;
+ }
+ tid = p_stra->data.p_stra->i_track_ID;
+ }
+
+ p_track = MP4_frg_GetTrack( p_demux, tid );
+ if( !p_track )
+ goto MP4_frg_GetChunks_Error;
+ p_track->b_codec_need_restart = true;
+
+ return MP4_frg_GetChunks( p_demux, i_tk_id );
+ }
+
+ if( MP4_frg_GetChunk( p_demux, p_chunk, (unsigned *)&tid ) != VLC_SUCCESS )
+ goto MP4_frg_GetChunks_Error;
+
+ MP4_BoxFree( p_demux->s, p_chunk );
+
+ if( tid == i_tk_id )
+ break;
+ else
+ continue;
+
+MP4_frg_GetChunks_Error:
+ MP4_BoxFree( p_demux->s, p_chunk );
+ return VLC_EGENERIC;
+ }
+
+ return VLC_SUCCESS;
+}
+
+static int MP4_frg_TrackSelect( demux_t *p_demux, mp4_track_t *p_track )
+{
+ if( !p_track->b_ok || p_track->b_chapter )
+ {
+ return VLC_EGENERIC;
+ }
+
+ if( p_track->b_selected )
+ {
+ msg_Warn( p_demux, "track[Id 0x%x] already selected", p_track->i_track_ID );
+ return VLC_SUCCESS;
+ }
+
+ msg_Dbg( p_demux, "Select track id %u", p_track->i_track_ID );
+ p_track->b_selected = true;
+ return VLC_SUCCESS;
+}
+
+/**
+ * DemuxFrg: read packet and send them to decoders
+ * \return 1 on success, 0 on error.
+ * TODO check for newly selected track
+ */
+int DemuxFrg( demux_t *p_demux )
+{
+ demux_sys_t *p_sys = p_demux->p_sys;
+ unsigned i_track;
+ unsigned i_track_selected;
+
+ /* check for newly selected/unselected track */
+ for( i_track = 0, i_track_selected = 0; i_track < p_sys->i_tracks; i_track++ )
+ {
+ mp4_track_t *tk = &p_sys->track[i_track];
+ bool b;
+
+ if( !tk->b_ok || tk->b_chapter )
+ continue;
+
+ es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, tk->p_es, &b );
+ msg_Dbg( p_demux, "track %u %s!", tk->i_track_ID, b ? "enabled" : "disabled" );
+
+ if( tk->b_selected && !b )
+ {
+ MP4_TrackUnselect( p_demux, tk );
+ }
+ else if( !tk->b_selected && b)
+ {
+ MP4_frg_TrackSelect( p_demux, tk );
+ }
+
+ if( tk->b_selected )
+ i_track_selected++;
+ }
+
+ if( i_track_selected <= 0 )
+ {
+ 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;
+ }
+
+ msg_Warn( p_demux, "no track selected, exiting..." );
+ return 0;
+ }
+
+ /* first wait for the good time to read a packet */
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_sys->i_pcr );
+
+ p_sys->i_pcr = MP4_GetMoviePTS( p_sys );
+
+ /* we will read 100ms for each stream so ...*/
+ p_sys->i_time += __MAX( p_sys->i_timescale / 10, 1 );
+
+ for( i_track = 0; i_track < p_sys->i_tracks; i_track++ )
+ {
+ mp4_track_t *tk = &p_sys->track[i_track];
+
+ if( !tk->b_ok || tk->b_chapter || !tk->b_selected )
+ {
+ msg_Warn( p_demux, "Skipping track id %u", tk->i_track_ID );
+ continue;
+ }
+
+ if( !tk->b_has_non_empty_cchunk )
+ {
+ if( MP4_frg_GetChunks( p_demux, tk->i_track_ID ) != VLC_SUCCESS )
+ {
+ msg_Info( p_demux, "MP4_frg_GetChunks returned error. End of stream?" );
+ return 0;
+ }
+ }
+
+ while( MP4_TrackGetDTS( p_demux, tk ) < MP4_GetMoviePTS( p_sys ) )
+ {
+ block_t *p_block;
+ int64_t i_delta;
+
+ mp4_chunk_t *ck = tk->cchunk;
+ if( ck->i_sample >= ck->i_sample_count )
+ {
+ msg_Err( p_demux, "sample %"PRIu32" of %"PRIu32"",
+ ck->i_sample, ck->i_sample_count );
+ return 0;
+ }
+
+ uint32_t sample_size = ck->p_sample_size[ck->i_sample];
+ p_block = block_Alloc( sample_size );
+ uint8_t *src = ck->p_sample_data[ck->i_sample];
+ memcpy( p_block->p_buffer, src, sample_size );
+
+ ck->i_sample++;
+ if( ck->i_sample == ck->i_sample_count )
+ tk->b_has_non_empty_cchunk = false;
+
+ /* dts */
+ p_block->i_dts = VLC_TS_0 + MP4_TrackGetDTS( p_demux, tk );
+ /* 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
+ p_block->i_pts = VLC_TS_INVALID;
+
+ es_out_Send( p_demux->out, tk->p_es, p_block );
+
+ tk->i_sample++;
+
+ if( !tk->b_has_non_empty_cchunk )
+ break;
+ }
+ }
+ return 1;
+}
projects / vlc / blobdiff