X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fspeex.c;h=cbfb84a145a2f19a55f50e5480d4cddc600d27b8;hb=75292985e626c1bbabba7b2b060b94d6071b39b1;hp=2dc0cfdde9c0ff6d7fbaddb12b05e38cafc2830f;hpb=06ef387db9f271a96d600e423633018fe5c2fcd7;p=vlc diff --git a/modules/codec/speex.c b/modules/codec/speex.c index 2dc0cfdde9..cbfb84a145 100644 --- a/modules/codec/speex.c +++ b/modules/codec/speex.c @@ -1,33 +1,38 @@ /***************************************************************************** * speex.c: speex decoder/packetizer/encoder module making use of libspeex. ***************************************************************************** - * Copyright (C) 2003 the VideoLAN team + * Copyright (C) 2003-2009 VLC authors and VideoLAN * $Id$ * * Authors: Gildas Bazin * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include -#include +#include "../demux/xiph.h" #include #include @@ -37,18 +42,120 @@ #include +/***************************************************************************** + * Module descriptor + *****************************************************************************/ +static int OpenDecoder ( vlc_object_t * ); +static int OpenPacketizer( vlc_object_t * ); +static void CloseDecoder ( vlc_object_t * ); + +#ifdef ENABLE_SOUT +static int OpenEncoder ( vlc_object_t * ); +static void CloseEncoder ( vlc_object_t * ); +#endif + +#define ENC_CFG_PREFIX "sout-speex-" + +#define ENC_MODE_TEXT N_("Mode" ) +#define ENC_MODE_LONGTEXT N_( \ + "Enforce the mode of the encoder." ) + +#define ENC_QUALITY_TEXT N_("Encoding quality") +#define ENC_QUALITY_LONGTEXT N_( \ + "Enforce a quality between 0 (low) and 10 (high)." ) + +#define ENC_COMPLEXITY_TEXT N_("Encoding complexity" ) +#define ENC_COMPLEXITY_LONGTEXT N_( \ + "Enforce the complexity of the encoder." ) + +#define ENC_MAXBITRATE_TEXT N_( "Maximal bitrate" ) +#define ENC_MAXBITRATE_LONGTEXT N_( \ + "Enforce the maximal VBR bitrate" ) + +#define ENC_CBR_TEXT N_( "CBR encoding" ) +#define ENC_CBR_LONGTEXT N_( \ + "Enforce a constant bitrate encoding (CBR) instead of default " \ + "variable bitrate encoding (VBR)." ) + +#define ENC_VAD_TEXT N_( "Voice activity detection" ) +#define ENC_VAD_LONGTEXT N_( \ + "Enable voice activity detection (VAD). It is automatically " \ + "activated in VBR mode." ) + +#define ENC_DTX_TEXT N_( "Discontinuous Transmission" ) +#define ENC_DTX_LONGTEXT N_( \ + "Enable discontinuous transmission (DTX)." ) + +static const int pi_enc_mode_values[] = { 0, 1, 2 }; +static const char * const ppsz_enc_mode_descriptions[] = { + N_("Narrow-band (8kHz)"), N_("Wide-band (16kHz)"), N_("Ultra-wideband (32kHz)"), NULL +}; + +vlc_module_begin () + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACODEC ) + + set_description( N_("Speex audio decoder") ) + set_capability( "decoder", 100 ) + set_shortname( N_("Speex") ) + set_callbacks( OpenDecoder, CloseDecoder ) + + add_submodule () + set_description( N_("Speex audio packetizer") ) + set_capability( "packetizer", 100 ) + set_callbacks( OpenPacketizer, CloseDecoder ) + +#ifdef ENABLE_SOUT + add_submodule () + set_description( N_("Speex audio encoder") ) + set_capability( "encoder", 100 ) + set_callbacks( OpenEncoder, CloseEncoder ) + + add_integer( ENC_CFG_PREFIX "mode", 0, ENC_MODE_TEXT, + ENC_MODE_LONGTEXT, false ) + change_integer_list( pi_enc_mode_values, ppsz_enc_mode_descriptions ) + + add_integer( ENC_CFG_PREFIX "complexity", 3, ENC_COMPLEXITY_TEXT, + ENC_COMPLEXITY_LONGTEXT, false ) + change_integer_range( 1, 10 ) + + add_bool( ENC_CFG_PREFIX "cbr", false, ENC_CBR_TEXT, + ENC_CBR_LONGTEXT, false ) + + add_float( ENC_CFG_PREFIX "quality", 8.0, ENC_QUALITY_TEXT, + ENC_QUALITY_LONGTEXT, false ) + change_float_range( 0.0, 10.0 ) + + add_integer( ENC_CFG_PREFIX "max-bitrate", 0, ENC_MAXBITRATE_TEXT, + ENC_MAXBITRATE_LONGTEXT, false ) + + add_bool( ENC_CFG_PREFIX "vad", true, ENC_VAD_TEXT, + ENC_VAD_LONGTEXT, false ) + + add_bool( ENC_CFG_PREFIX "dtx", false, ENC_DTX_TEXT, + ENC_DTX_LONGTEXT, false ) + + /* TODO agc, noise suppression, */ +#endif + +vlc_module_end () + +static const char *const ppsz_enc_options[] = { + "mode", "complexity", "cbr", "quality", "max-bitrate", "vad", "dtx", NULL +}; + /***************************************************************************** * decoder_sys_t : speex decoder descriptor *****************************************************************************/ struct decoder_sys_t { /* Module mode */ - vlc_bool_t b_packetizer; + bool b_packetizer; /* * Input properties */ - int i_headers; + bool b_has_headers; int i_frame_in_packet; /* @@ -63,11 +170,11 @@ struct decoder_sys_t /* * Common properties */ - audio_date_t end_date; + date_t end_date; }; -static int pi_channels_maps[6] = +static const int pi_channels_maps[6] = { 0, AOUT_CHAN_CENTER, AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT, @@ -81,100 +188,61 @@ static int pi_channels_maps[6] = /**************************************************************************** * Local prototypes ****************************************************************************/ -static int OpenDecoder ( vlc_object_t * ); -static int OpenPacketizer( vlc_object_t * ); -static void CloseDecoder ( vlc_object_t * ); -static void *DecodeBlock ( decoder_t *, block_t ** ); -static aout_buffer_t *DecodeRtpSpeexPacket( decoder_t *, block_t **); +static block_t *DecodeBlock ( decoder_t *, block_t ** ); +static block_t *DecodeRtpSpeexPacket( decoder_t *, block_t **); static int ProcessHeaders( decoder_t * ); 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 *DecodePacket( decoder_t *, ogg_packet * ); +static block_t *SendPacket( decoder_t *, block_t * ); static void ParseSpeexComments( decoder_t *, ogg_packet * ); -static int OpenEncoder ( vlc_object_t * ); -static void CloseEncoder ( vlc_object_t * ); -static block_t *Encode ( encoder_t *, aout_buffer_t * ); - -/***************************************************************************** - * Module descriptor - *****************************************************************************/ -vlc_module_begin(); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACODEC ); - - set_description( _("Speex audio decoder") ); - set_capability( "decoder", 100 ); - set_callbacks( OpenDecoder, CloseDecoder ); - - add_submodule(); - set_description( _("Speex audio packetizer") ); - set_capability( "packetizer", 100 ); - set_callbacks( OpenPacketizer, CloseDecoder ); - - add_submodule(); - set_description( _("Speex audio encoder") ); - set_capability( "encoder", 100 ); - set_callbacks( OpenEncoder, CloseEncoder ); -vlc_module_end(); - /***************************************************************************** * OpenDecoder: probe the decoder and return score *****************************************************************************/ static int OpenDecoder( vlc_object_t *p_this ) { decoder_t *p_dec = (decoder_t*)p_this; - decoder_sys_t *p_sys = p_dec->p_sys; + decoder_sys_t *p_sys; - if( p_dec->fmt_in.i_codec != VLC_FOURCC('s','p','x',' ') - && p_dec->fmt_in.i_codec != VLC_FOURCC('s', 'p', 'x', 'r') ) - { + if( p_dec->fmt_in.i_codec != VLC_CODEC_SPEEX ) return VLC_EGENERIC; - } /* 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; - } + if( ( p_dec->p_sys = p_sys = malloc(sizeof(decoder_sys_t)) ) == NULL ) + 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; + p_dec->p_sys->b_has_headers = false; - aout_DateSet( &p_sys->end_date, 0 ); + date_Set( &p_sys->end_date, 0 ); /* Set output properties */ p_dec->fmt_out.i_cat = AUDIO_ES; - p_dec->fmt_out.i_codec = AOUT_FMT_S16_NE; + p_dec->fmt_out.i_codec = VLC_CODEC_S16N; /* Set callbacks - If the codec is spxr then this decoder is - being invoked on a Speex stream arriving via RTP. + If the codec is spxr then this decoder is + being invoked on a Speex stream arriving via RTP. A special decoder callback is used. */ - if (p_dec->fmt_in.i_codec == VLC_FOURCC('s', 'p', 'x', 'r')) + if (p_dec->fmt_in.i_original_fourcc == VLC_FOURCC('s', 'p', 'x', 'r')) { - msg_Dbg( p_dec, "Using RTP version of Speex decoder @ rate %d.", - p_dec->fmt_in.audio.i_rate ); - p_dec->pf_decode_audio = (aout_buffer_t *(*)(decoder_t *, block_t **)) - DecodeRtpSpeexPacket; + msg_Dbg( p_dec, "Using RTP version of Speex decoder @ rate %d.", + p_dec->fmt_in.audio.i_rate ); + p_dec->pf_decode_audio = DecodeRtpSpeexPacket; } else { - p_dec->pf_decode_audio = (aout_buffer_t *(*)(decoder_t *, block_t **)) - DecodeBlock; + p_dec->pf_decode_audio = DecodeBlock; } - p_dec->pf_packetize = (block_t *(*)(decoder_t *, block_t **)) - DecodeBlock; + p_dec->pf_packetize = DecodeBlock; - p_sys->i_headers = 0; p_sys->p_state = NULL; p_sys->p_header = NULL; p_sys->i_frame_in_packet = 0; @@ -190,19 +258,77 @@ static int OpenPacketizer( vlc_object_t *p_this ) if( i_ret == VLC_SUCCESS ) { - p_dec->p_sys->b_packetizer = VLC_TRUE; - p_dec->fmt_out.i_codec = VLC_FOURCC('s','p','x',' '); + p_dec->p_sys->b_packetizer = true; + p_dec->fmt_out.i_codec = VLC_CODEC_SPEEX; } return i_ret; } +static int CreateDefaultHeader( decoder_t *p_dec ) +{ + ogg_packet oggpacket; + SpeexHeader *p_header = malloc( sizeof(SpeexHeader) ); + if( !p_header ) + return VLC_ENOMEM; + + const int rate = p_dec->fmt_in.audio.i_rate; + const unsigned i_mode = (rate / 8000) >> 1; + + const SpeexMode *mode; + int ret = VLC_SUCCESS; + oggpacket.packet = NULL; + + switch( rate ) + { + case 8000: + case 16000: + case 32000: + mode = speex_lib_get_mode( i_mode ); + break; + default: + msg_Err( p_dec, "Unexpected rate %d", rate ); + ret = VLC_EGENERIC; + goto cleanup; + } + + speex_init_header( p_header, rate, p_dec->fmt_in.audio.i_channels, mode ); + p_header->frames_per_packet = 160 << i_mode; + + oggpacket.packet = (unsigned char *) speex_header_to_packet( p_header, + (int *) &oggpacket.bytes ); + if( !oggpacket.packet ) + { + ret = VLC_ENOMEM; + goto cleanup; + } + + oggpacket.b_o_s = 1; + oggpacket.e_o_s = 0; + oggpacket.granulepos = -1; + oggpacket.packetno = 0; + + ret = ProcessInitialHeader( p_dec, &oggpacket ); + + if( ret != VLC_SUCCESS ) + { + msg_Err( p_dec, "default Speex header is corrupted" ); + } + +cleanup: + free( oggpacket.packet ); + free( p_header ); + + return ret; +} + + /**************************************************************************** * DecodeBlock: the whole thing **************************************************************************** * This function must be fed with ogg packets. ****************************************************************************/ -static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) +static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) { decoder_sys_t *p_sys = p_dec->p_sys; ogg_packet oggpacket; @@ -230,39 +356,24 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) oggpacket.packetno = 0; /* Check for headers */ - if( p_sys->i_headers == 0 && p_dec->fmt_in.i_extra ) - { - p_sys->i_headers = 2; - } - else if( oggpacket.bytes && p_sys->i_headers < 2 ) + if( !p_sys->b_has_headers ) { - uint8_t *p_extra; - - p_dec->fmt_in.p_extra = - realloc( p_dec->fmt_in.p_extra, p_dec->fmt_in.i_extra + - oggpacket.bytes + 2 ); - p_extra = ((uint8_t *)p_dec->fmt_in.p_extra) + p_dec->fmt_in.i_extra; - *(p_extra++) = oggpacket.bytes >> 8; - *(p_extra++) = oggpacket.bytes & 0xFF; - - memcpy( p_extra, oggpacket.packet, oggpacket.bytes ); - p_dec->fmt_in.i_extra += oggpacket.bytes + 2; - - block_Release( *pp_block ); - p_sys->i_headers++; - return NULL; - } + if( !p_dec->fmt_in.p_extra ) + { + msg_Warn( p_dec, "Header missing, using default settings" ); - if( p_sys->i_headers == 2 ) - { - if( ProcessHeaders( p_dec ) != VLC_SUCCESS ) + if( CreateDefaultHeader( p_dec ) ) + { + block_Release( *pp_block ); + return NULL; + } + } + else if( ProcessHeaders( p_dec ) ) { - p_sys->i_headers = 0; - p_dec->fmt_in.i_extra = 0; block_Release( *pp_block ); return NULL; } - else p_sys->i_headers++; + p_sys->b_has_headers = true; } return ProcessPacket( p_dec, &oggpacket, pp_block ); @@ -275,57 +386,41 @@ static int ProcessHeaders( decoder_t *p_dec ) { decoder_sys_t *p_sys = p_dec->p_sys; ogg_packet oggpacket; - uint8_t *p_extra; - int i_extra; - if( !p_dec->fmt_in.i_extra ) return VLC_EGENERIC; + unsigned pi_size[XIPH_MAX_HEADER_COUNT]; + void *pp_data[XIPH_MAX_HEADER_COUNT]; + unsigned i_count; + if( xiph_SplitHeaders( pi_size, pp_data, &i_count, + p_dec->fmt_in.i_extra, p_dec->fmt_in.p_extra) ) + return VLC_EGENERIC; + if( i_count < 2 ) + return VLC_EGENERIC;; oggpacket.granulepos = -1; - oggpacket.b_o_s = 1; /* yes this actually is a b_o_s packet :) */ oggpacket.e_o_s = 0; oggpacket.packetno = 0; - p_extra = p_dec->fmt_in.p_extra; - i_extra = p_dec->fmt_in.i_extra; /* Take care of the initial Vorbis header */ - oggpacket.bytes = *(p_extra++) << 8; - oggpacket.bytes |= (*(p_extra++) & 0xFF); - oggpacket.packet = p_extra; - p_extra += oggpacket.bytes; - i_extra -= (oggpacket.bytes + 2); - if( i_extra < 0 ) - { - msg_Err( p_dec, "header data corrupted"); - return VLC_EGENERIC; - } - - /* Take care of the initial Speex header */ + oggpacket.b_o_s = 1; /* yes this actually is a b_o_s packet :) */ + oggpacket.bytes = pi_size[0]; + oggpacket.packet = pp_data[0]; if( ProcessInitialHeader( p_dec, &oggpacket ) != VLC_SUCCESS ) { msg_Err( p_dec, "initial Speex header is corrupted" ); - return VLC_EGENERIC; + return VLC_EGENERIC;; } /* The next packet in order is the comments header */ oggpacket.b_o_s = 0; - oggpacket.bytes = *(p_extra++) << 8; - oggpacket.bytes |= (*(p_extra++) & 0xFF); - oggpacket.packet = p_extra; - p_extra += oggpacket.bytes; - i_extra -= (oggpacket.bytes + 2); - if( i_extra < 0 ) - { - msg_Err( p_dec, "header data corrupted"); - return VLC_EGENERIC; - } - + oggpacket.bytes = pi_size[1]; + oggpacket.packet = pp_data[1]; ParseSpeexComments( p_dec, &oggpacket ); if( p_sys->b_packetizer ) { p_dec->fmt_out.i_extra = p_dec->fmt_in.i_extra; - p_dec->fmt_out.p_extra = - realloc( p_dec->fmt_out.p_extra, p_dec->fmt_out.i_extra ); + p_dec->fmt_out.p_extra = xrealloc( p_dec->fmt_out.p_extra, + p_dec->fmt_out.i_extra ); memcpy( p_dec->fmt_out.p_extra, p_dec->fmt_in.p_extra, p_dec->fmt_out.i_extra ); } @@ -353,7 +448,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 ); @@ -421,7 +516,7 @@ static int ProcessInitialHeader( decoder_t *p_dec, ogg_packet *p_oggpacket ) p_dec->fmt_out.audio.i_channels = p_header->nb_channels; p_dec->fmt_out.audio.i_rate = p_header->rate; - aout_DateInit( &p_sys->end_date, p_header->rate ); + date_Init( &p_sys->end_date, p_header->rate, 1 ); return VLC_SUCCESS; } @@ -436,13 +531,13 @@ static void *ProcessPacket( decoder_t *p_dec, ogg_packet *p_oggpacket, block_t *p_block = *pp_block; /* Date management */ - if( p_block && p_block->i_pts > 0 && - p_block->i_pts != aout_DateGet( &p_sys->end_date ) ) + if( p_block && p_block->i_pts > VLC_TS_INVALID && + p_block->i_pts != date_Get( &p_sys->end_date ) ) { - aout_DateSet( &p_sys->end_date, p_block->i_pts ); + date_Set( &p_sys->end_date, p_block->i_pts ); } - if( !aout_DateGet( &p_sys->end_date ) ) + if( !date_Get( &p_sys->end_date ) ) { /* We've just started the stream, wait for the first PTS. */ if( p_block ) block_Release( p_block ); @@ -453,201 +548,201 @@ static void *ProcessPacket( decoder_t *p_dec, ogg_packet *p_oggpacket, if( p_sys->b_packetizer ) { - if ( p_sys->p_header->frames_per_packet > 1 ) - { - short *p_frame_holder = NULL; - int i_bits_before = 0, i_bits_after = 0, i_bytes_in_speex_frame = 0, - i_pcm_output_size = 0, i_bits_in_speex_frame = 0; - block_t *p_new_block = NULL; + if ( p_sys->p_header->frames_per_packet > 1 ) + { + short *p_frame_holder = NULL; + int i_bits_before = 0, i_bits_after = 0, i_bytes_in_speex_frame = 0, + i_pcm_output_size = 0, i_bits_in_speex_frame = 0; + block_t *p_new_block = NULL; - i_pcm_output_size = p_sys->p_header->frame_size; - p_frame_holder = (short*)malloc( sizeof(short)*i_pcm_output_size ); + i_pcm_output_size = p_sys->p_header->frame_size; + p_frame_holder = (short*)xmalloc( sizeof(short)*i_pcm_output_size ); speex_bits_read_from( &p_sys->bits, (char*)p_oggpacket->packet, - p_oggpacket->bytes); + p_oggpacket->bytes); i_bits_before = speex_bits_remaining( &p_sys->bits ); - speex_decode_int(p_sys->p_state, &p_sys->bits, p_frame_holder); - i_bits_after = speex_bits_remaining( &p_sys->bits ); + speex_decode_int(p_sys->p_state, &p_sys->bits, p_frame_holder); + i_bits_after = speex_bits_remaining( &p_sys->bits ); i_bits_in_speex_frame = i_bits_before - i_bits_after; - i_bytes_in_speex_frame = ( i_bits_in_speex_frame + - (8 - (i_bits_in_speex_frame % 8)) ) + i_bytes_in_speex_frame = ( i_bits_in_speex_frame + + (8 - (i_bits_in_speex_frame % 8)) ) / 8; - p_new_block = block_New( p_dec, i_bytes_in_speex_frame ); - memset( p_new_block->p_buffer, 0xff, i_bytes_in_speex_frame ); - - /* - * Copy the first frame in this packet to a new packet. - */ - speex_bits_rewind( &p_sys->bits ); - speex_bits_write( &p_sys->bits, - p_new_block->p_buffer, - i_bytes_in_speex_frame ); - - /* - * Move the remaining part of the original packet (subsequent - * frames, if there are any) into the beginning - * of the original packet so - * they are preserved following the realloc. - * Note: Any bits that - * remain in the initial packet - * are "filler" if they do not constitute - * an entire byte. - */ - if ( i_bits_after > 7 ) - { - /* round-down since we rounded-up earlier (to include - * the speex terminator code. - */ - 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, - 0, - p_block->i_buffer-i_bytes_in_speex_frame ); - *pp_block = p_block; - } - else - { - speex_bits_reset( &p_sys->bits ); - } - - free( p_frame_holder ); - return SendPacket( p_dec, p_oggpacket /*Not used*/, p_new_block); - } - else - { - return SendPacket( p_dec, p_oggpacket, p_block ); - } + p_new_block = block_Alloc( i_bytes_in_speex_frame ); + memset( p_new_block->p_buffer, 0xff, i_bytes_in_speex_frame ); + + /* + * Copy the first frame in this packet to a new packet. + */ + speex_bits_rewind( &p_sys->bits ); + speex_bits_write( &p_sys->bits, + (char*)p_new_block->p_buffer, + (int)i_bytes_in_speex_frame ); + + /* + * Move the remaining part of the original packet (subsequent + * frames, if there are any) into the beginning + * of the original packet so + * they are preserved following the realloc. + * Note: Any bits that + * remain in the initial packet + * are "filler" if they do not constitute + * an entire byte. + */ + if ( i_bits_after > 7 ) + { + /* round-down since we rounded-up earlier (to include + * the speex terminator code. + */ + i_bytes_in_speex_frame--; + speex_bits_write( &p_sys->bits, + (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 ); + *pp_block = p_block; + } + else + { + speex_bits_reset( &p_sys->bits ); + } + + free( p_frame_holder ); + return SendPacket( p_dec, p_new_block); + } + else + { + return SendPacket( p_dec, p_block ); + } } else { - aout_buffer_t *p_aout_buffer; + block_t *p_aout_buffer = DecodePacket( p_dec, p_oggpacket ); - if( p_sys->i_headers >= p_sys->p_header->extra_headers + 2 ) - p_aout_buffer = DecodePacket( p_dec, p_oggpacket ); - else - p_aout_buffer = NULL; /* Skip headers */ - - if( p_block ) block_Release( p_block ); + if( p_block ) + block_Release( p_block ); return p_aout_buffer; } } -static aout_buffer_t *DecodeRtpSpeexPacket( decoder_t *p_dec, block_t **pp_block ) +static block_t *DecodeRtpSpeexPacket( decoder_t *p_dec, block_t **pp_block ) { block_t *p_speex_bit_block = *pp_block; decoder_sys_t *p_sys = p_dec->p_sys; - aout_buffer_t *p_aout_buffer; + block_t *p_aout_buffer; int i_decode_ret; unsigned int i_speex_frame_size; - if ( !p_speex_bit_block || p_speex_bit_block->i_pts == 0 ) return NULL; + if ( !p_speex_bit_block || p_speex_bit_block->i_pts <= VLC_TS_INVALID ) + return NULL; - /* + /* If the SpeexBits buffer size is 0 (a default value), we know that a proper initialization has not yet been done. */ if ( p_sys->bits.buf_size==0 ) { - p_sys->p_header = (SpeexHeader *)malloc(sizeof(SpeexHeader)); - if ( !p_sys->p_header ) - { - msg_Err( p_dec, "Could not allocate a Speex header."); - return NULL; - } - speex_init_header( p_sys->p_header,p_sys->rtp_rate,1,&speex_nb_mode ); + p_sys->p_header = malloc(sizeof(SpeexHeader)); + if ( !p_sys->p_header ) + { + msg_Err( p_dec, "Could not allocate a Speex header."); + return NULL; + } + + const SpeexMode *mode = speex_lib_get_mode((p_sys->rtp_rate / 8000) >> 1); + + speex_init_header( p_sys->p_header,p_sys->rtp_rate, 1, mode ); speex_bits_init( &p_sys->bits ); - p_sys->p_state = speex_decoder_init( &speex_nb_mode ); - if ( !p_sys->p_state ) - { - msg_Err( p_dec, "Could not allocate a Speex decoder." ); - free( p_sys->p_header ); - return NULL; - } + p_sys->p_state = speex_decoder_init( mode ); + if ( !p_sys->p_state ) + { + msg_Err( p_dec, "Could not allocate a Speex decoder." ); + free( p_sys->p_header ); + return NULL; + } /* - Assume that variable bit rate is enabled. Also assume - that there is only one frame per packet. - */ - p_sys->p_header->vbr = 1; - p_sys->p_header->frames_per_packet = 1; + Assume that variable bit rate is enabled. Also assume + that there is only one frame per packet. + */ + p_sys->p_header->vbr = 1; + p_sys->p_header->frames_per_packet = 1; p_dec->fmt_out.audio.i_channels = p_sys->p_header->nb_channels; - p_dec->fmt_out.audio.i_physical_channels = - p_dec->fmt_out.audio.i_original_channels = - pi_channels_maps[p_sys->p_header->nb_channels]; + p_dec->fmt_out.audio.i_physical_channels = + p_dec->fmt_out.audio.i_original_channels = + pi_channels_maps[p_sys->p_header->nb_channels]; p_dec->fmt_out.audio.i_rate = p_sys->p_header->rate; - if ( speex_mode_query( &speex_nb_mode, - SPEEX_MODE_FRAME_SIZE, - &i_speex_frame_size ) ) - { - msg_Err( p_dec, "Could not determine the frame size." ); - speex_decoder_destroy( p_sys->p_state ); - free( p_sys->p_header ); - return NULL; - } - p_dec->fmt_out.audio.i_bytes_per_frame = i_speex_frame_size; - - aout_DateInit(&p_sys->end_date, p_sys->p_header->rate); + if ( speex_mode_query( &speex_nb_mode, + SPEEX_MODE_FRAME_SIZE, + &i_speex_frame_size ) ) + { + msg_Err( p_dec, "Could not determine the frame size." ); + speex_decoder_destroy( p_sys->p_state ); + free( p_sys->p_header ); + return NULL; + } + p_dec->fmt_out.audio.i_bytes_per_frame = i_speex_frame_size; + + date_Init(&p_sys->end_date, p_sys->p_header->rate, 1); } - /* - If the SpeexBits are initialized but there is + /* + If the SpeexBits are initialized but there is still no header, an error must be thrown. */ if ( !p_sys->p_header ) { msg_Err( p_dec, "There is no valid Speex header found." ); - return NULL; + return NULL; } *pp_block = NULL; - if ( !aout_DateGet( &p_sys->end_date ) ) - aout_DateSet( &p_sys->end_date, p_speex_bit_block->i_dts ); + if ( !date_Get( &p_sys->end_date ) ) + date_Set( &p_sys->end_date, p_speex_bit_block->i_dts ); /* Ask for a new audio output buffer and make sure - we get one. + we get one. */ - p_aout_buffer = p_dec->pf_aout_buffer_new( p_dec, + p_aout_buffer = decoder_NewAudioBuffer( p_dec, p_sys->p_header->frame_size ); - if ( !p_aout_buffer || p_aout_buffer->i_nb_bytes == 0 ) + if ( !p_aout_buffer || p_aout_buffer->i_buffer == 0 ) { msg_Err(p_dec, "Oops: No new buffer was returned!"); - return NULL; + return NULL; } /* Read the Speex payload into the SpeexBits buffer. */ - speex_bits_read_from( &p_sys->bits, - (char*)p_speex_bit_block->p_buffer, + speex_bits_read_from( &p_sys->bits, + (char*)p_speex_bit_block->p_buffer, p_speex_bit_block->i_buffer ); - - /* - Decode the input and ensure that no errors + + /* + 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?" ); - return NULL; + return NULL; } - /* - Handle date management on the audio output buffer. + /* + Handle date management on the audio output buffer. */ - p_aout_buffer->start_date = aout_DateGet( &p_sys->end_date ); - p_aout_buffer->end_date = aout_DateIncrement( &p_sys->end_date, - p_sys->p_header->frame_size ); - - + p_aout_buffer->i_pts = date_Get( &p_sys->end_date ); + p_aout_buffer->i_length = date_Increment( &p_sys->end_date, + p_sys->p_header->frame_size ) - p_aout_buffer->i_pts; + + p_sys->i_frame_in_packet++; block_Release( p_speex_bit_block ); @@ -657,7 +752,7 @@ static aout_buffer_t *DecodeRtpSpeexPacket( decoder_t *p_dec, block_t **pp_block /***************************************************************************** * DecodePacket: decodes a Speex packet. *****************************************************************************/ -static aout_buffer_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket ) +static block_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket ) { decoder_sys_t *p_sys = p_dec->p_sys; @@ -672,12 +767,12 @@ static aout_buffer_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket ) /* Decode one frame at a time */ if( p_sys->i_frame_in_packet < p_sys->p_header->frames_per_packet ) { - aout_buffer_t *p_aout_buffer; + block_t *p_aout_buffer; if( p_sys->p_header->frame_size == 0 ) return NULL; p_aout_buffer = - p_dec->pf_aout_buffer_new( p_dec, p_sys->p_header->frame_size ); + decoder_NewAudioBuffer( p_dec, p_sys->p_header->frame_size ); if( !p_aout_buffer ) { return NULL; @@ -703,9 +798,10 @@ static aout_buffer_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket ) &p_sys->stereo ); /* Date management */ - p_aout_buffer->start_date = aout_DateGet( &p_sys->end_date ); - p_aout_buffer->end_date = - aout_DateIncrement( &p_sys->end_date, p_sys->p_header->frame_size ); + p_aout_buffer->i_pts = date_Get( &p_sys->end_date ); + p_aout_buffer->i_length = + date_Increment( &p_sys->end_date, p_sys->p_header->frame_size ) + - p_aout_buffer->i_pts; p_sys->i_frame_in_packet++; @@ -720,29 +816,23 @@ 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; /* Date management */ - p_block->i_dts = p_block->i_pts = aout_DateGet( &p_sys->end_date ); + p_block->i_dts = p_block->i_pts = date_Get( &p_sys->end_date ); - if( p_sys->i_headers >= p_sys->p_header->extra_headers + 2 ) - { - p_block->i_length = - aout_DateIncrement( &p_sys->end_date, - p_sys->p_header->frame_size ) - - p_block->i_pts; - } - else - p_block->i_length = 0; + p_block->i_length = + date_Increment( &p_sys->end_date, + p_sys->p_header->frame_size ) - + p_block->i_pts; return p_block; } /***************************************************************************** - * ParseSpeexComments: FIXME should be done in demuxer + * ParseSpeexComments: *****************************************************************************/ #define readint(buf, base) (((buf[base+3]<<24)&0xff000000)| \ ((buf[base+2]<<16)&0xff0000)| \ @@ -751,40 +841,31 @@ static block_t *SendPacket( decoder_t *p_dec, ogg_packet *p_oggpacket, static void ParseSpeexComments( decoder_t *p_dec, ogg_packet *p_oggpacket ) { - input_thread_t *p_input = (input_thread_t *)p_dec->p_parent; decoder_sys_t *p_sys = p_dec->p_sys; - - char *p_buf = (char *)p_oggpacket->packet; const SpeexMode *p_mode; - int i_len; - - if( p_input->i_object_type != VLC_OBJECT_INPUT ) return; assert( p_sys->p_header->mode < SPEEX_NB_MODES ); p_mode = speex_mode_list[p_sys->p_header->mode]; assert( p_mode != NULL ); - input_Control( p_input, INPUT_ADD_INFO, _("Speex comment"), _("Mode"), - "%s%s", p_mode->modeName, - p_sys->p_header->vbr ? " VBR" : "" ); - - if( p_oggpacket->bytes < 8 ) + if( !p_dec->p_description ) { - msg_Err( p_dec, "invalid/corrupted comments" ); - return; + p_dec->p_description = vlc_meta_New(); + if( !p_dec->p_description ) + return; } - i_len = readint( p_buf, 0 ); p_buf += 4; - if( i_len > p_oggpacket->bytes - 4 ) + /* */ + char *psz_mode; + if( asprintf( &psz_mode, "%s%s", p_mode->modeName, p_sys->p_header->vbr ? " VBR" : "" ) >= 0 ) { - msg_Err( p_dec, "invalid/corrupted comments" ); - return; + vlc_meta_AddExtra( p_dec->p_description, _("Mode"), psz_mode ); + free( psz_mode ); } - input_Control( p_input, INPUT_ADD_INFO, _("Speex comment"), p_buf, "" ); - /* TODO: finish comments parsing */ + VLC_UNUSED( p_oggpacket ); } /***************************************************************************** @@ -801,10 +882,11 @@ 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 ); } +#ifdef ENABLE_SOUT /***************************************************************************** * encoder_sys_t: encoder descriptor *****************************************************************************/ @@ -833,13 +915,10 @@ struct encoder_sys_t int i_frame_length; int i_samples_delay; int i_frame_size; - - /* - * Common properties - */ - mtime_t i_pts; }; +static block_t *Encode ( encoder_t *, block_t * ); + /***************************************************************************** * OpenEncoder: probe the encoder and return score *****************************************************************************/ @@ -848,55 +927,99 @@ static int OpenEncoder( vlc_object_t *p_this ) encoder_t *p_enc = (encoder_t *)p_this; encoder_sys_t *p_sys; const SpeexMode *p_speex_mode = &speex_nb_mode; - int i_quality, i; + int i_tmp, i; const char *pp_header[2]; int pi_header[2]; uint8_t *p_extra; - if( p_enc->fmt_out.i_codec != VLC_FOURCC('s','p','x',' ') && + if( p_enc->fmt_out.i_codec != VLC_CODEC_SPEEX && !p_enc->b_force ) { return VLC_EGENERIC; } - /* Allocate the memory needed to store the decoder's structure */ - if( ( p_sys = (encoder_sys_t *)malloc(sizeof(encoder_sys_t)) ) == NULL ) + config_ChainParse( p_enc, ENC_CFG_PREFIX, ppsz_enc_options, p_enc->p_cfg ); + switch( var_GetInteger( p_enc, ENC_CFG_PREFIX "mode" ) ) { - msg_Err( p_enc, "out of memory" ); - return VLC_EGENERIC; + case 1: + msg_Dbg( p_enc, "Using wideband" ); + p_speex_mode = &speex_wb_mode; + break; + case 2: + msg_Dbg( p_enc, "Using ultra-wideband" ); + p_speex_mode = &speex_uwb_mode; + break; + default: + msg_Dbg( p_enc, "Using narrowband" ); + p_speex_mode = &speex_nb_mode; + break; } + + /* Allocate the memory needed to store the decoder's structure */ + if( ( p_sys = (encoder_sys_t *)malloc(sizeof(encoder_sys_t)) ) == NULL ) + 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; - p_enc->fmt_out.i_codec = VLC_FOURCC('s','p','x',' '); + p_enc->fmt_in.i_codec = VLC_CODEC_S16N; + p_enc->fmt_out.i_codec = VLC_CODEC_SPEEX; speex_init_header( &p_sys->header, p_enc->fmt_in.audio.i_rate, 1, p_speex_mode ); p_sys->header.frames_per_packet = 1; - p_sys->header.vbr = 1; + p_sys->header.vbr = var_GetBool( p_enc, ENC_CFG_PREFIX "cbr" ) ? 0 : 1; p_sys->header.nb_channels = p_enc->fmt_in.audio.i_channels; /* Create a new encoder state in narrowband mode */ p_sys->p_state = speex_encoder_init( p_speex_mode ); - /* Set the quality to 8 (15 kbps) */ - i_quality = 8; - speex_encoder_ctl( p_sys->p_state, SPEEX_SET_QUALITY, &i_quality ); + /* Parameters */ + i_tmp = var_GetInteger( p_enc, ENC_CFG_PREFIX "complexity" ); + speex_encoder_ctl( p_sys->p_state, SPEEX_SET_COMPLEXITY, &i_tmp ); + + i_tmp = var_GetBool( p_enc, ENC_CFG_PREFIX "cbr" ) ? 0 : 1; + speex_encoder_ctl( p_sys->p_state, SPEEX_SET_VBR, &i_tmp ); + + if( i_tmp == 0 ) /* CBR */ + { + i_tmp = var_GetFloat( p_enc, ENC_CFG_PREFIX "quality" ); + speex_encoder_ctl( p_sys->p_state, SPEEX_SET_QUALITY, &i_tmp ); + + i_tmp = var_GetBool( p_enc, ENC_CFG_PREFIX "vad" ) ? 1 : 0; + speex_encoder_ctl( p_sys->p_state, SPEEX_SET_VAD, &i_tmp ); + } + else + { + float f_tmp; + + f_tmp = var_GetFloat( p_enc, ENC_CFG_PREFIX "quality" ); + speex_encoder_ctl( p_sys->p_state, SPEEX_SET_VBR_QUALITY, &f_tmp ); + + i_tmp = var_GetInteger( p_enc, ENC_CFG_PREFIX "max-bitrate" ); + if( i_tmp > 0 ) +#ifdef SPEEX_SET_VBR_MAX_BITRATE + speex_encoder_ctl( p_sys->p_state, SPEEX_SET_VBR_MAX_BITRATE, &i_tmp ); +#else + msg_Dbg( p_enc, "max-bitrate cannot be set in this version of libspeex"); +#endif + } + + i_tmp = var_GetBool( p_enc, ENC_CFG_PREFIX "dtx" ) ? 1 : 0; + speex_encoder_ctl( p_sys->p_state, SPEEX_SET_DTX, &i_tmp ); + /*Initialization of the structure that holds the bits*/ speex_bits_init( &p_sys->bits ); p_sys->i_frames_in_packet = 0; p_sys->i_samples_delay = 0; - p_sys->i_pts = 0; speex_encoder_ctl( p_sys->p_state, SPEEX_GET_FRAME_SIZE, &p_sys->i_frame_length ); p_sys->i_frame_size = p_sys->i_frame_length * sizeof(int16_t) * p_enc->fmt_in.audio.i_channels; - p_sys->p_buffer = malloc( p_sys->i_frame_size ); + p_sys->p_buffer = xmalloc( p_sys->i_frame_size ); /* Create and store headers */ pp_header[0] = speex_header_to_packet( &p_sys->header, &pi_header[0] ); @@ -904,7 +1027,7 @@ static int OpenEncoder( vlc_object_t *p_this ) pi_header[1] = sizeof("ENCODER=VLC media player"); p_enc->fmt_out.i_extra = 3 * 2 + pi_header[0] + pi_header[1]; - p_extra = p_enc->fmt_out.p_extra = malloc( p_enc->fmt_out.i_extra ); + p_extra = p_enc->fmt_out.p_extra = xmalloc( p_enc->fmt_out.i_extra ); for( i = 0; i < 2; i++ ) { *(p_extra++) = pi_header[i] >> 8; @@ -925,16 +1048,19 @@ static int OpenEncoder( vlc_object_t *p_this ) **************************************************************************** * This function spits out ogg packets. ****************************************************************************/ -static block_t *Encode( encoder_t *p_enc, aout_buffer_t *p_aout_buf ) +static block_t *Encode( encoder_t *p_enc, block_t *p_aout_buf ) { encoder_sys_t *p_sys = p_enc->p_sys; block_t *p_block, *p_chain = NULL; + /* Encoder gets NULL when it's time to flush */ + if( unlikely( !p_aout_buf ) ) return NULL; + unsigned char *p_buffer = p_aout_buf->p_buffer; int i_samples = p_aout_buf->i_nb_samples; int i_samples_delay = p_sys->i_samples_delay; - p_sys->i_pts = p_aout_buf->start_date - + mtime_t i_pts = p_aout_buf->i_pts - (mtime_t)1000000 * (mtime_t)p_sys->i_samples_delay / (mtime_t)p_enc->fmt_in.audio.i_rate; @@ -991,17 +1117,17 @@ static block_t *Encode( encoder_t *p_enc, aout_buffer_t *p_aout_buf ) MAX_FRAME_BYTES ); speex_bits_reset( &p_sys->bits ); - p_block = block_New( p_enc, i_out ); + p_block = block_Alloc( i_out ); memcpy( p_block->p_buffer, p_sys->p_buffer_out, i_out ); p_block->i_length = (mtime_t)1000000 * (mtime_t)p_sys->i_frame_length * p_sys->header.frames_per_packet / (mtime_t)p_enc->fmt_in.audio.i_rate; - p_block->i_dts = p_block->i_pts = p_sys->i_pts; + p_block->i_dts = p_block->i_pts = i_pts; /* Update pts */ - p_sys->i_pts += p_block->i_length; + i_pts += p_block->i_length; block_ChainAppend( &p_chain, p_block ); } @@ -1028,6 +1154,7 @@ 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 ); } +#endif