Changeset 1266 for pjproject/trunk/pjmedia/src/pjmedia-codec/gsm.c

Timestamp:

May 11, 2007 3:14:34 PM (17 years ago)

Author:

bennylp

Message:

HUGE changeset to make the rest of the libraries compile with C++ mode

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/gsm.c (modified) (9 diffs)

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

@@ -123 +123 @@
 struct gsm_data
 {
-    void                *encoder;
-    void                *decoder;
+    gsm_state           *encoder;
+    gsm_state           *decoder;
     pj_bool_t            plc_enabled;
 #if !PLC_DISABLED
@@ -324 +324 @@
         pj_list_erase(codec);
     } else {
-        codec = pj_pool_zalloc(gsm_codec_factory.pool, 
-                               sizeof(pjmedia_codec));
+        codec = PJ_POOL_ZALLOC_T(gsm_codec_factory.pool, pjmedia_codec);
         PJ_ASSERT_RETURN(codec != NULL, PJ_ENOMEM);
         codec->op = &gsm_op;
         codec->factory = factory;
 
-        gsm_data = pj_pool_zalloc(gsm_codec_factory.pool, 
-                                  sizeof(struct gsm_data));
+        gsm_data = PJ_POOL_ZALLOC_T(gsm_codec_factory.pool, struct gsm_data);
         codec->codec_data = gsm_data;
 
@@ -372 +370 @@
     PJ_ASSERT_RETURN(factory == &gsm_codec_factory.base, PJ_EINVAL);
 
-    gsm_data = codec->codec_data;
+    gsm_data = (struct gsm_data*) codec->codec_data;
 
     /* Close codec, if it's not closed. */
@@ -418 +416 @@
                                    pjmedia_codec_param *attr )
 {
-    struct gsm_data *gsm_data = codec->codec_data;
+    struct gsm_data *gsm_data = (struct gsm_data*) codec->codec_data;
 
     pj_assert(gsm_data != NULL);
@@ -442 +440 @@
 static pj_status_t gsm_codec_close( pjmedia_codec *codec )
 {
-    struct gsm_data *gsm_data = codec->codec_data;
+    struct gsm_data *gsm_data = (struct gsm_data*) codec->codec_data;
 
     pj_assert(gsm_data != NULL);
@@ -465 +463 @@
                                      const pjmedia_codec_param *attr )
 {
-    struct gsm_data *gsm_data = codec->codec_data;
+    struct gsm_data *gsm_data = (struct gsm_data*) codec->codec_data;
 
     pj_assert(gsm_data != NULL);
@@ -517 +515 @@
                                      struct pjmedia_frame *output)
 {
-    struct gsm_data *gsm_data = codec->codec_data;
+    struct gsm_data *gsm_data = (struct gsm_data*) codec->codec_data;
 
     pj_assert(gsm_data != NULL);
@@ -536 +534 @@
 
         is_silence = pjmedia_silence_det_detect(gsm_data->vad, 
-                                                input->buf,
+                                                (const pj_int16_t*) input->buf,
                                                 (input->size >> 1),
                                                 NULL);
@@ -571 +569 @@
                                      struct pjmedia_frame *output)
 {
-    struct gsm_data *gsm_data = codec->codec_data;
+    struct gsm_data *gsm_data = (struct gsm_data*) codec->codec_data;
 
     pj_assert(gsm_data != NULL);