#include <vlc_input.h>
#include "libmp4.h"
-#include "drms.h"
#include "id3genres.h" /* for ATOM_gnre */
/*****************************************************************************
/* display size only ! */
int i_width;
int i_height;
+ float f_rotation;
/* more internal data */
uint64_t i_timescale; /* time scale for this track only */
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;
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->track = calloc( p_sys->i_tracks, sizeof( mp4_track_t ) );
if( p_sys->track == NULL )
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 );
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 */
{
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 )
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;
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;
}
}
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;
+ case VLC_CODEC_AMR_WB:
+ p_track->fmt.audio.i_rate = 16000;
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 )
p_sample->data.p_sample_soun->p_qt_description,
p_track->fmt.i_extra);
}
+ if( p_track->fmt.i_extra >= 56 && p_sample->i_type == VLC_CODEC_ALAC )
+ {
+ p_track->fmt.audio.i_channels = *((uint8_t*)p_track->fmt.p_extra + 41);
+ p_track->fmt.audio.i_rate = GetDWBE((uint8_t*)p_track->fmt.p_extra + 52);
+ }
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];
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 )
{
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" ) )
{
projects / vlc / blobdiff