Changeset 1777

Timestamp:

Feb 4, 2008 11:37:01 PM (16 years ago)

Author:

nanang

Message:

Ticket #466:
Fixed PCM frame size returned by speex decoder.

File:

• pjproject/branches/projects/jbuf2/pjmedia/src/pjmedia-codec/speex_codec.c (modified) (2 diffs)

pjproject/branches/projects/jbuf2/pjmedia/src/pjmedia-codec/speex_codec.c

@@ -769 +769 @@
                                      struct pjmedia_frame *output)
 {
-    struct spx_private *spx;
-
-    spx = (struct spx_private*) codec->codec_data;
-
-    PJ_ASSERT_RETURN(output_buf_len >= 320, PJMEDIA_CODEC_EPCMTOOSHORT);
+    struct spx_private *spx = (struct spx_private*) codec->codec_data;
+    unsigned pcm_size;
+
+    pcm_size = spx_factory.speex_param[spx->param_id].samples_per_frame << 1;
+
+    PJ_ASSERT_RETURN(output_buf_len >= pcm_size, PJMEDIA_CODEC_EPCMTOOSHORT);
 
     if (input->type != PJMEDIA_FRAME_TYPE_AUDIO) {
-        pjmedia_zero_samples((pj_int16_t*)output->buf, 160);
-        output->size = 320;
+        output->size = pcm_size;
         output->timestamp.u64 = input->timestamp.u64;
         output->type = PJMEDIA_FRAME_TYPE_AUDIO;
+        pj_bzero(output->buf, output->size);
         return PJ_SUCCESS;
     }
@@ -790 +791 @@
 
     output->type = PJMEDIA_FRAME_TYPE_AUDIO;
-    output->size = 320;
+    output->size = pcm_size;
     output->timestamp.u64 = input->timestamp.u64;