Changeset 277:ae3cc356317a

Timestamp:

02/14/08 17:25:57 (11 months ago)

Author:

halina@ada

Message:

added g722

Files:

• phapi/SConscript (modified) (2 diffs)
• phapi/phcodec.c (modified) (2 diffs)

phapi/SConscript

@@ -113 +113 @@
-        'stun',
-        'gsm',
+        'g722',
-]
-
@@ -335 +336 @@
-        defines['__armlinux'] = 1
-
-
+, "g722"
-BJ.Use(env, libs, USEDEBUG=1)
-

phapi/phcodec.c

@@ -18 +18 @@
-#include "phcodec.h"
-
+#include "g722/g722.h"
+
-//#include "gsm/gsm.h"
-//#include "gsm/private.h"
@@ -390 +392 @@
-
-
+
+static int ph_g722_encode(void *ctx, const void *src, int srcsize, void *dst, int dstsize);
+static int ph_g722_decode(void *ctx, const void *src, int srcsize, void *dst, int dstsize);
+static void *ph_g722_encode_init(void *);
+static void *ph_g722_decode_init(void *);
+static void ph_g722_encode_cleanup(void *ctx);
+static void ph_g722_decode_cleanup(void *ctx);
+
+static void *
+ph_g722_encode_init(void *dummy)
+{
+    return g722_encode_init(0, 64000, 0);
+}
+
+static void *
+ph_g722_decode_init(void *dummy)
+{
+    return g722_decode_init(0, 64000, 0);
+}
+
+static void 
+ph_g722_encode_cleanup(void *ctx)
+{
+  g722_encode_release((g722_encode_state_t *)ctx);
+}
+
+static void 
+ph_g722_decode_cleanup(void *ctx)
+{
+  g722_decode_release((g722_decode_state_t *)ctx);
+}
+
+int ph_g722_encode(void *ctx, const void *src, int srcsize, void *dst, int dstsize)
+{
+    return g722_encode((g722_encode_state_t *)ctx, dst, src, srcsize/2);
+}
+
+int ph_g722_decode(void *ctx, const void *src, int srcsize, void *dst, int dstsize)
+{
+    return 2*g722_decode((g722_decode_state_t *)ctx, dst, src, srcsize);
+}
+
+static phcodec_t g722_codec =
+{
+  "G722", 16000, 160, 320*2, ph_g722_encode_init, ph_g722_decode_init, ph_g722_encode_cleanup, ph_g722_decode_cleanup, 
+  ph_g722_encode, ph_g722_decode
+};
+
+
-#ifdef ENABLE_ILBC
-