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

pjproject/trunk/pjmedia/src/pjmedia/splitcomb.c

@@ -59 +59 @@
         pjmedia_port *port;
         pj_bool_t     reversed;
-    } *port_desc;
+    } port_desc[64];
 
     /* Temporary buffers needed to extract mono frame from
@@ -144 +144 @@
 
     /* Create the splitter/combiner structure */
-    sc = pj_pool_zalloc(pool, sizeof(struct splitcomb));
+    sc = PJ_POOL_ZALLOC_T(pool, struct splitcomb);
     PJ_ASSERT_RETURN(sc != NULL, PJ_ENOMEM);
 
     /* Create temporary buffers */
-    sc->get_buf = pj_pool_alloc(pool, samples_per_frame * 
+    sc->get_buf = (TMP_SAMP_TYPE*)
+                  pj_pool_alloc(pool, samples_per_frame * 
                                       sizeof(TMP_SAMP_TYPE) /
                                       channel_count);
     PJ_ASSERT_RETURN(sc->get_buf, PJ_ENOMEM);
 
-    sc->put_buf = pj_pool_alloc(pool, samples_per_frame * 
+    sc->put_buf = (TMP_SAMP_TYPE*)
+                  pj_pool_alloc(pool, samples_per_frame * 
                                       sizeof(TMP_SAMP_TYPE) /
                                       channel_count);
@@ -171 +173 @@
 
     /* Init ports array */
+    /*
     sc->port_desc = pj_pool_zalloc(pool, channel_count*sizeof(*sc->port_desc));
+    */
+    pj_bzero(sc->port_desc, sizeof(sc->port_desc));
 
     /* Done for now */
@@ -238 +243 @@
 
     /* Create the port */
-    rport = pj_pool_zalloc(pool, sizeof(struct reverse_port));
+    rport = PJ_POOL_ZALLOC_T(pool, struct reverse_port);
     rport->parent = sc;
     rport->ch_num = ch_num;
@@ -262 +267 @@
     /* Create put buffers */
     for (i=0; i<rport->buf_cnt; ++i) {
-        rport->dnstream_buf[i] = pj_pool_zalloc(pool, port->info.bytes_per_frame);
+        rport->dnstream_buf[i]=(pj_int16_t*)
+                               pj_pool_zalloc(pool, port->info.bytes_per_frame);
         PJ_ASSERT_RETURN(rport->dnstream_buf[i], PJ_ENOMEM);
     }
@@ -269 +275 @@
     /* Create get buffers */
     for (i=0; i<rport->buf_cnt; ++i) {
-        rport->upstream_buf[i] = pj_pool_zalloc(pool, 
+        rport->upstream_buf[i] = (pj_int16_t*)
+                                 pj_pool_zalloc(pool, 
                                                 port->info.bytes_per_frame);
         PJ_ASSERT_RETURN(rport->upstream_buf[i], PJ_ENOMEM);
@@ -367 +374 @@
 
             /* Extract the mono frame */
-            extract_mono_frame(frame->buf, sc->put_buf, ch, 
+            extract_mono_frame((const pj_int16_t*)frame->buf, sc->put_buf, ch, 
                                this_port->info.channel_count, 
                                frame->size * 8 / 
@@ -405 +412 @@
 
             /* Extract mono-frame and put it in downstream buffer */
-            extract_mono_frame(frame->buf, 
+            extract_mono_frame((const pj_int16_t*)frame->buf, 
                                rport->dnstream_buf[rport->dn_write_pos],
                                ch, this_port->info.channel_count, 
@@ -434 +441 @@
 
     /* Clear output frame */
-    pjmedia_zero_samples(frame->buf, this_port->info.samples_per_frame);
+    pjmedia_zero_samples((pj_int16_t*)frame->buf, 
+                         this_port->info.samples_per_frame);
 
     /* Read frame from each port */
@@ -460 +468 @@
 
             /* Combine the mono frame into multichannel frame */
-            store_mono_frame(mono_frame.buf, frame->buf, ch,
+            store_mono_frame((const pj_int16_t*)mono_frame.buf, 
+                             (pj_int16_t*)frame->buf, ch,
                              this_port->info.channel_count,
                              mono_frame.size * 8 /
@@ -495 +504 @@
 
             /* Combine the mono frame into multichannel frame */
-            store_mono_frame(rport->upstream_buf[rport->up_read_pos], 
-                             frame->buf, ch,
+            store_mono_frame((const pj_int16_t*)rport->upstream_buf[rport->up_read_pos], 
+                             (pj_int16_t*)frame->buf, ch,
                              this_port->info.channel_count,
                              port->info.samples_per_frame);
@@ -580 +589 @@
 
     pjmedia_copy_samples(rport->upstream_buf[rport->up_write_pos],
-                         frame->buf, count);
+                         (const pj_int16_t*) frame->buf, count);
     rport->up_write_pos = (rport->up_write_pos+1) % rport->buf_cnt;
 
@@ -622 +631 @@
 
     /* Get the samples from the circular buffer */
-    pjmedia_copy_samples(frame->buf, 
+    pjmedia_copy_samples((pj_int16_t*)frame->buf, 
                          rport->dnstream_buf[rport->dn_read_pos],
                          count);