Changeset 1983 for pjproject/trunk/pjmedia/src/pjmedia-codec/gsm.c

Timestamp:

Jun 5, 2008 10:50:40 AM (16 years ago)

Author:

nanang

Message:

Ticket #473:

• fixed issue on Speex multiple frames (encoding: encoded bits concatenation & decoding: frames parsing)
• updated pjmedia stream & codecs on encoding multiple frames
• introduced bit_info in pjmedia_frame and jitter buffer

File:

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

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

@@ -516 +516 @@
 {
     struct gsm_data *gsm_data = (struct gsm_data*) codec->codec_data;
-
-    pj_assert(gsm_data != NULL);
-    PJ_ASSERT_RETURN(input && output, PJ_EINVAL);
-
-    if (output_buf_len < 33)
-        return PJMEDIA_CODEC_EFRMTOOSHORT;
-
-    PJ_ASSERT_RETURN(input->size==320, PJMEDIA_CODEC_EPCMFRMINLEN);
+    pj_int16_t *pcm_in;
+    unsigned in_size;
+
+    pj_assert(gsm_data && input && output);
+    
+    pcm_in = (pj_int16_t*)input->buf;
+    in_size = input->size;
+
+    PJ_ASSERT_RETURN(in_size % 320 == 0, PJMEDIA_CODEC_EPCMFRMINLEN);
+    PJ_ASSERT_RETURN(output_buf_len >= 33 * in_size/320, 
+                     PJMEDIA_CODEC_EFRMTOOSHORT);
 
     /* Detect silence */
@@ -552 +555 @@
 
     /* Encode */
-    gsm_encode(gsm_data->encoder, (short*)input->buf, 
-               (unsigned char*)output->buf);
-
-    output->size = 33;
+    output->size = 0;
+    while (in_size >= 320) {
+        gsm_encode(gsm_data->encoder, pcm_in, 
+                   (unsigned char*)output->buf + output->size);
+        pcm_in += 160;
+        output->size += 33;
+        in_size -= 320;
+    }
+
     output->type = PJMEDIA_FRAME_TYPE_AUDIO;