Changeset 159 for pjproject/trunk/pjmedia/src/test/audio_tool.c

Timestamp:

Feb 8, 2006 10:43:39 PM (18 years ago)

Author:

bennylp

Message:

Finished new pjmedia rewrite

File:

• pjproject/trunk/pjmedia/src/test/audio_tool.c (modified) (11 diffs)

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

@@ -27 +27 @@
 static FILE *fhnd;
 static pj_med_mgr_t *mm;
-static pj_codec *codec;
-static pj_codec_attr cattr;
+static pjmedia_codec *codec;
+static pjmedia_codec_param cattr;
 
 
@@ -61 +61 @@
 {
     char pkt[160];
-    struct pj_audio_frame in, out;
+    struct pjmedia_frame in, out;
     int frmsz = cattr.avg_bps / 8 * cattr.ptime / 1000;
 
@@ -68 +68 @@
         return -1;
     } else {
-        in.type = PJ_AUDIO_FRAME_AUDIO;
+        in.type = PJMEDIA_FRAME_TYPE_AUDIO;
         in.buf = pkt;
         in.size = frmsz;
@@ -86 +86 @@
 {
     char pkt[160];
-    struct pj_audio_frame in, out;
+    struct pjmedia_frame in, out;
     //int frmsz = cattr.avg_bps / 8 * cattr.ptime / 1000;
 
@@ -93 +93 @@
 #endif
 
-    in.type = PJ_AUDIO_FRAME_AUDIO;
+    in.type = PJMEDIA_FRAME_TYPE_AUDIO;
     in.buf = (void*)frame;
     in.size = size;
@@ -108 +108 @@
 static pj_status_t init()
 {
-    pj_codec_mgr *cm;
-    pj_codec_id id;
+    pjmedia_codec_mgr *cm;
+    pjmedia_codec_info id;
     int i;
 
@@ -130 +130 @@
     cm = pj_med_mgr_get_codec_mgr (mm);
 
-    id.type = PJ_MEDIA_TYPE_AUDIO;
+    id.type = PJMEDIA_TYPE_AUDIO;
     id.pt = 0;
     id.encoding_name = pj_str("PCMU");
     id.sample_rate = 8000;
 
-    codec = pj_codec_mgr_alloc_codec (cm, &id);
+    codec = pjmedia_codec_mgr_alloc_codec (cm, &id);
     codec->op->default_attr(codec, &cattr);
     codec->op->open(codec, &cattr);
@@ -143 +143 @@
 static pj_status_t deinit()
 {
-    pj_codec_mgr *cm;
+    pjmedia_codec_mgr *cm;
     cm = pj_med_mgr_get_codec_mgr (mm);
     codec->op->close(codec);
-    pj_codec_mgr_dealloc_codec (cm, codec);
+    pjmedia_codec_mgr_dealloc_codec (cm, codec);
     pj_med_mgr_destroy (mm);
     pj_caching_pool_destroy(&caching_pool);
@@ -301 +301 @@
 
         switch (info[i]->dir) {
-        case PJ_MEDIA_DIR_NONE:
+        case PJMEDIA_DIR_NONE:
             dir = "- NONE -"; break;
-        case PJ_MEDIA_DIR_ENCODING:
+        case PJMEDIA_DIR_ENCODING:
             dir = "SENDONLY"; break;
-        case PJ_MEDIA_DIR_DECODING:
+        case PJMEDIA_DIR_DECODING:
             dir = "RECVONLY"; break;
-        case PJ_MEDIA_DIR_ENCODING_DECODING:
+        case PJMEDIA_DIR_ENCODING_DECODING:
             dir = "SENDRECV"; break;
         default:
@@ -346 +346 @@
     char pcm[320];
     char frame[160];
-    struct pj_audio_frame in, out;
+    struct pjmedia_frame in, out;
 
     fhnd_pcm = fopen(src, "rb");
@@ -357 +357 @@
     while (fread(pcm, 320, 1, fhnd_pcm) == 1) {
 
-        in.type = PJ_AUDIO_FRAME_AUDIO;
+        in.type = PJMEDIA_FRAME_TYPE_AUDIO;
         in.buf = pcm;
         in.size = 320;