Changeset 3664 for pjproject/trunk/pjmedia/src/test/mips_test.c

Timestamp:

Jul 19, 2011 3:42:28 AM (13 years ago)

Author:

nanang

Message:

Re #1326: Initial code integration from branch 2.0-dev to trunk as "2.0-pre-alpha-svn".

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjmedia/src/test/mips_test.c (modified) (11 diffs)

pjproject/trunk/pjmedia/src/test/mips_test.c

@@ -685 +685 @@
 
 static pj_status_t codec_put_frame(struct pjmedia_port *this_port, 
-                                   const pjmedia_frame *frame)
+                                   pjmedia_frame *frame)
 {
     struct codec_port *cp = (struct codec_port*)this_port;
@@ -693 +693 @@
     out_frame.buf = cp->pkt;
     out_frame.size = sizeof(cp->pkt);
-    status = cp->codec->op->encode(cp->codec, frame, sizeof(cp->pkt),
-                                   &out_frame);
+    status = pjmedia_codec_encode(cp->codec, frame, sizeof(cp->pkt),
+                                  &out_frame);
     pj_assert(status == PJ_SUCCESS);
 
@@ -702 +702 @@
         unsigned i;
 
-        status = cp->codec->op->parse(cp->codec, out_frame.buf, 
-                                      out_frame.size, &out_frame.timestamp,
-                                      &frame_cnt, parsed_frm);
+        status = pjmedia_codec_parse(cp->codec, out_frame.buf, 
+                                     out_frame.size, &out_frame.timestamp,
+                                     &frame_cnt, parsed_frm);
         pj_assert(status == PJ_SUCCESS);
         
@@ -710 +710 @@
             pcm_frm.buf = cp->pcm;
             pcm_frm.size = sizeof(cp->pkt);
-            status = cp->codec->op->decode(cp->codec, &parsed_frm[i], 
-                                           sizeof(cp->pcm), &pcm_frm);
+            status = pjmedia_codec_decode(cp->codec, &parsed_frm[i], 
+                                          sizeof(cp->pcm), &pcm_frm);
             pj_assert(status == PJ_SUCCESS);
         }
@@ -723 +723 @@
     struct codec_port *cp = (struct codec_port*)this_port;
 
-    cp->codec->op->close(cp->codec);
+    pjmedia_codec_close(cp->codec);
     pjmedia_codec_mgr_dealloc_codec(pjmedia_endpt_get_codec_mgr(cp->endpt),
                                     cp->codec);
@@ -783 +783 @@
         return NULL;
 
-    status = (*cp->codec->op->init)(cp->codec, pool);
+    status = pjmedia_codec_init(cp->codec, pool);
     if (status != PJ_SUCCESS)
         return NULL;
 
-    status = cp->codec->op->open(cp->codec, &codec_param);
+    status = pjmedia_codec_open(cp->codec, &codec_param);
     if (status != PJ_SUCCESS)
         return NULL;
@@ -1132 +1132 @@
 
     while (pjmedia_circ_buf_get_len(wp->circbuf) <
-                wp->base.info.samples_per_frame * (CIRC_BUF_FRAME_CNT-1))
+                PJMEDIA_PIA_SPF(&wp->base.info) * (CIRC_BUF_FRAME_CNT-1))
     {
         status = pjmedia_port_get_frame(wp->gen_port, frame);
@@ -1138 +1138 @@
 
         status = pjmedia_circ_buf_write(wp->circbuf, (short*)frame->buf, 
-                                        wp->base.info.samples_per_frame);
+                                        PJMEDIA_PIA_SPF(&wp->base.info));
         pj_assert(status==PJ_SUCCESS);
     }
@@ -1150 +1150 @@
                                           &reg2, &reg2_len);
 
-        del_cnt = wp->base.info.samples_per_frame;
+        del_cnt = PJMEDIA_PIA_SPF(&wp->base.info);
         status = pjmedia_wsola_discard(wp->wsola, reg1, reg1_len, reg2, 
                                        reg2_len, &del_cnt);
@@ -2011 +2011 @@
 
 static pj_status_t delaybuf_put_frame(struct pjmedia_port *this_port, 
-                                      const pjmedia_frame *frame)
+                                      pjmedia_frame *frame)
 {
     struct delaybuf_port *dp = (struct delaybuf_port*)this_port;
@@ -2220 +2220 @@
 
     /* Port may decide to use different ptime (e.g. iLBC) */
-    samples_per_frame = port->info.samples_per_frame;
+    samples_per_frame = PJMEDIA_PIA_SPF(&port->info);
 
     gen_port = create_gen_port(pool, clock_rate, 1,