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

pjproject/trunk/pjmedia/src/pjmedia/resample_port.c

@@ -70 +70 @@
     
     /* Create and initialize port. */
-    rport = pj_pool_zalloc(pool, sizeof(struct resample_port));
+    rport = PJ_POOL_ZALLOC_T(pool, struct resample_port);
     PJ_ASSERT_RETURN(rport != NULL, PJ_ENOMEM);
 
@@ -85 +85 @@
      * both functions may run simultaneously.
      */
-    rport->get_buf = pj_pool_alloc(pool, dn_port->info.bytes_per_frame);
+    rport->get_buf = (pj_int16_t*)
+                     pj_pool_alloc(pool, dn_port->info.bytes_per_frame);
     PJ_ASSERT_RETURN(rport->get_buf != NULL, PJ_ENOMEM);
 
-    rport->put_buf = pj_pool_alloc(pool, dn_port->info.bytes_per_frame);
+    rport->put_buf = (pj_int16_t*)
+                     pj_pool_alloc(pool, dn_port->info.bytes_per_frame);
     PJ_ASSERT_RETURN(rport->put_buf != NULL, PJ_ENOMEM);
 
@@ -140 +142 @@
 
     if (frame->type == PJMEDIA_FRAME_TYPE_AUDIO) {
-        pjmedia_resample_run( rport->resample_put, frame->buf, 
+        pjmedia_resample_run( rport->resample_put, 
+                              (const pj_int16_t*) frame->buf, 
                               rport->put_buf);
 
@@ -189 +192 @@
     }
 
-    pjmedia_resample_run( rport->resample_get, tmp_frame.buf, frame->buf);
+    pjmedia_resample_run( rport->resample_get, 
+                          (const pj_int16_t*) tmp_frame.buf, 
+                          (pj_int16_t*) frame->buf);
 
     frame->size = rport->base.info.bytes_per_frame;