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;
/*****************************************************************************
* Declaration of local function
*****************************************************************************/
-static void MP4_TrackCreate ( demux_t *, mp4_track_t *, MP4_Box_t *);
-static void MP4_TrackDestroy( demux_t *, mp4_track_t * );
+static void MP4_TrackCreate ( demux_t *, mp4_track_t *, MP4_Box_t *, bool b_force_enable );
+static void MP4_TrackDestroy( mp4_track_t * );
static int MP4_TrackSelect ( demux_t *, mp4_track_t *, mtime_t );
static void MP4_TrackUnselect(demux_t *, mp4_track_t * );
static void MP4_TrackSetELST( demux_t *, mp4_track_t *, int64_t );
static void MP4_UpdateSeekpoint( demux_t * );
+static const char *MP4_ConvertMacCode( uint16_t );
/* Return time in s of a track */
static inline int64_t MP4_TrackGetDTS( demux_t *p_demux, mp4_track_t *p_track )
return INT64_C(1000000) * i_dts / p_track->i_timescale;
}
-static inline int64_t MP4_TrackGetPTSDelta( demux_t *p_demux, mp4_track_t *p_track )
+static inline int64_t MP4_TrackGetPTSDelta( mp4_track_t *p_track )
{
mp4_chunk_t *ck = &p_track->chunk[p_track->i_chunk];
unsigned int i_index = 0;
unsigned int i;
bool b_seekable;
+ bool b_enabled_es;
/* A little test to see if it could be a mp4 */
if( stream_Peek( p_demux->s, &p_peek, 8 ) < 8 ) return VLC_EGENERIC;
if( end ) end[1] = '\0';
else *psz_path = '\0';
- asprintf( &psz_absolute, "%s://%s%s",
- p_demux->psz_access, psz_path, psz_ref );
+ if( asprintf( &psz_absolute, "%s://%s%s",
+ p_demux->psz_access, psz_path, psz_ref ) < 0 )
+ return VLC_ENOMEM;
free( psz_ref );
psz_ref = psz_absolute;
}
input_item_t *p_input;
msg_Dbg( p_demux, "adding ref = `%s'", psz_ref );
- p_input = input_ItemNewExt( p_demux, psz_ref, NULL,
+ p_input = input_item_NewExt( p_demux, psz_ref, NULL,
0, NULL, -1 );
- input_ItemCopyOptions( p_current, p_input );
- input_ItemAddSubItem( p_current, p_input );
+ input_item_CopyOptions( p_current, p_input );
+ input_item_AddSubItem( p_current, p_input );
vlc_gc_decref( p_input );
}
else
goto error;
memset( p_sys->track, 0, p_sys->i_tracks * sizeof( mp4_track_t ) );
- /* Search the first chap reference (like quicktime) */
+ /* Search the first chap reference (like quicktime) and
+ * check that at least 1 stream is enabled */
p_sys->p_tref_chap = NULL;
+ b_enabled_es = false;
for( i = 0; i < p_sys->i_tracks; i++ )
{
MP4_Box_t *p_trak = MP4_BoxGet( p_sys->p_root, "/moov/trak[%d]", i );
- MP4_Box_t *p_chap = MP4_BoxGet( p_trak, "tref/chap", i );
- if( !p_chap || p_chap->data.p_tref_generic->i_entry_count <= 0 )
- continue;
- p_sys->p_tref_chap = p_chap;
- break;
+
+ MP4_Box_t *p_tkhd = MP4_BoxGet( p_trak, "tkhd" );
+ if( p_tkhd && (p_tkhd->data.p_tkhd->i_flags&MP4_TRACK_ENABLED) )
+ b_enabled_es = true;
+
+ MP4_Box_t *p_chap = MP4_BoxGet( p_trak, "tref/chap", i );
+ if( p_chap && p_chap->data.p_tref_generic->i_entry_count > 0 && !p_sys->p_tref_chap )
+ p_sys->p_tref_chap = p_chap;
}
/* now process each track and extract all usefull information */
for( i = 0; i < p_sys->i_tracks; i++ )
{
p_trak = MP4_BoxGet( p_sys->p_root, "/moov/trak[%d]", i );
- MP4_TrackCreate( p_demux, &p_sys->track[i], p_trak );
+ MP4_TrackCreate( p_demux, &p_sys->track[i], p_trak, !b_enabled_es );
if( p_sys->track[i].b_ok && !p_sys->track[i].b_chapter )
{
/* dts */
p_block->i_dts = MP4_TrackGetDTS( p_demux, tk ) + 1;
/* pts */
- i_delta = MP4_TrackGetPTSDelta( p_demux, tk );
+ i_delta = MP4_TrackGetPTSDelta( tk );
if( i_delta != -1 )
p_block->i_pts = p_block->i_dts + i_delta;
else if( tk->fmt.i_cat != VIDEO_ES )
MP4_BoxFree( p_demux->s, p_sys->p_root );
for( i_track = 0; i_track < p_sys->i_tracks; i_track++ )
{
- MP4_TrackDestroy( p_demux, &p_sys->track[i_track] );
+ MP4_TrackDestroy( &p_sys->track[i_track] );
}
FREENULL( p_sys->track );
for( tk->i_sample = 0; tk->i_sample < tk->i_sample_count; tk->i_sample++ )
{
const int64_t i_dts = MP4_TrackGetDTS( p_demux, tk );
- const int64_t i_pts_delta = MP4_TrackGetPTSDelta( p_demux, tk );
+ const int64_t i_pts_delta = MP4_TrackGetPTSDelta( tk );
const unsigned int i_size = MP4_TrackSampleSize( tk );
if( i_size > 0 && !stream_Seek( p_demux->s, MP4_TrackGetPos( tk ) ) )
}
if( j < p_sys->i_tracks )
{
- LoadChapterApple( p_demux, &p_sys->track[i] );
+ LoadChapterApple( p_demux, &p_sys->track[j] );
break;
}
}
{
case( VLC_FOURCC( '.', 'm', 'p', '3' ) ):
case( VLC_FOURCC( 'm', 's', 0x00, 0x55 ) ):
+ {
+ MP4_Box_data_sample_soun_t *p_soun = p_sample->data.p_sample_soun;
p_track->fmt.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'a' );
+ if( p_track->i_sample_size > 1 )
+ p_soun->i_qt_version = 0;
break;
+ }
case( VLC_FOURCC( 'r', 'a', 'w', ' ' ) ):
case( VLC_FOURCC( 'N', 'O', 'N', 'E' ) ):
p_track->fmt.i_codec = VLC_FOURCC( 's', 'u', 'b', 't' );
/* FIXME: Not true, could be UTF-16 with a Byte Order Mark (0xfeff) */
/* FIXME UTF-8 doesn't work here ? */
- p_track->fmt.subs.psz_encoding = strdup( "UTF-8" );
+ if( p_track->b_mac_encoding )
+ p_track->fmt.subs.psz_encoding = strdup( "MAC" );
+ else
+ p_track->fmt.subs.psz_encoding = strdup( "UTF-8" );
break;
case VLC_FOURCC('y','v','1','2'):
case( 0x6c ): /* jpeg */
p_track->fmt.i_codec = VLC_FOURCC( 'j','p','e','g' );
break;
+ case( 0x6d ): /* png */
+ p_track->fmt.i_codec = VLC_FOURCC( 'p','n','g',' ' );
+ break;
+ case( 0x6e ): /* jpeg200 */
+ p_track->fmt.i_codec = VLC_FOURCC( 'M','J','2','C' );
+ break;
+ case( 0xa3 ): /* vc1 */
+ p_track->fmt.i_codec = VLC_FOURCC( 'W','V','C','1' );
+ break;
/* Private ID */
case( 0xe0 ): /* NeroDigital: dvd subs */
p_track->fmt.subs.spu.i_original_frame_height = p_track->i_height;
break;
}
+ case( 0xe1 ): /* QCelp for 3gp */
+ if( p_track->fmt.i_cat == AUDIO_ES )
+ {
+ p_track->fmt.i_codec = VLC_FOURCC( 'Q','c','l','p' );
+ }
+ break;
+
/* Fallback */
default:
/* Unknown entry, but don't touch i_fourcc */
break;
}
+ case VLC_FOURCC('m','s',0x00,0x02):
+ case VLC_FOURCC('m','s',0x00,0x11):
+ p_track->fmt.audio.i_blockalign = p_sample->data.p_sample_soun->i_bytes_per_frame;
+ break;
+
default:
break;
}
* If it succeed b_ok is set to 1 else to 0
****************************************************************************/
static void MP4_TrackCreate( demux_t *p_demux, mp4_track_t *p_track,
- MP4_Box_t *p_box_trak )
+ MP4_Box_t *p_box_trak,
+ bool b_force_enable )
{
demux_sys_t *p_sys = p_demux->p_sys;
p_track->b_enable = false;
p_track->b_selected = false;
p_track->b_chapter = false;
+ p_track->b_mac_encoding = false;
es_format_Init( &p_track->fmt, UNKNOWN_ES, 0 );
/* do we launch this track by default ? */
p_track->b_enable =
( ( p_tkhd->data.p_tkhd->i_flags&MP4_TRACK_ENABLED ) != 0 );
+ if( !p_track->b_enable )
+ p_track->fmt.i_priority = -1;
p_track->i_track_ID = p_tkhd->data.p_tkhd->i_track_ID;
p_track->i_width = p_tkhd->data.p_tkhd->i_width / 65536;
if( !p_track->i_timescale )
return;
- for( i = 0; i < 3; i++ )
+ if( p_mdhd->data.p_mdhd->i_language_code < 0x800 )
+ {
+ /* We can convert i_language_code into iso 639 code,
+ * I won't */
+ strcpy( language, MP4_ConvertMacCode( p_mdhd->data.p_mdhd->i_language_code ) );
+ p_track->b_mac_encoding = true;
+ }
+ else
{
- language[i] = p_mdhd->data.p_mdhd->i_language[i];
+ for( i = 0; i < 3; i++ )
+ language[i] = p_mdhd->data.p_mdhd->i_language[i];
+ language[3] = '\0';
}
- language[3] = '\0';
switch( p_hdlr->data.p_hdlr->i_handler_type )
{
p_drms->data.p_sample_soun->p_drms : NULL;
/* Set language */
- if( strcmp( language, "```" ) && strcmp( language, "und" ) )
+ if( *language && strcmp( language, "```" ) && strcmp( language, "und" ) )
{
p_track->fmt.psz_language = strdup( language );
}
p_track->i_sample = 0;
/* Mark chapter only track */
- if( !p_track->b_enable && p_sys->p_tref_chap )
+ if( p_sys->p_tref_chap )
{
MP4_Box_data_tref_generic_t *p_chap = p_sys->p_tref_chap->data.p_tref_generic;
unsigned int i;
if( p_track->i_track_ID == p_chap->i_track_ID[i] )
{
p_track->b_chapter = true;
+ p_track->b_enable = false;
break;
}
}
}
/* now create es */
+ if( b_force_enable &&
+ ( p_track->fmt.i_cat == VIDEO_ES || p_track->fmt.i_cat == AUDIO_ES ) )
+ {
+ msg_Warn( p_demux, "Enabling track[Id 0x%x] (buggy file without enabled track)",
+ p_track->i_track_ID );
+ p_track->b_enable = true;
+ p_track->fmt.i_priority = 0;
+ }
+
p_track->p_es = NULL;
if( TrackCreateES( p_demux,
p_track, p_track->i_chunk,
****************************************************************************
* Destroy a track created by MP4_TrackCreate.
****************************************************************************/
-static void MP4_TrackDestroy( demux_t *p_demux, mp4_track_t *p_track )
+static void MP4_TrackDestroy( mp4_track_t *p_track )
{
unsigned int i_chunk;
msg_Warn( p_demux, "elst old=%d new=%d", i_elst_last, tk->i_elst );
}
}
+
+/* */
+static const char *MP4_ConvertMacCode( uint16_t i_code )
+{
+ static const struct { const char *psz_iso639_1; uint16_t i_code; } p_cvt[] = {
+ { "en", 0 }, { "fr", 1 }, { "de", 2 }, { "it", 3 }, { "nl", 4 },
+ { "sv", 5 }, { "es", 6 }, { "da", 7 }, { "pt", 8 }, { "no", 9 },
+ { "he", 10 }, { "ja", 11 }, { "ar", 12 }, { "fi", 13 }, { "el", 14 },
+ { "is", 15 }, { "mt", 16 }, { "tr", 17 }, { "hr", 18 }, { "zh", 19 },
+ { "ur", 20 }, { "hi", 21 }, { "th", 22 }, { "ko", 23 }, { "lt", 24 },
+ { "pl", 25 }, { "hu", 26 }, { "et", 27 }, { "lv", 28 }, //{ "??", 29 },
+ { "fo", 30 }, { "fa", 31 }, { "ru", 32 }, { "zh", 33 }, { "nl", 34 },
+ { "ga", 35 }, { "sq", 36 }, { "ro", 37 }, { "cs", 38 }, { "sk", 39 },
+ { "sl", 40 }, { "yi", 41 }, { "sr", 42 }, { "mk", 43 }, { "bg", 44 },
+ { "uk", 45 }, { "be", 46 }, { "uz", 47 }, { "az", 48 }, { "kk", 48 },
+ { "az", 50 }, { "hy", 51 }, { "ka", 52 }, { "mo", 53 }, { "ky", 54 },
+ { "tg", 55 }, { "tk", 56 }, { "mn", 57 }, { "mn", 58 }, { "ps", 59 },
+ { "ku", 60 }, { "ks", 61 }, { "sd", 62 }, { "bo", 63 }, { "ne", 64 },
+ { "sa", 65 }, { "mr", 66 }, { "bn", 67 }, { "as", 68 }, { "gu", 69 },
+ { "pa", 70 }, { "or", 71 }, { "ml", 72 }, { "kn", 73 }, { "ta", 74 },
+ { "te", 75 }, { "si", 76 }, { "my", 77 }, { "km", 78 }, { "lo", 79 },
+ { "vi", 80 }, { "id", 81 }, { "tl", 82 }, { "ms", 83 }, { "ms", 84 },
+ { "am", 85 }, { "ti", 86 }, { "om", 87 }, { "so", 88 }, { "sw", 89 },
+ { "rw", 90 }, { "rn", 91 }, { "ny", 92 }, { "mg", 93 }, { "eo", 94 },
+
+ { "cy", 128 }, { "eu", 129 },
+ { "ca", 130 }, { "la", 131 }, { "qu", 132 }, { "gn", 133 }, { "ay", 134 },
+ { "tt", 135 }, { "ug", 136 }, { "dz", 137 }, { "jv", 138 }, { "su", 139 },
+ { "gl", 140 }, { "af", 141 }, { "br", 142 }, { "iu", 143 }, { "gd", 144 },
+ { "gv", 145 }, { "ga", 146 }, { "to", 147 }, { "el", 148 },
+ /* */
+ { NULL, 0 }
+ };
+ int i;
+ for( i = 0; p_cvt[i].psz_iso639_1 != NULL; i++ )
+ {
+ if( p_cvt[i].i_code == i_code )
+ return p_cvt[i].psz_iso639_1;
+ }
+ return "";
+}
projects / vlc / blobdiff