/*****************************************************************************
* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <vlc_input.h>
#include <vlc_codec.h>
struct decoder_sys_t
{
/* Module mode */
- vlc_bool_t b_packetizer;
+ bool b_packetizer;
/*
* Input properties
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 * );
return VLC_EGENERIC;
}
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 );
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',' ');
}
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 );
*/
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
*/
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
}
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
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?" );
/*****************************************************************************
* 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;
speex_bits_destroy( &p_sys->bits );
}
- if( p_sys->p_header ) free( p_sys->p_header );
+ free( p_sys->p_header );
free( p_sys );
}
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 );
}