Changeset 1266 for pjproject/trunk/pjmedia/src/pjmedia/g711.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/g711.c (modified) (11 diffs)

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

@@ -320 +320 @@
         struct g711_private *codec_priv;
 
-        codec = pj_pool_alloc(g711_factory.pool, sizeof(pjmedia_codec));
-        codec_priv = pj_pool_zalloc(g711_factory.pool, 
-                                    sizeof(struct g711_private));
+        codec = PJ_POOL_ALLOC_T(g711_factory.pool, pjmedia_codec);
+        codec_priv = PJ_POOL_ZALLOC_T(g711_factory.pool, struct g711_private);
         if (!codec || !codec_priv) {
             pj_mutex_unlock(g711_factory.mutex);
@@ -372 +371 @@
                                       pjmedia_codec *codec )
 {
-    struct g711_private *priv = codec->codec_data;
+    struct g711_private *priv = (struct g711_private*) codec->codec_data;
     int i = 0;
 
@@ -421 +420 @@
                              pjmedia_codec_param *attr )
 {
-    struct g711_private *priv = codec->codec_data;
+    struct g711_private *priv = (struct g711_private*) codec->codec_data;
     priv->pt = attr->info.pt;
 #if !PLC_DISABLED
@@ -440 +439 @@
                                 const pjmedia_codec_param *attr )
 {
-    struct g711_private *priv = codec->codec_data;
+    struct g711_private *priv = (struct g711_private*) codec->codec_data;
 
     if (attr->info.pt != priv->pt)
@@ -488 +487 @@
 {
     pj_int16_t *samples = (pj_int16_t*) input->buf;
-    struct g711_private *priv = codec->codec_data;
+    struct g711_private *priv = (struct g711_private*) codec->codec_data;
 
     /* Check output buffer length */
@@ -502 +501 @@
                                              &input->timestamp);
 
-        is_silence = pjmedia_silence_det_detect(priv->vad, input->buf, 
+        is_silence = pjmedia_silence_det_detect(priv->vad, 
+                                                (const pj_int16_t*) input->buf, 
                                                 (input->size >> 1), NULL);
         if (is_silence && 
@@ -521 +521 @@
     if (priv->pt == PJMEDIA_RTP_PT_PCMA) {
         unsigned i, n;
-        pj_uint8_t *dst = output->buf;
+        pj_uint8_t *dst = (pj_uint8_t*) output->buf;
 
         n = (input->size >> 1);
@@ -529 +529 @@
     } else if (priv->pt == PJMEDIA_RTP_PT_PCMU) {
         unsigned i, n;
-        pj_uint8_t *dst = output->buf;
+        pj_uint8_t *dst = (pj_uint8_t*) output->buf;
 
         n = (input->size >> 1);
@@ -551 +551 @@
                                 struct pjmedia_frame *output)
 {
-    struct g711_private *priv = codec->codec_data;
+    struct g711_private *priv = (struct g711_private*) codec->codec_data;
 
     /* Check output buffer length */
@@ -564 +564 @@
     if (priv->pt == PJMEDIA_RTP_PT_PCMA) {
         unsigned i;
-        pj_uint8_t *src = input->buf;
-        pj_uint16_t *dst = output->buf;
+        pj_uint8_t *src = (pj_uint8_t*) input->buf;
+        pj_uint16_t *dst = (pj_uint16_t*) output->buf;
 
         for (i=0; i!=input->size; ++i) {
@@ -572 +572 @@
     } else if (priv->pt == PJMEDIA_RTP_PT_PCMU) {
         unsigned i;
-        pj_uint8_t *src = input->buf;
-        pj_uint16_t *dst = output->buf;
+        pj_uint8_t *src = (pj_uint8_t*) input->buf;
+        pj_uint16_t *dst = (pj_uint16_t*) output->buf;
 
         for (i=0; i!=input->size; ++i) {