Changeset 838 for pjproject/trunk/pjmedia/src/pjmedia/g711.c

Timestamp:

Nov 30, 2006 1:35:00 AM (17 years ago)

Author:

bennylp

Message:

Implement task #26: integrate table based Alaw/Ulaw?/linear conversion into pjmedia (thanks Toni Rutar for the original contribution)

File:

• pjproject/trunk/pjmedia/src/pjmedia/g711.c (modified) (6 diffs)

pjproject/trunk/pjmedia/src/pjmedia/g711.c

@@ -21 +21 @@
  */
 #include <pjmedia/codec.h>
+#include <pjmedia/alaw_ulaw.h>
 #include <pjmedia/endpoint.h>
 #include <pjmedia/errno.h>
@@ -42 +43 @@
 PJ_DECL(pj_status_t) g711_init_factory (pjmedia_codec_factory *factory, 
                                         pj_pool_t *pool);
-
-/* Algorithm prototypes. */
-unsigned char linear2alaw(int           pcm_val);
-int           alaw2linear(unsigned char a_val);
-unsigned char linear2ulaw(int           pcm_val);
-int           ulaw2linear(unsigned char u_val);
 
 /* Prototypes for G711 factory */
@@ -478 +473 @@
 
         for (i=0; i!=input->size/2; ++i, ++dst) {
-            *dst = linear2alaw(samples[i]);
+            *dst = pjmedia_linear2alaw(samples[i]);
         }
     } else if (priv->pt == PJMEDIA_RTP_PT_PCMU) {
@@ -485 +480 @@
 
         for (i=0; i!=input->size/2; ++i, ++dst) {
-            *dst = linear2ulaw(samples[i]);
+            *dst = pjmedia_linear2ulaw(samples[i]);
         }
 
@@ -520 +515 @@
 
         for (i=0; i!=input->size; ++i) {
-            *dst++ = (pj_uint16_t) alaw2linear(*src++);
+            *dst++ = (pj_uint16_t) pjmedia_alaw2linear(*src++);
         }
     } else if (priv->pt == PJMEDIA_RTP_PT_PCMU) {
@@ -528 +523 @@
 
         for (i=0; i!=input->size; ++i) {
-            *dst++ = (pj_uint16_t) ulaw2linear(*src++);
+            *dst++ = (pj_uint16_t) pjmedia_ulaw2linear(*src++);
         }