X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fdts.c;h=5b9d2f2c0596443fdb57fac79d2b364e89835119;hb=f8c95ffa2ba4bf2d21105a622ef805802605e224;hp=e7a088de85aad5c4a0e068740ce8a94a66e969cf;hpb=4b029f256a1fcff3baafc1c4e0670283544f03ba;p=vlc diff --git a/modules/demux/dts.c b/modules/demux/dts.c index e7a088de85..5b9d2f2c05 100644 --- a/modules/demux/dts.c +++ b/modules/demux/dts.c @@ -2,7 +2,7 @@ * dts.c : raw DTS stream input module for vlc ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: dts.c,v 1.9 2004/02/24 19:23:11 gbazin Exp $ + * $Id$ * * Authors: Gildas Bazin * @@ -28,18 +28,24 @@ #include #include -#define DTS_PACKET_SIZE 16384 -#define DTS_PROBE_SIZE (DTS_PACKET_SIZE * 4) -#define DTS_MAX_HEADER_SIZE 11 - /***************************************************************************** - * Local prototypes + * Module descriptor *****************************************************************************/ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -static int Demux ( input_thread_t * ); -static int Control( input_thread_t *, int, va_list ); +vlc_module_begin(); + set_description( _("Raw DTS demuxer") ); + set_capability( "demux2", 155 ); + set_callbacks( Open, Close ); + add_shortcut( "dts" ); +vlc_module_end(); + +/***************************************************************************** + * Local prototypes + *****************************************************************************/ +static int Demux ( demux_t * ); +static int Control( demux_t *, int, va_list ); struct demux_sys_t { @@ -52,67 +58,24 @@ struct demux_sys_t int i_mux_rate; }; -/***************************************************************************** - * Module descriptor - *****************************************************************************/ -vlc_module_begin(); - set_description( _("Raw DTS demuxer") ); - set_capability( "demux", 155 ); - set_callbacks( Open, Close ); - add_shortcut( "dts" ); -vlc_module_end(); +static int CheckSync( uint8_t *p_peek ); -/***************************************************************************** - * CheckSync: Check if buffer starts with a DTS sync code - *****************************************************************************/ -static int CheckSync( uint8_t *p_peek ) -{ - /* 14 bits, little endian version of the bitstream */ - if( p_peek[0] == 0xff && p_peek[1] == 0x1f && - p_peek[2] == 0x00 && p_peek[3] == 0xe8 && - (p_peek[4] & 0xf0) == 0xf0 && p_peek[5] == 0x07 ) - { - return VLC_SUCCESS; - } - /* 14 bits, big endian version of the bitstream */ - else if( p_peek[0] == 0x1f && p_peek[1] == 0xff && - p_peek[2] == 0xe8 && p_peek[3] == 0x00 && - p_peek[4] == 0x07 && (p_peek[5] & 0xf0) == 0xf0) - { - return VLC_SUCCESS; - } - /* 16 bits, big endian version of the bitstream */ - else if( p_peek[0] == 0x7f && p_peek[1] == 0xfe && - p_peek[2] == 0x80 && p_peek[3] == 0x01 ) - { - return VLC_SUCCESS; - } - /* 16 bits, little endian version of the bitstream */ - else if( p_peek[0] == 0xfe && p_peek[1] == 0x7f && - p_peek[2] == 0x01 && p_peek[3] == 0x80 ) - { - return VLC_SUCCESS; - } - - return VLC_EGENERIC; -} +#define DTS_PACKET_SIZE 16384 +#define DTS_PROBE_SIZE (DTS_PACKET_SIZE * 4) +#define DTS_MAX_HEADER_SIZE 11 /***************************************************************************** * Open: initializes ES structures *****************************************************************************/ static int Open( vlc_object_t * p_this ) { - input_thread_t *p_input = (input_thread_t *)p_this; - demux_sys_t *p_sys; - byte_t * p_peek; - int i_peek = 0; - - p_input->pf_demux = Demux; - p_input->pf_demux_control = Control; - p_input->pf_rewind = NULL; + demux_t *p_demux = (demux_t*)p_this; + demux_sys_t *p_sys; + byte_t * p_peek; + int i_peek = 0; /* Check if we are dealing with a WAV file */ - if( input_Peek( p_input, &p_peek, 20 ) == 20 && + if( stream_Peek( p_demux->s, &p_peek, 20 ) == 20 && !strncmp( p_peek, "RIFF", 4 ) && !strncmp( &p_peek[8], "WAVE", 4 ) ) { int i_size; @@ -125,7 +88,7 @@ static int Open( vlc_object_t * p_this ) if( i_size + i_peek > DTS_PROBE_SIZE ) return VLC_EGENERIC; i_peek += i_size + 8; - if( input_Peek( p_input, &p_peek, i_peek ) != i_peek ) + if( stream_Peek( p_demux->s, &p_peek, i_peek ) != i_peek ) return VLC_EGENERIC; } @@ -133,7 +96,7 @@ static int Open( vlc_object_t * p_this ) i_size = GetDWLE( p_peek + i_peek - 4 ); if( i_size + i_peek > DTS_PROBE_SIZE ) return VLC_EGENERIC; i_peek += i_size + 8; - if( input_Peek( p_input, &p_peek, i_peek ) != i_peek ) + if( stream_Peek( p_demux->s, &p_peek, i_peek ) != i_peek ) return VLC_EGENERIC; if( GetWLE( p_peek + i_peek - i_size - 8 /* wFormatTag */ ) != 1 /* WAVE_FORMAT_PCM */ ) @@ -151,13 +114,13 @@ static int Open( vlc_object_t * p_this ) if( i_size + i_peek > DTS_PROBE_SIZE ) return VLC_EGENERIC; i_peek += i_size + 8; - if( input_Peek( p_input, &p_peek, i_peek ) != i_peek ) + if( stream_Peek( p_demux->s, &p_peek, i_peek ) != i_peek ) return VLC_EGENERIC; } /* Some DTS wav files don't begin with a sync code so we do a more * extensive search */ - i_size = input_Peek( p_input, &p_peek, DTS_PROBE_SIZE ); + i_size = stream_Peek( p_demux->s, &p_peek, DTS_PROBE_SIZE ); i_size -= DTS_MAX_HEADER_SIZE; while( i_peek < i_size ) @@ -171,36 +134,35 @@ static int Open( vlc_object_t * p_this ) } /* Have a peep at the show. */ - if( input_Peek( p_input, &p_peek, i_peek + DTS_MAX_HEADER_SIZE * 2 ) < + if( stream_Peek( p_demux->s, &p_peek, i_peek + DTS_MAX_HEADER_SIZE * 2 ) < i_peek + DTS_MAX_HEADER_SIZE * 2 ) { /* Stream too short */ - msg_Warn( p_input, "cannot peek()" ); + msg_Warn( p_demux, "cannot peek()" ); return VLC_EGENERIC; } if( CheckSync( p_peek + i_peek ) != VLC_SUCCESS ) { - if( p_input->psz_demux && !strncmp( p_input->psz_demux, "dts", 3 ) ) - { - /* User forced */ - msg_Err( p_input, "this doesn't look like a DTS audio stream, " - "continuing anyway" ); - } - else + if( strncmp( p_demux->psz_demux, "dts", 3 ) ) { return VLC_EGENERIC; } + /* User forced */ + msg_Err( p_demux, "this doesn't look like a DTS audio stream, " + "continuing anyway" ); } - p_input->p_demux_data = p_sys = malloc( sizeof( demux_sys_t ) ); + p_demux->pf_demux = Demux; + p_demux->pf_control = Control; + p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) ); p_sys->b_start = VLC_TRUE; p_sys->i_mux_rate = 0; /* * Load the DTS packetizer */ - p_sys->p_packetizer = vlc_object_create( p_input, VLC_OBJECT_DECODER ); + p_sys->p_packetizer = vlc_object_create( p_demux, VLC_OBJECT_DECODER ); p_sys->p_packetizer->pf_decode_audio = 0; p_sys->p_packetizer->pf_decode_video = 0; p_sys->p_packetizer->pf_decode_sub = 0; @@ -211,26 +173,14 @@ static int Open( vlc_object_t * p_this ) VLC_FOURCC( 'd', 't', 's', ' ' ) ); p_sys->p_packetizer->p_module = - module_Need( p_sys->p_packetizer, "packetizer", NULL ); + module_Need( p_sys->p_packetizer, "packetizer", NULL, 0 ); if( !p_sys->p_packetizer->p_module ) { - msg_Err( p_input, "cannot find DTS packetizer" ); - return VLC_EGENERIC; - } - - /* 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" ); + msg_Err( p_demux, "cannot find DTS packetizer" ); return VLC_EGENERIC; } - p_input->stream.i_mux_rate = 0; - vlc_mutex_unlock( &p_input->stream.stream_lock ); - p_sys->p_es = - es_out_Add( p_input->p_es_out, &p_sys->p_packetizer->fmt_in ); + p_sys->p_es = es_out_Add( p_demux->out, &p_sys->p_packetizer->fmt_in ); return VLC_SUCCESS; } @@ -238,10 +188,10 @@ static int Open( vlc_object_t * p_this ) /***************************************************************************** * Close: frees unused data *****************************************************************************/ -static void Close( vlc_object_t * p_this ) +static void Close( vlc_object_t *p_this ) { - input_thread_t *p_input = (input_thread_t*)p_this; - demux_sys_t *p_sys = p_input->p_demux_data; + demux_t *p_demux = (demux_t*)p_this; + demux_sys_t *p_sys = p_demux->p_sys; /* Unneed module */ module_Unneed( p_sys->p_packetizer, p_sys->p_packetizer->p_module ); @@ -257,12 +207,12 @@ static void Close( vlc_object_t * p_this ) ***************************************************************************** * Returns -1 in case of error, 0 in case of EOF, 1 otherwise *****************************************************************************/ -static int Demux( input_thread_t * p_input ) +static int Demux( demux_t *p_demux ) { - demux_sys_t *p_sys = p_input->p_demux_data; + demux_sys_t *p_sys = p_demux->p_sys; block_t *p_block_in, *p_block_out; - if( !( p_block_in = stream_Block( p_input->s, DTS_PACKET_SIZE ) ) ) + if( !( p_block_in = stream_Block( p_demux->s, DTS_PACKET_SIZE ) ) ) { return 0; } @@ -283,20 +233,15 @@ static int Demux( input_thread_t * p_input ) /* We assume a constant bitrate */ if( p_block_out->i_length ) - p_sys->i_mux_rate = - p_block_out->i_buffer * I64C(1000000) / p_block_out->i_length; - p_input->stream.i_mux_rate = p_sys->i_mux_rate / 50; - - input_ClockManageRef( p_input, - p_input->stream.p_selected_program, - p_block_out->i_pts * 9 / 100 ); + { + p_sys->i_mux_rate = + p_block_out->i_buffer * I64C(1000000) / p_block_out->i_length; + } - p_block_in->b_discontinuity = 0; - p_block_out->i_dts = p_block_out->i_pts = - input_ClockGetTS( p_input, p_input->stream.p_selected_program, - p_block_out->i_pts * 9 / 100 ); + /* set PCR */ + es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block_out->i_dts ); - es_out_Send( p_input->p_es_out, p_sys->p_es, p_block_out ); + es_out_Send( p_demux->out, p_sys->p_es, p_block_out ); p_block_out = p_next; } @@ -308,36 +253,49 @@ static int Demux( input_thread_t * p_input ) /***************************************************************************** * Control: *****************************************************************************/ -static int Control( input_thread_t *p_input, int i_query, va_list args ) +static int Control( demux_t *p_demux, int i_query, va_list args ) { - demux_sys_t *p_sys = (demux_sys_t *)p_input->p_demux_data; - int64_t *pi64; + demux_sys_t *p_sys = p_demux->p_sys; + if( i_query == DEMUX_SET_TIME ) + return VLC_EGENERIC; + else + return demux2_vaControlHelper( p_demux->s, + 0, -1, + 8*p_sys->i_mux_rate, 1, i_query, args ); +} - switch( i_query ) +/***************************************************************************** + * CheckSync: Check if buffer starts with a DTS sync code + *****************************************************************************/ +static int CheckSync( uint8_t *p_peek ) +{ + /* 14 bits, little endian version of the bitstream */ + if( p_peek[0] == 0xff && p_peek[1] == 0x1f && + p_peek[2] == 0x00 && p_peek[3] == 0xe8 && + (p_peek[4] & 0xf0) == 0xf0 && p_peek[5] == 0x07 ) { - case DEMUX_GET_TIME: - pi64 = (int64_t*)va_arg( args, int64_t * ); - if( p_sys->i_mux_rate > 0 ) - { - *pi64 = I64C(1000000) * stream_Tell( p_input->s ) / - p_sys->i_mux_rate; - return VLC_SUCCESS; - } - *pi64 = 0; - return VLC_EGENERIC; - - case DEMUX_GET_LENGTH: - pi64 = (int64_t*)va_arg( args, int64_t * ); - if( p_sys->i_mux_rate > 0 ) - { - *pi64 = I64C(1000000) * stream_Size( p_input->s ) / - p_sys->i_mux_rate; - return VLC_SUCCESS; - } - *pi64 = 0; - return VLC_EGENERIC; - - default: - return demux_vaControlDefault( p_input, i_query, args ); + return VLC_SUCCESS; + } + /* 14 bits, big endian version of the bitstream */ + else if( p_peek[0] == 0x1f && p_peek[1] == 0xff && + p_peek[2] == 0xe8 && p_peek[3] == 0x00 && + p_peek[4] == 0x07 && (p_peek[5] & 0xf0) == 0xf0) + { + return VLC_SUCCESS; + } + /* 16 bits, big endian version of the bitstream */ + else if( p_peek[0] == 0x7f && p_peek[1] == 0xfe && + p_peek[2] == 0x80 && p_peek[3] == 0x01 ) + { + return VLC_SUCCESS; + } + /* 16 bits, little endian version of the bitstream */ + else if( p_peek[0] == 0xfe && p_peek[1] == 0x7f && + p_peek[2] == 0x01 && p_peek[3] == 0x80 ) + { + return VLC_SUCCESS; } + + return VLC_EGENERIC; } +