Changeset 3664 for pjproject/trunk/pjmedia/src/test/codec_vectors.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/codec_vectors.c (modified) (10 diffs)

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

@@ -74 +74 @@
     codec_param.setting.vad = 0;
 
-    status = codec->op->init(codec, pool);
+    status = pjmedia_codec_init(codec, pool);
     if (status != PJ_SUCCESS) {
         rc = -60;
@@ -80 +80 @@
     }
 
-    status = codec->op->open(codec, &codec_param);
+    status = pjmedia_codec_open(codec, &codec_param);
     if (status != PJ_SUCCESS) {
         rc = -70;
@@ -118 +118 @@
 
         out_frame.size = samples_per_frame;
-        status = codec->op->encode(codec, &in_frame, samples_per_frame,
+        status = pjmedia_codec_encode(codec, &in_frame, samples_per_frame,
                                    &out_frame);
         if (status != PJ_SUCCESS) {
@@ -189 +189 @@
 
     if (codec) {
-        codec->op->close(codec);
+        pjmedia_codec_close(codec);
         pjmedia_codec_mgr_dealloc_codec(mgr, codec);
     }
@@ -327 +327 @@
     codec_param.setting.vad = 0;
 
-    status = codec->op->init(codec, pool);
+    status = pjmedia_codec_init(codec, pool);
     if (status != PJ_SUCCESS) {
         rc = -60;
@@ -333 +333 @@
     }
 
-    status = codec->op->open(codec, &codec_param);
+    status = pjmedia_codec_open(codec, &codec_param);
     if (status != PJ_SUCCESS) {
         rc = -70;
@@ -388 +388 @@
         if (has_frame) {
             count = 2;
-            if (codec->op->parse(codec, pkt, encoded_len, &ts, 
-                                 &count, in_frame) != PJ_SUCCESS) 
+            if (pjmedia_codec_parse(codec, pkt, encoded_len, &ts, 
+                                    &count, in_frame) != PJ_SUCCESS) 
             {
                 rc = -100;
@@ -400 +400 @@
             }
 
-            if (codec->op->decode(codec, &in_frame[0], samples_per_frame*2, 
-                                  &out_frame) != PJ_SUCCESS) 
+            if (pjmedia_codec_decode(codec, &in_frame[0], samples_per_frame*2,
+                                     &out_frame) != PJ_SUCCESS) 
             {
                 rc = -120;
@@ -407 +407 @@
             }
         } else {
-            if (codec->op->recover(codec, samples_per_frame*2, 
-                                   &out_frame) != PJ_SUCCESS)
+            if (pjmedia_codec_recover(codec, samples_per_frame*2, 
+                                      &out_frame) != PJ_SUCCESS)
             {
                 rc = -125;
@@ -484 +484 @@
 
     if (codec) {
-        codec->op->close(codec);
+        pjmedia_codec_close(codec);
         pjmedia_codec_mgr_dealloc_codec(mgr, codec);
     }