X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fspeex.c;h=d30b688f85b26c34bbe35e1222393ae2c420ab6c;hb=688f0a8d8913f20ac5d3e27bf4f2bbe35c9f5de7;hp=2dc0cfdde9c0ff6d7fbaddb12b05e38cafc2830f;hpb=06ef387db9f271a96d600e423633018fe5c2fcd7;p=vlc diff --git a/modules/codec/speex.c b/modules/codec/speex.c index 2dc0cfdde9..d30b688f85 100644 --- a/modules/codec/speex.c +++ b/modules/codec/speex.c @@ -24,7 +24,12 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include #include @@ -43,7 +48,7 @@ struct decoder_sys_t { /* Module mode */ - vlc_bool_t b_packetizer; + bool b_packetizer; /* * Input properties @@ -92,7 +97,7 @@ static int ProcessInitialHeader ( decoder_t *, ogg_packet * ); static void *ProcessPacket( decoder_t *, ogg_packet *, block_t ** ); static aout_buffer_t *DecodePacket( decoder_t *, ogg_packet * ); -static block_t *SendPacket( decoder_t *, ogg_packet *, block_t * ); +static block_t *SendPacket( decoder_t *, block_t * ); static void ParseSpeexComments( decoder_t *, ogg_packet * ); @@ -107,17 +112,17 @@ vlc_module_begin(); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_ACODEC ); - set_description( _("Speex audio decoder") ); + set_description( N_("Speex audio decoder") ); set_capability( "decoder", 100 ); set_callbacks( OpenDecoder, CloseDecoder ); add_submodule(); - set_description( _("Speex audio packetizer") ); + set_description( N_("Speex audio packetizer") ); set_capability( "packetizer", 100 ); set_callbacks( OpenPacketizer, CloseDecoder ); add_submodule(); - set_description( _("Speex audio encoder") ); + set_description( N_("Speex audio encoder") ); set_capability( "encoder", 100 ); set_callbacks( OpenEncoder, CloseEncoder ); vlc_module_end(); @@ -139,12 +144,9 @@ static int OpenDecoder( vlc_object_t *p_this ) /* Allocate the memory needed to store the decoder's structure */ if( ( p_dec->p_sys = p_sys = (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL ) - { - msg_Err( p_dec, "out of memory" ); - return VLC_EGENERIC; - } + return VLC_ENOMEM; p_dec->p_sys->bits.buf_size = 0; - p_dec->p_sys->b_packetizer = VLC_FALSE; + p_dec->p_sys->b_packetizer = false; p_dec->p_sys->rtp_rate = p_dec->fmt_in.audio.i_rate; aout_DateSet( &p_sys->end_date, 0 ); @@ -190,7 +192,7 @@ static int OpenPacketizer( vlc_object_t *p_this ) if( i_ret == VLC_SUCCESS ) { - p_dec->p_sys->b_packetizer = VLC_TRUE; + p_dec->p_sys->b_packetizer = true; p_dec->fmt_out.i_codec = VLC_FOURCC('s','p','x',' '); } @@ -353,7 +355,7 @@ static int ProcessInitialHeader( decoder_t *p_dec, ogg_packet *p_oggpacket ) msg_Err( p_dec, "cannot read Speex header" ); return VLC_EGENERIC; } - if( p_header->mode >= SPEEX_NB_MODES ) + if( p_header->mode >= SPEEX_NB_MODES || p_header->mode < 0 ) { msg_Err( p_dec, "mode number %d does not (yet/any longer) exist in " "this version of libspeex.", p_header->mode ); @@ -482,8 +484,8 @@ static void *ProcessPacket( decoder_t *p_dec, ogg_packet *p_oggpacket, */ speex_bits_rewind( &p_sys->bits ); speex_bits_write( &p_sys->bits, - p_new_block->p_buffer, - i_bytes_in_speex_frame ); + (char*)p_new_block->p_buffer, + (int)i_bytes_in_speex_frame ); /* * Move the remaining part of the original packet (subsequent @@ -502,11 +504,11 @@ static void *ProcessPacket( decoder_t *p_dec, ogg_packet *p_oggpacket, */ i_bytes_in_speex_frame--; speex_bits_write( &p_sys->bits, - p_block->p_buffer, - p_block->i_buffer - i_bytes_in_speex_frame ); - p_block = block_Realloc( p_block, + (char*)p_block->p_buffer, + p_block->i_buffer - i_bytes_in_speex_frame ); + p_block = block_Realloc( p_block, 0, - p_block->i_buffer-i_bytes_in_speex_frame ); + p_block->i_buffer-i_bytes_in_speex_frame ); *pp_block = p_block; } else @@ -515,11 +517,11 @@ static void *ProcessPacket( decoder_t *p_dec, ogg_packet *p_oggpacket, } free( p_frame_holder ); - return SendPacket( p_dec, p_oggpacket /*Not used*/, p_new_block); + return SendPacket( p_dec, p_new_block); } else { - return SendPacket( p_dec, p_oggpacket, p_block ); + return SendPacket( p_dec, p_block ); } } else @@ -632,8 +634,8 @@ static aout_buffer_t *DecodeRtpSpeexPacket( decoder_t *p_dec, block_t **pp_block Decode the input and ensure that no errors were encountered. */ - i_decode_ret = - speex_decode_int( p_sys->p_state,&p_sys->bits,p_aout_buffer->p_buffer ); + i_decode_ret = speex_decode_int( p_sys->p_state, &p_sys->bits, + (int16_t*)p_aout_buffer->p_buffer ); if ( i_decode_ret < 0 ) { msg_Err( p_dec, "Decoding failed. Perhaps we have a bad stream?" ); @@ -720,8 +722,7 @@ static aout_buffer_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket ) /***************************************************************************** * SendPacket: send an ogg packet to the stream output. *****************************************************************************/ -static block_t *SendPacket( decoder_t *p_dec, ogg_packet *p_oggpacket, - block_t *p_block ) +static block_t *SendPacket( decoder_t *p_dec, block_t *p_block ) { decoder_sys_t *p_sys = p_dec->p_sys; @@ -801,7 +802,7 @@ static void CloseDecoder( vlc_object_t *p_this ) speex_bits_destroy( &p_sys->bits ); } - if( p_sys->p_header ) free( p_sys->p_header ); + free( p_sys->p_header ); free( p_sys ); } @@ -861,10 +862,7 @@ static int OpenEncoder( vlc_object_t *p_this ) /* Allocate the memory needed to store the decoder's structure */ if( ( p_sys = (encoder_sys_t *)malloc(sizeof(encoder_sys_t)) ) == NULL ) - { - msg_Err( p_enc, "out of memory" ); - return VLC_EGENERIC; - } + return VLC_ENOMEM; p_enc->p_sys = p_sys; p_enc->pf_encode_audio = Encode; p_enc->fmt_in.i_codec = AOUT_FMT_S16_NE; @@ -1028,6 +1026,6 @@ static void CloseEncoder( vlc_object_t *p_this ) speex_encoder_destroy( p_sys->p_state ); speex_bits_destroy( &p_sys->bits ); - if( p_sys->p_buffer ) free( p_sys->p_buffer ); + free( p_sys->p_buffer ); free( p_sys ); }