Changeset 1983 for pjproject/trunk/pjmedia/src/pjmedia-codec/ilbc.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/ilbc.c (modified) (2 diffs)

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

@@ -511 +511 @@
 {
     struct ilbc_codec *ilbc_codec = (struct ilbc_codec*)codec;
-    unsigned i;
-
-    pj_assert(ilbc_codec != NULL);
-    PJ_ASSERT_RETURN(input && output, PJ_EINVAL);
-
-    if (output_buf_len < ilbc_codec->enc_frame_size)
-        return PJMEDIA_CODEC_EFRMTOOSHORT;
-
-    if (input->size != (ilbc_codec->enc_samples_per_frame << 1))
-        return PJMEDIA_CODEC_EPCMFRMINLEN;
+    pj_int16_t *pcm_in;
+    unsigned nsamples;
+
+    pj_assert(ilbc_codec && input && output);
+
+    pcm_in = (pj_int16_t*)input->buf;
+    nsamples = input->size >> 1;
+
+    PJ_ASSERT_RETURN(nsamples % ilbc_codec->enc_samples_per_frame == 0, 
+                     PJMEDIA_CODEC_EPCMFRMINLEN);
+    PJ_ASSERT_RETURN(output_buf_len >= ilbc_codec->enc_frame_size * nsamples /
+                     ilbc_codec->enc_samples_per_frame,
+                     PJMEDIA_CODEC_EFRMTOOSHORT);
 
     /* Detect silence */
@@ -548 +551 @@
     }
 
-    /* Convert to float */
-    for (i=0; i<ilbc_codec->enc_samples_per_frame; ++i) {
-        ilbc_codec->enc_block[i] = (float) (((pj_int16_t*)input->buf)[i]);
-    }
-
     /* Encode */
-    iLBC_encode((unsigned char *)output->buf, 
-                ilbc_codec->enc_block, 
-                &ilbc_codec->enc);
+    output->size = 0;
+    while (nsamples >= ilbc_codec->enc_samples_per_frame) {
+        unsigned i;
+        
+        /* Convert to float */
+        for (i=0; i<ilbc_codec->enc_samples_per_frame; ++i) {
+            ilbc_codec->enc_block[i] = (float) (*pcm_in++);
+        }
+
+        iLBC_encode((unsigned char *)output->buf + output->size, 
+                    ilbc_codec->enc_block, 
+                    &ilbc_codec->enc);
+
+        output->size += ilbc_codec->enc.no_of_bytes;
+        nsamples -= ilbc_codec->enc_samples_per_frame;
+    }
 
     output->type = PJMEDIA_FRAME_TYPE_AUDIO;
-    output->size = ilbc_codec->enc.no_of_bytes;
     output->timestamp = input->timestamp;