Changeset 1677 for pjproject/trunk/pjmedia/src/pjmedia-codec/speex_codec.c

Timestamp:

Jan 11, 2008 8:52:18 AM (17 years ago)

Author:

bennylp

Message:

Fixed what looks like a bug in pjmedia's Speex decoder: decoder may return invalid PCM frame length

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/speex_codec.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia-codec/speex_codec.c

@@ -773 +773 @@
     spx = (struct spx_private*) codec->codec_data;
 
+    PJ_ASSERT_RETURN(output_buf_len >= 320, PJMEDIA_CODEC_EPCMTOOSHORT);
+
     if (input->type != PJMEDIA_FRAME_TYPE_AUDIO) {
-        pj_bzero(output->buf, output_buf_len);
+        pjmedia_zero_samples((pj_int16_t*)output->buf, 160);
         output->size = 320;
         output->timestamp.u64 = input->timestamp.u64;
@@ -788 +790 @@
 
     output->type = PJMEDIA_FRAME_TYPE_AUDIO;
-    output->size = speex_bits_nbytes(&spx->dec_bits);
-    pj_assert(output->size <= (unsigned)output_buf_len);
+    output->size = 320;
     output->timestamp.u64 = input->timestamp.u64;