Changeset 2572 for pjproject/trunk

Timestamp:

Apr 6, 2009 11:45:25 AM (16 years ago)

Author:

nanang

Message:

Ticket #774: Fixed G722.1 codec to aware about endianness in packing/unpacking RTP payload (the underlying implementation, ITU impl ref, works with 16-bits coded data).

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/g7221.c (modified) (3 diffs)

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

@@ -764 +764 @@
                                       codec_data->samples_per_frame);
 
-    /* Encode the mlt coefs */
+    /* Encode the mlt coefs. Note that encoder output stream is 16 bit array,
+     * so we need to take care about endianness.
+     */
     encoder(codec_data->frame_size_bits,
             codec_data->number_of_regions,
@@ -771 +773 @@
             output->buf);
 
+#if defined(PJ_IS_LITTLE_ENDIAN) && PJ_IS_LITTLE_ENDIAN!=0
+    {
+        pj_uint16_t *p, *p_end;
+
+        p = (pj_uint16_t*)output->buf;
+        p_end = p + codec_data->frame_size/2;
+        while (p < p_end) {
+            *p = pj_htons(*p);
+            ++p;
+        }
+    }
+#endif
+
     output->type = PJMEDIA_FRAME_TYPE_AUDIO;
     output->size = codec_data->frame_size;
@@ -801 +816 @@
         PJ_ASSERT_RETURN((pj_uint16_t)input->size == codec_data->frame_size,
                          PJMEDIA_CODEC_EFRMINLEN);
+
+        /* Decoder requires input of 16-bits array, so we need to take care
+         * about endianness.
+         */
+#if defined(PJ_IS_LITTLE_ENDIAN) && PJ_IS_LITTLE_ENDIAN!=0
+        {
+            pj_uint16_t *p, *p_end;
+
+            p = (pj_uint16_t*)input->buf;
+            p_end = p + codec_data->frame_size/2;
+            while (p < p_end) {
+                *p = pj_ntohs(*p);
+                ++p;
+            }
+        }
+#endif
+
         bitobj.code_word_ptr = (Word16*)input->buf;
         bitobj.current_word =  *bitobj.code_word_ptr;