X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fa52.c;h=d854aa818c8e835799f6607d18f5ebbbd2b6477d;hb=818a663ea9987aad38d748b7010c9f0d0de863b5;hp=4d8404115f1c4bb48d69d34b09edbbcc1589d995;hpb=85b29bdc288a1573d43bd524908be5748a9b3640;p=vlc diff --git a/modules/demux/a52.c b/modules/demux/a52.c index 4d8404115f..d854aa818c 100644 --- a/modules/demux/a52.c +++ b/modules/demux/a52.c @@ -1,7 +1,7 @@ /***************************************************************************** * a52.c : raw A/52 stream input module for vlc ***************************************************************************** - * Copyright (C) 2001 VideoLAN (Centrale Réseaux) and its contributors + * Copyright (C) 2001-2007 the VideoLAN team * $Id$ * * Authors: Gildas Bazin @@ -18,14 +18,18 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include -#include +#include #include #ifdef HAVE_UNISTD_H @@ -65,7 +69,7 @@ struct demux_sys_t vlc_bool_t b_big_endian; }; -static int CheckSync( uint8_t *p_peek, vlc_bool_t *p_big_endian ); +static int CheckSync( const uint8_t *p_peek, vlc_bool_t *p_big_endian ); #define PCM_FRAME_SIZE (1536 * 4) #define A52_PACKET_SIZE (4 * PCM_FRAME_SIZE) @@ -79,20 +83,20 @@ static int Open( vlc_object_t * p_this ) { demux_t *p_demux = (demux_t*)p_this; demux_sys_t *p_sys; - byte_t *p_peek; + const byte_t*p_peek; int i_peek = 0; - vlc_bool_t b_big_endian; + vlc_bool_t b_big_endian = 0; /* Arbitrary initialisation */ /* Check if we are dealing with a WAV file */ if( stream_Peek( p_demux->s, &p_peek, 12 ) == 12 && - !strncmp( p_peek, "RIFF", 4 ) && !strncmp( &p_peek[8], "WAVE", 4 ) ) + !memcmp( p_peek, "RIFF", 4 ) && !memcmp( p_peek + 8, "WAVE", 4 ) ) { int i_size; /* Skip the wave header */ i_peek = 12 + 8; while( stream_Peek( p_demux->s, &p_peek, i_peek ) == i_peek && - strncmp( p_peek + i_peek - 8, "data", 4 ) ) + memcmp( p_peek + i_peek - 8, "data", 4 ) ) { i_peek += GetDWLE( p_peek + i_peek - 4 ) + 8; } @@ -125,20 +129,12 @@ static int Open( vlc_object_t * p_this ) } /* Have a peep at the show. */ - if( stream_Peek( p_demux->s, &p_peek, i_peek + A52_MAX_HEADER_SIZE * 2 ) < - i_peek + A52_MAX_HEADER_SIZE * 2 ) - { - /* Stream too short */ - msg_Warn( p_demux, "cannot peek()" ); - return VLC_EGENERIC; - } + CHECK_PEEK( p_peek, i_peek + A52_MAX_HEADER_SIZE * 2 ); if( CheckSync( p_peek + i_peek, &b_big_endian ) != VLC_SUCCESS ) { - if( strncmp( p_demux->psz_demux, "a52", 3 ) ) - { + if( !p_demux->b_force ) return VLC_EGENERIC; - } /* User forced */ msg_Err( p_demux, "this doesn't look like a A52 audio stream, " @@ -146,33 +142,14 @@ static int Open( vlc_object_t * p_this ) } /* Fill p_demux fields */ - p_demux->pf_demux = Demux; - p_demux->pf_control = Control; - p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) ); + DEMUX_INIT_COMMON(); p_sys = p_demux->p_sys; p_sys->b_start = VLC_TRUE; p_sys->i_mux_rate = 0; p_sys->b_big_endian = b_big_endian; - /* - * Load the A52 packetizer - */ - 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; - p_sys->p_packetizer->pf_packetize = 0; - - /* Initialization of decoder structure */ - es_format_Init( &p_sys->p_packetizer->fmt_in, AUDIO_ES, - VLC_FOURCC( 'a', '5', '2', ' ' ) ); - - p_sys->p_packetizer->p_module = - module_Need( p_sys->p_packetizer, "packetizer", NULL, 0 ); - if( !p_sys->p_packetizer->p_module ) - { - msg_Err( p_demux, "cannot find A52 packetizer" ); - return VLC_EGENERIC; - } + /* Load the A52 packetizer */ + INIT_APACKETIZER( p_sys->p_packetizer, 'a', '5', '2', ' ' ); + LOAD_PACKETIZER_OR_FAIL( p_sys->p_packetizer, "A52" ); /* Create one program */ p_sys->p_es = es_out_Add( p_demux->out, &p_sys->p_packetizer->fmt_in ); @@ -188,12 +165,7 @@ static void Close( vlc_object_t * p_this ) 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 ); - - /* Delete the decoder */ - vlc_object_destroy( p_sys->p_packetizer ); - + DESTROY_PACKETIZER( p_sys->p_packetizer ); free( p_sys ); } @@ -277,17 +249,27 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) { demux_sys_t *p_sys = p_demux->p_sys; if( i_query == DEMUX_SET_TIME ) + { return VLC_EGENERIC; + } + else if( i_query == DEMUX_HAS_UNSUPPORTED_META ) + { + vlc_bool_t *pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); + *pb_bool = VLC_TRUE; + return VLC_SUCCESS; + } else + { return demux2_vaControlHelper( p_demux->s, 0, -1, 8*p_sys->i_mux_rate, 1, i_query, args ); + } } /***************************************************************************** * CheckSync: Check if buffer starts with an A52 sync code *****************************************************************************/ -static int CheckSync( uint8_t *p_peek, vlc_bool_t *p_big_endian ) +static int CheckSync( const uint8_t *p_peek, vlc_bool_t *p_big_endian ) { /* Little endian version of the bitstream */ if( p_peek[0] == 0x77 && p_peek[1] == 0x0b &&