X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fspeex.c;h=0d51c675e89f0dcfb21adfb4a859b4e25a857daa;hb=f24cedeab2187cb2f700713fc4a565bbbe2cae44;hp=4161dced1fb3ff3eaae0c94b3b2f4d78ba00ede6;hpb=75013fc5eed08d7d27907ed401a7d6e7967c752e;p=vlc diff --git a/modules/codec/speex.c b/modules/codec/speex.c old mode 100755 new mode 100644 index 4161dced1f..0d51c675e8 --- a/modules/codec/speex.c +++ b/modules/codec/speex.c @@ -26,12 +26,13 @@ *****************************************************************************/ #include #include +#include #include -#include -#include "speex_header.h" -#include "speex_stereo.h" -#include "speex_callbacks.h" +#include +#include +#include +#include /***************************************************************************** * decoder_sys_t : speex decoder descriptor @@ -81,7 +82,8 @@ static int OpenPacketizer( vlc_object_t * ); static void CloseDecoder ( vlc_object_t * ); static void *DecodeBlock ( decoder_t *, block_t ** ); -static int ProcessHeader ( decoder_t *, ogg_packet * ); +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 * ); @@ -91,13 +93,15 @@ static void ParseSpeexComments( decoder_t *, ogg_packet * ); static int OpenEncoder ( vlc_object_t * ); static void CloseEncoder ( vlc_object_t * ); -static block_t *Headers ( encoder_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 ); @@ -202,43 +206,122 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) oggpacket.e_o_s = 0; oggpacket.packetno = 0; - if( p_sys->i_headers == 0 ) + /* Check for headers */ + if( p_sys->i_headers == 0 && p_dec->fmt_in.i_extra ) + { + /* Headers already available as extra data */ + p_sys->i_headers = 2; + } + else if( oggpacket.bytes && p_sys->i_headers < 2 ) + { + /* Backup headers as extra data */ + 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 = 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_sys->i_headers == 2 ) { - /* Take care of the initial Speex header */ - if( ProcessHeader( p_dec, &oggpacket ) != VLC_SUCCESS ) + if( ProcessHeaders( p_dec ) != VLC_SUCCESS ) { - msg_Err( p_dec, "initial Speex header is corrupted" ); + 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->i_headers++; + return ProcessPacket( p_dec, &oggpacket, pp_block ); +} + +/***************************************************************************** + * ProcessHeaders: process Speex headers. + *****************************************************************************/ +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; - return ProcessPacket( p_dec, &oggpacket, pp_block ); + 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; } - if( p_sys->i_headers == 1 ) + /* Take care of the initial Speex header */ + if( ProcessInitialHeader( p_dec, &oggpacket ) != VLC_SUCCESS ) { - /* The next packet in order is the comments header */ - ParseSpeexComments( p_dec, &oggpacket ); - p_sys->i_headers++; + msg_Err( p_dec, "initial Speex header is corrupted" ); + return VLC_EGENERIC; + } - return ProcessPacket( p_dec, &oggpacket, pp_block ); + /* 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; } - return ProcessPacket( p_dec, &oggpacket, pp_block ); + 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 ); + memcpy( p_dec->fmt_out.p_extra, + p_dec->fmt_in.p_extra, p_dec->fmt_out.i_extra ); + } + + return VLC_SUCCESS; } /***************************************************************************** - * ProcessHeader: processes the inital Speex header packet. + * ProcessInitialHeader: processes the inital Speex header packet. *****************************************************************************/ -static int ProcessHeader( decoder_t *p_dec, ogg_packet *p_oggpacket ) +static int ProcessInitialHeader( decoder_t *p_dec, ogg_packet *p_oggpacket ) { decoder_sys_t *p_sys = p_dec->p_sys; void *p_state; SpeexHeader *p_header; - SpeexMode *p_mode; + const SpeexMode *p_mode; SpeexCallback callback; p_sys->p_header = p_header = @@ -350,10 +433,7 @@ static void *ProcessPacket( decoder_t *p_dec, ogg_packet *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; } } @@ -386,8 +466,8 @@ static aout_buffer_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket ) return NULL; } - i_ret = speex_decode( p_sys->p_state, &p_sys->bits, - (int16_t *)p_aout_buffer->p_buffer ); + i_ret = speex_decode_int( p_sys->p_state, &p_sys->bits, + (int16_t *)p_aout_buffer->p_buffer ); if( i_ret == -1 ) { /* End of stream */ @@ -406,8 +486,9 @@ static aout_buffer_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket ) } if( p_sys->p_header->nb_channels == 2 ) - speex_decode_stereo( (int16_t *)p_aout_buffer->p_buffer, - p_sys->p_header->frame_size, &p_sys->stereo ); + speex_decode_stereo_int( (int16_t *)p_aout_buffer->p_buffer, + p_sys->p_header->frame_size, + &p_sys->stereo ); /* Date management */ p_aout_buffer->start_date = aout_DateGet( &p_sys->end_date ); @@ -460,9 +541,11 @@ static void ParseSpeexComments( decoder_t *p_dec, ogg_packet *p_oggpacket ) decoder_sys_t *p_sys = p_dec->p_sys; char *p_buf = (char *)p_oggpacket->packet; - SpeexMode *p_mode; + const SpeexMode *p_mode; int i_len; + if( p_input->i_object_type != VLC_OBJECT_INPUT ) return; + p_mode = speex_mode_list[p_sys->p_header->mode]; input_Control( p_input, INPUT_ADD_INFO, _("Speex comment"), _("Mode"), @@ -516,10 +599,8 @@ struct encoder_sys_t /* * Input properties */ - int i_headers; - char *p_buffer; - char *p_buffer_out[MAX_FRAME_BYTES]; + char p_buffer_out[MAX_FRAME_BYTES]; /* * Speex properties @@ -549,8 +630,11 @@ static int OpenEncoder( vlc_object_t *p_this ) { encoder_t *p_enc = (encoder_t *)p_this; encoder_sys_t *p_sys; - SpeexMode *p_speex_mode = &speex_nb_mode; - int i_quality; + const SpeexMode *p_speex_mode = &speex_nb_mode; + int i_quality, i; + char *pp_header[2]; + int pi_header[2]; + uint8_t *p_extra; if( p_enc->fmt_out.i_codec != VLC_FOURCC('s','p','x',' ') && !p_enc->b_force ) @@ -565,7 +649,6 @@ static int OpenEncoder( vlc_object_t *p_this ) return VLC_EGENERIC; } p_enc->p_sys = p_sys; - p_enc->pf_header = Headers; 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',' '); @@ -589,7 +672,6 @@ static int OpenEncoder( vlc_object_t *p_this ) p_sys->i_frames_in_packet = 0; p_sys->i_samples_delay = 0; - p_sys->i_headers = 0; p_sys->i_pts = 0; speex_encoder_ctl( p_sys->p_state, SPEEX_GET_FRAME_SIZE, @@ -599,6 +681,21 @@ static int OpenEncoder( vlc_object_t *p_this ) sizeof(int16_t) * p_enc->fmt_in.audio.i_channels; p_sys->p_buffer = malloc( p_sys->i_frame_size ); + /* Create and store headers */ + pp_header[0] = speex_header_to_packet( &p_sys->header, &pi_header[0] ); + pp_header[1] = "ENCODER=VLC media player"; + 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 ); + for( i = 0; i < 2; i++ ) + { + *(p_extra++) = pi_header[i] >> 8; + *(p_extra++) = pi_header[i] & 0xFF; + memcpy( p_extra, pp_header[i], pi_header[i] ); + p_extra += pi_header[i]; + } + msg_Dbg( p_enc, "encoding: frame size:%d, channels:%d, samplerate:%d", p_sys->i_frame_size, p_enc->fmt_in.audio.i_channels, p_enc->fmt_in.audio.i_rate ); @@ -606,42 +703,6 @@ static int OpenEncoder( vlc_object_t *p_this ) return VLC_SUCCESS; } -/**************************************************************************** - * Headers: spits out the headers - **************************************************************************** - * This function spits out ogg packets. - ****************************************************************************/ -static block_t *Headers( encoder_t *p_enc ) -{ - encoder_sys_t *p_sys = p_enc->p_sys; - block_t *p_block, *p_chain = NULL; - - /* Create speex headers */ - if( !p_sys->i_headers ) - { - char *p_buffer; - int i_buffer; - - /* Main header */ - p_buffer = speex_header_to_packet( &p_sys->header, &i_buffer ); - p_block = block_New( p_enc, i_buffer ); - memcpy( p_block->p_buffer, p_buffer, i_buffer ); - p_block->i_dts = p_block->i_pts = p_block->i_length = 0; - block_ChainAppend( &p_chain, p_block ); - - /* Comment */ - p_block = block_New( p_enc, sizeof("ENCODER=VLC media player") ); - memcpy( p_block->p_buffer, "ENCODER=VLC media player", - p_block->i_buffer ); - p_block->i_dts = p_block->i_pts = p_block->i_length = 0; - block_ChainAppend( &p_chain, p_block ); - - p_sys->i_headers = 2; - } - - return p_chain; -} - /**************************************************************************** * Encode: the whole thing **************************************************************************** @@ -687,15 +748,15 @@ static block_t *Encode( encoder_t *p_enc, aout_buffer_t *p_aout_buf ) /* Encode current frame */ if( p_enc->fmt_in.audio.i_channels == 2 ) - speex_encode_stereo( p_samples, p_sys->i_frame_length, - &p_sys->bits ); + speex_encode_stereo_int( p_samples, p_sys->i_frame_length, + &p_sys->bits ); #if 0 if( p_sys->preprocess ) speex_preprocess( p_sys->preprocess, p_samples, NULL ); #endif - speex_encode( p_sys->p_state, p_samples, &p_sys->bits ); + speex_encode_int( p_sys->p_state, p_samples, &p_sys->bits ); p_buffer += p_sys->i_frame_size; p_sys->i_samples_delay -= p_sys->i_frame_length;