Changeset 3664 for pjproject/trunk/pjsip-apps/src/samples/encdec.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)
• pjsip-apps/src/samples/encdec.c (modified) (6 diffs)

pjproject/trunk/pjsip-apps/src/samples/encdec.c

@@ -138 +138 @@
     /* Alloc codec */
     CHECK( pjmedia_codec_mgr_alloc_codec(cm, pci, &codec) );
-    CHECK( codec->op->init(codec, pool) );
-    CHECK( codec->op->open(codec, &param) );
+    CHECK( pjmedia_codec_init(codec, pool) );
+    CHECK( pjmedia_codec_open(codec, &param) );
     
     for (;;) {
@@ -163 +163 @@
         frm_bit.buf = bitstream;
         frm_bit.size = sizeof(bitstream);
-        CHECK(codec->op->encode(codec, &frm_pcm, sizeof(bitstream), &frm_bit));
+        CHECK(pjmedia_codec_encode(codec, &frm_pcm, sizeof(bitstream), 
+                                   &frm_bit));
 
         /* On DTX, write zero frame to wavout to maintain duration */
@@ -181 +182 @@
         ts.u64 = 0;
         cnt = PJ_ARRAY_SIZE(frames);
-        CHECK( codec->op->parse(codec, bitstream, frm_bit.size, &ts, &cnt, 
-                                frames) );
+        CHECK( pjmedia_codec_parse(codec, bitstream, frm_bit.size, &ts, &cnt, 
+                                   frames) );
         CHECK( (cnt==1 ? PJ_SUCCESS : -1) );
 
@@ -191 +192 @@
         if ((pj_rand() % 100) < (int)lost_pct) {
             /* Simulate loss */
-            CHECK( codec->op->recover(codec, sizeof(pcmbuf), &out_frm) );
+            CHECK( pjmedia_codec_recover(codec, sizeof(pcmbuf), &out_frm) );
             TRACE_((THIS_FILE, "%d.%03d Packet lost", T));
         } else {
             /* Decode */
-            CHECK( codec->op->decode(codec, &frames[0], sizeof(pcmbuf), 
+            CHECK( pjmedia_codec_decode(codec, &frames[0], sizeof(pcmbuf), 
                                      &out_frm) );
         }
@@ -211 +212 @@
 
     /* Close codec */
-    codec->op->close(codec);
+    pjmedia_codec_close(codec);
     pjmedia_codec_mgr_dealloc_codec(cm, codec);
 
@@ -239 +240 @@
 
     /* Register all codecs */
-#if PJMEDIA_HAS_G711_CODEC
-    CHECK( pjmedia_codec_g711_init(mept) );
-#endif
-#if PJMEDIA_HAS_GSM_CODEC
-    CHECK( pjmedia_codec_gsm_init(mept) );
-#endif
-#if PJMEDIA_HAS_ILBC_CODEC
-    CHECK( pjmedia_codec_ilbc_init(mept, 30) );
-#endif
-#if PJMEDIA_HAS_SPEEX_CODEC
-    CHECK( pjmedia_codec_speex_init(mept, 0, 5, 5) );
-#endif
-#if PJMEDIA_HAS_G722_CODEC
-    CHECK( pjmedia_codec_g722_init(mept) );
-#endif
+    CHECK( pjmedia_codec_register_audio_codecs(mept, NULL) );
 
     pj_gettimeofday(&t0);