X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fspeex.c;h=7a171f510943ec13a5ee30072453899e78f522ee;hb=d4f950b3285f5afa3f77f35096d7a5d073b9f296;hp=1069f2d18923b331845dbdf3689f65d1f7a393e6;hpb=7b452ff3b0b1cc376e13c8766dcae3e2c383aa88;p=vlc diff --git a/modules/codec/speex.c b/modules/codec/speex.c index 1069f2d189..7a171f5109 100644 --- a/modules/codec/speex.c +++ b/modules/codec/speex.c @@ -1,7 +1,7 @@ /***************************************************************************** * speex.c: speex decoder/packetizer/encoder module making use of libspeex. ***************************************************************************** - * Copyright (C) 2003-2008 the VideoLAN team + * Copyright (C) 2003-2009 the VideoLAN team * $Id$ * * Authors: Gildas Bazin @@ -165,7 +165,7 @@ struct decoder_sys_t /* * Common properties */ - audio_date_t end_date; + date_t end_date; }; @@ -203,24 +203,23 @@ static block_t *Encode ( encoder_t *, aout_buffer_t * ); 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_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 ) + 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 = false; p_dec->p_sys->rtp_rate = p_dec->fmt_in.audio.i_rate; - 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 @@ -307,9 +306,8 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) { 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_dec->fmt_in.p_extra = xrealloc( 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; @@ -393,8 +391,8 @@ static int ProcessHeaders( decoder_t *p_dec ) 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 ); } @@ -490,7 +488,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; } @@ -505,13 +503,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 ); @@ -530,7 +528,7 @@ static void *ProcessPacket( decoder_t *p_dec, ogg_packet *p_oggpacket, 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 ); + 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); @@ -613,7 +611,8 @@ static aout_buffer_t *DecodeRtpSpeexPacket( decoder_t *p_dec, block_t **pp_block 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), @@ -661,7 +660,7 @@ static aout_buffer_t *DecodeRtpSpeexPacket( decoder_t *p_dec, block_t **pp_block } p_dec->fmt_out.audio.i_bytes_per_frame = i_speex_frame_size; - aout_DateInit(&p_sys->end_date, p_sys->p_header->rate); + date_Init(&p_sys->end_date, p_sys->p_header->rate, 1); } /* @@ -675,8 +674,8 @@ static aout_buffer_t *DecodeRtpSpeexPacket( decoder_t *p_dec, block_t **pp_block } *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 @@ -684,7 +683,7 @@ static aout_buffer_t *DecodeRtpSpeexPacket( decoder_t *p_dec, block_t **pp_block */ 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; @@ -712,9 +711,9 @@ static aout_buffer_t *DecodeRtpSpeexPacket( decoder_t *p_dec, block_t **pp_block /* 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++; @@ -772,9 +771,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++; @@ -794,12 +794,12 @@ 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, + date_Increment( &p_sys->end_date, p_sys->p_header->frame_size ) - p_block->i_pts; } @@ -892,11 +892,6 @@ struct encoder_sys_t int i_frame_length; int i_samples_delay; int i_frame_size; - - /* - * Common properties - */ - mtime_t i_pts; }; /***************************************************************************** @@ -940,7 +935,7 @@ static int OpenEncoder( vlc_object_t *p_this ) 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_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, @@ -993,14 +988,13 @@ static int OpenEncoder( vlc_object_t *p_this ) 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] ); @@ -1008,7 +1002,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; @@ -1038,7 +1032,7 @@ static block_t *Encode( encoder_t *p_enc, aout_buffer_t *p_aout_buf ) 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; @@ -1102,10 +1096,10 @@ static block_t *Encode( encoder_t *p_enc, aout_buffer_t *p_aout_buf ) (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 ); }