#include "libmp4.h"
#include "drms.h"
-#include "id3genres.h" /* for FOURCC_gnre */
+#include "id3genres.h" /* for ATOM_gnre */
/*****************************************************************************
* Module descriptor
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 ATOM_ftyp:
+ case ATOM_moov:
+ case ATOM_foov:
+ case ATOM_moof:
+ case ATOM_mdat:
+ case ATOM_udta:
+ case ATOM_free:
+ case ATOM_skip:
+ case ATOM_wide:
case VLC_FOURCC( 'p', 'n', 'o', 't' ):
break;
default:
{
switch( p_ftyp->data.p_ftyp->i_major_brand )
{
- case( FOURCC_isom ):
+ case( ATOM_isom ):
msg_Dbg( p_demux,
"ISO Media file (isom) version %d.",
p_ftyp->data.p_ftyp->i_minor_version );
break;
- case( FOURCC_3gp4 ):
+ case( ATOM_3gp4 ):
case( VLC_FOURCC( '3', 'g', 'p', '5' ) ):
case( VLC_FOURCC( '3', 'g', 'p', '6' ) ):
case( VLC_FOURCC( '3', 'g', 'p', '7' ) ):
}
}
/* we have a free box as a moov, rename it */
- p_foov->i_type = FOURCC_moov;
+ p_foov->i_type = ATOM_moov;
}
if( ( p_rmra = MP4_BoxGet( p_sys->p_root, "/moov/rmra" ) ) )
if( tk->fmt.i_codec == VLC_FOURCC( 's', 'u', 'b', 't' ) &&
p_block->i_buffer >= 2 )
{
- uint16_t i_size = GetWBE( p_block->p_buffer );
+ size_t i_size = GetWBE( p_block->p_buffer );
if( i_size + 2 <= p_block->i_buffer )
{
/* XXX Becarefull p_udta can have box that are not 0xa9xx */
switch( p_0xa9xxx->i_type )
{
- case FOURCC_0xa9nam: /* Full name */
+ case ATOM_0xa9nam: /* Full name */
SET( vlc_meta_SetTitle );
break;
- case FOURCC_0xa9aut:
+ case ATOM_0xa9aut:
SET( vlc_meta_SetArtist );
break;
- case FOURCC_0xa9ART:
+ case ATOM_0xa9ART:
SET( vlc_meta_SetArtist );
break;
- case FOURCC_0xa9cpy:
+ case ATOM_0xa9cpy:
SET( vlc_meta_SetCopyright );
break;
- case FOURCC_0xa9day: /* Creation Date */
+ case ATOM_0xa9day: /* Creation Date */
SET( vlc_meta_SetDate );
break;
- case FOURCC_0xa9des: /* Description */
+ case ATOM_0xa9des: /* Description */
SET( vlc_meta_SetDescription );
break;
- case FOURCC_0xa9gen: /* Genre */
+ case ATOM_0xa9gen: /* Genre */
SET( vlc_meta_SetGenre );
break;
- case FOURCC_gnre:
+ case ATOM_gnre:
if( p_0xa9xxx->data.p_gnre->i_genre <= NUM_GENRES )
vlc_meta_SetGenre( p_meta, ppsz_genres[p_0xa9xxx->data.p_gnre->i_genre - 1] );
break;
- case FOURCC_0xa9alb: /* Album */
+ case ATOM_0xa9alb: /* Album */
SET( vlc_meta_SetAlbum );
break;
- case FOURCC_0xa9trk: /* Track */
+ case ATOM_0xa9trk: /* Track */
SET( vlc_meta_SetTrackNum );
break;
- case FOURCC_trkn:
+ case ATOM_trkn:
{
char psz_trck[11];
snprintf( psz_trck, sizeof( psz_trck ), "%i",
vlc_meta_SetTrackNum( p_meta, psz_trck );
break;
}
- case FOURCC_0xa9cmt: /* Commment */
+ case ATOM_0xa9cmt: /* Commment */
SET( vlc_meta_SetDescription );
break;
- case FOURCC_0xa9url: /* URL */
+ case ATOM_0xa9url: /* URL */
SET( vlc_meta_SetURL );
break;
- case FOURCC_0xa9too: /* Encoder Tool */
- case FOURCC_0xa9enc: /* Encoded By */
+ case ATOM_0xa9too: /* Encoder Tool */
+ case ATOM_0xa9enc: /* Encoded By */
SET( vlc_meta_SetEncodedBy );
break;
#undef SET
static const struct { uint32_t xa9_type; char metadata[25]; } xa9typetoextrameta[] =
{
- { FOURCC_0xa9wrt, N_("Writer") },
- { FOURCC_0xa9com, N_("Composr") },
- { FOURCC_0xa9prd, N_("Producer") },
- { FOURCC_0xa9inf, N_("Information") },
- { FOURCC_0xa9dir, N_("Director") },
- { FOURCC_0xa9dis, N_("Disclaimer") },
- { FOURCC_0xa9req, N_("Requirements") },
- { FOURCC_0xa9fmt, N_("Original Format") },
- { FOURCC_0xa9dsa, N_("Display Source As") },
- { FOURCC_0xa9hst, N_("Host Computer") },
- { FOURCC_0xa9prf, N_("Performers") },
- { FOURCC_0xa9ope, N_("Original Performer") },
- { FOURCC_0xa9src, N_("Providers Source Content") },
- { FOURCC_0xa9wrn, N_("Warning") },
- { FOURCC_0xa9swr, N_("Software") },
- { FOURCC_0xa9lyr, N_("Lyrics") },
- { FOURCC_0xa9mak, N_("Make") },
- { FOURCC_0xa9mod, N_("Model") },
- { FOURCC_0xa9PRD, N_("Product") },
- { FOURCC_0xa9grp, N_("Grouping") },
+ { ATOM_0xa9wrt, N_("Writer") },
+ { ATOM_0xa9com, N_("Composr") },
+ { ATOM_0xa9prd, N_("Producer") },
+ { ATOM_0xa9inf, N_("Information") },
+ { ATOM_0xa9dir, N_("Director") },
+ { ATOM_0xa9dis, N_("Disclaimer") },
+ { ATOM_0xa9req, N_("Requirements") },
+ { ATOM_0xa9fmt, N_("Original Format") },
+ { ATOM_0xa9dsa, N_("Display Source As") },
+ { ATOM_0xa9hst, N_("Host Computer") },
+ { ATOM_0xa9prf, N_("Performers") },
+ { ATOM_0xa9ope, N_("Original Performer") },
+ { ATOM_0xa9src, N_("Providers Source Content") },
+ { ATOM_0xa9wrn, N_("Warning") },
+ { ATOM_0xa9swr, N_("Software") },
+ { ATOM_0xa9lyr, N_("Lyrics") },
+ { ATOM_0xa9mak, N_("Make") },
+ { ATOM_0xa9mod, N_("Model") },
+ { ATOM_0xa9PRD, N_("Product") },
+ { ATOM_0xa9grp, N_("Grouping") },
{ 0, "" },
};
for( unsigned i = 0; xa9typetoextrameta[i].xa9_type; i++ )
MP4_Box_t *p_esds;
MP4_Box_t *p_frma;
MP4_Box_t *p_enda;
+ MP4_Box_t *p_pasp;
if( pp_es )
*pp_es = NULL;
if( !p_enda )
p_enda = MP4_BoxGet( p_sample, "enda" );
+ 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_track->fmt.video.i_sar_num = p_track->i_width * p_track->fmt.video.i_height;
p_track->fmt.video.i_sar_den = p_track->i_height * p_track->fmt.video.i_width;
}
+ if( p_pasp && p_pasp->data.p_pasp->i_horizontal_spacing > 0 &&
+ p_pasp->data.p_pasp->i_vertical_spacing > 0 )
+ {
+ p_track->fmt.video.i_sar_num = p_pasp->data.p_pasp->i_horizontal_spacing;
+ p_track->fmt.video.i_sar_den = p_pasp->data.p_pasp->i_vertical_spacing;
+ }
/* Support for cropping (eg. in H263 files) */
p_track->fmt.video.i_visible_width = p_track->fmt.video.i_width;
switch( p_hdlr->data.p_hdlr->i_handler_type )
{
- case( FOURCC_soun ):
+ case( ATOM_soun ):
if( !( p_smhd = MP4_BoxGet( p_box_trak, "mdia/minf/smhd" ) ) )
{
return;
p_track->fmt.i_cat = AUDIO_ES;
break;
- case( FOURCC_vide ):
+ case( ATOM_vide ):
if( !( p_vmhd = MP4_BoxGet( p_box_trak, "mdia/minf/vmhd" ) ) )
{
return;
p_track->fmt.i_cat = VIDEO_ES;
break;
- case( FOURCC_text ):
- case( FOURCC_subp ):
- case( FOURCC_tx3g ):
- case( FOURCC_sbtl ):
+ case( ATOM_text ):
+ case( ATOM_subp ):
+ case( ATOM_tx3g ):
+ case( ATOM_sbtl ):
p_track->fmt.i_cat = SPU_ES;
break;
p_udta = MP4_BoxGet( p_box_trak, "udta" );
if( p_udta )
{
- MP4_Box_t *p_0xa9xxx;
- for( p_0xa9xxx = p_udta->p_first; p_0xa9xxx != NULL;
- p_0xa9xxx = p_0xa9xxx->p_next )
+ MP4_Box_t *p_box_iter;
+ for( p_box_iter = p_udta->p_first; p_box_iter != NULL;
+ p_box_iter = p_box_iter->p_next )
{
- switch( p_0xa9xxx->i_type )
+ switch( p_box_iter->i_type )
{
- case FOURCC_0xa9nam:
+ case ATOM_0xa9nam:
p_track->fmt.psz_description =
- strdup( p_0xa9xxx->data.p_0xa9xxx->psz_text );
+ strdup( p_box_iter->data.p_0xa9xxx->psz_text );
+ break;
+ case ATOM_name:
+ p_track->fmt.psz_description =
+ strdup( p_box_iter->data.p_name->psz_text );
break;
}
}
MP4_Box_data_sample_soun_t *p_soun =
p_track->p_sample->data.p_sample_soun;
- if( p_soun->i_qt_version == 0 )
+ if( p_track->fmt.i_cat != AUDIO_ES || p_soun->i_qt_version == 0 )
{
i_pos += ( p_track->i_sample -
p_track->chunk[p_track->i_chunk].i_sample_first ) *
projects / vlc / blobdiff