Changeset 2616 for pjproject/trunk/pjmedia/src/pjmedia-codec/g7221.c

Timestamp:

Apr 18, 2009 2:29:28 PM (15 years ago)

Author:

bennylp

Message:

More ticket #774: optimization for siren7/siren14 codecs

File:

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

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

@@ -223 +223 @@
 }
 
+#if defined(PJ_IS_LITTLE_ENDIAN) && PJ_IS_LITTLE_ENDIAN!=0
+PJ_INLINE(void) swap_bytes(pj_uint16_t *buf, unsigned count)
+{
+    pj_uint16_t *end = buf + count;
+    while (buf != end) {
+        *buf = (pj_uint16_t)((*buf << 8) | (*buf >> 8));
+        ++buf;
+    }
+}
+#else
+#define swap_bytes(buf, count)
+#endif
+
 /*
  * Initialize and register G722.1 codec factory to pjmedia endpoint.
@@ -775 +788 @@
             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
+    /* Encoder output are in native host byte order, while ITU says
+     * it must be in network byte order (MSB first).
+     */
+    swap_bytes((pj_uint16_t*)output->buf, codec_data->frame_size/2);
 
     output->type = PJMEDIA_FRAME_TYPE_AUDIO;
@@ -819 +824 @@
                          PJMEDIA_CODEC_EFRMINLEN);
 
-        /* Decoder requires input of 16-bits array, so we need to take care
-         * about endianness.
+        /* Decoder requires input of 16-bits array in native host byte
+         * order, while the frame received from the network are in
+         * network byte order (MSB first).
          */
-#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
+        swap_bytes((pj_uint16_t*)input->buf, codec_data->frame_size/2);
 
         bitobj.code_word_ptr = (Word16*)input->buf;