Ticket #1291: speex.c.patch

vlc-0.9.0-svn-spx/modules/codec/speex.c

@@ -56 +56 @@
-    SpeexHeader *p_header;
-    SpeexStereoState stereo;
-    void *p_state;
+    unsigned int rtp_rate;
-
-    /*
-     * Common properties
@@ -83 +84 @@
-static void CloseDecoder  ( vlc_object_t * );
-
-static void *DecodeBlock  ( decoder_t *, block_t ** );
+static aout_buffer_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 ** );
@@ -126 +128 @@
-    decoder_t *p_dec = (decoder_t*)p_this;
-    decoder_sys_t *p_sys = p_dec->p_sys;
-
-
+
+
-    {
-        return VLC_EGENERIC;
-    }
@@ -138 +141 @@
-        msg_Err( p_dec, "out of memory" );
-        return VLC_EGENERIC;
-    }
+    p_dec->p_sys->bits.buf_size = 0;
-    p_dec->p_sys->b_packetizer = VLC_FALSE;
+    p_dec->p_sys->rtp_rate = p_dec->fmt_in.audio.i_rate;
-
-    aout_DateSet( &p_sys->end_date, 0 );
-
@@ -146 +151 @@
-    p_dec->fmt_out.i_cat = AUDIO_ES;
-    p_dec->fmt_out.i_codec = AOUT_FMT_S16_NE;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    p_dec->pf_packetize    = (block_t *(*)(decoder_t *, block_t **))
-        DecodeBlock;
-
@@ -210 +230 @@
-    /* 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 =
@@ -414 +432 @@
-    block_t *p_block = *pp_block;
-
-    /* Date management */
-
+ 
-        p_block->i_pts != aout_DateGet( &p_sys->end_date ) )
-    {
-        aout_DateSet( &p_sys->end_date, p_block->i_pts );
@@ -431 +449 @@
-
-    if( p_sys->b_packetizer )
-    {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    else
-    {
@@ -447 +532 @@
-    }
-}
-
+static aout_buffer_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;
+    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 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 );
+        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;
+        }
+
+        /*
+          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_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 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;
+    }
+    *pp_block = NULL;
+
+    if ( !aout_DateGet( &p_sys->end_date ) )
+        aout_DateSet( &p_sys->end_date, p_speex_bit_block->i_dts );
+
+    /*
+      Ask for a new audio output buffer and make sure
+      we get one. 
+    */
+    p_aout_buffer = p_dec->pf_aout_buffer_new( p_dec, 
+        p_sys->p_header->frame_size );
+    if ( !p_aout_buffer || p_aout_buffer->i_nb_bytes == 0 )
+    {
+        msg_Err(p_dec, "Oops: No new buffer was returned!");
+        return NULL;
+    }
+
+    /*
+      Read the Speex payload into the SpeexBits 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 
+      were encountered.
+    */
+    i_decode_ret = 
+        speex_decode_int( p_sys->p_state,&p_sys->bits,p_aout_buffer->p_buffer );
+    if ( i_decode_ret < 0 )
+    {
+        msg_Err( p_dec, "Decoding failed. Perhaps we have a bad stream?" );
+        return NULL;
+    }
+
+    /* 
+      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_sys->i_frame_in_packet++;
+    block_Release( p_speex_bit_block );
+
+    return p_aout_buffer;
+}
+
-/*****************************************************************************
- * DecodePacket: decodes a Speex packet.
- *****************************************************************************/
@@ -485 +688 @@
-
-        if( i_ret== -2 )
-        {
-Warn
+Err
-            return NULL;
-        }
-
-        if( speex_bits_remaining( &p_sys->bits ) < 0 )
-        {
-Warn
-
+Err
+ 
-
-        if( p_sys->p_header->nb_channels == 2 )
-            speex_decode_stereo_int( (int16_t *)p_aout_buffer->p_buffer,
@@ -502 +705 @@
-        /* Date management */
-        p_aout_buffer->start_date = aout_DateGet( &p_sys->end_date );
-        p_aout_buffer->end_date =
-
+ 
-
-        p_sys->i_frame_in_packet++;
-
@@ -526 +729 @@
-    p_block->i_dts = p_block->i_pts = aout_DateGet( &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;
-
@@ -563 +768 @@
-
-    if( p_oggpacket->bytes < 8 )
-    {
-Warn
+Err
-        return;
-    }
-
-    i_len = readint( p_buf, 0 ); p_buf += 4;
-    if( i_len > p_oggpacket->bytes - 4 )
-    {
-Warn
+Err
-        return;
-    }
-