Changeset 3116 for pjproject/trunk/pjsip-apps/src/symsndtest/app_main.cpp

Timestamp:

Mar 4, 2010 3:47:25 PM (14 years ago)

Author:

nanang

Message:

Ticket #1008:

• Applied VAS AMR playback solution from Forum Nokia.
• Fixed AMR playback for VAS and APS in composing DTX/NO_DATA (frame type 15) frame header.
• Modified symbsndtest test application to support non-PCM audio.
• Minor check fix in pjmedia_codec_mgr_destroy(), caught assertion when VAS factory init failed and media endpoint tried to destroy codec manager (codec mgr hasn't been init-ed).

File:

• pjproject/trunk/pjsip-apps/src/symsndtest/app_main.cpp (modified) (5 diffs)

pjproject/trunk/pjsip-apps/src/symsndtest/app_main.cpp

@@ -41 +41 @@
 static unsigned rec_cnt, play_cnt;
 static pj_time_val t_start;
-
-pj_pool_t *pool;
-pjmedia_delay_buf *delaybuf;
+static pjmedia_aud_param param;
+static pj_pool_t *pool;
+static pjmedia_delay_buf *delaybuf;
+static char frame_buf[256];
+
+static void copy_frame_ext(pjmedia_frame_ext *f_dst, 
+                           const pjmedia_frame_ext *f_src) 
+{
+    pj_bzero(f_dst, sizeof(*f_dst));
+    if (f_src->subframe_cnt) {
+        f_dst->base.type = PJMEDIA_FRAME_TYPE_EXTENDED;
+        for (unsigned i = 0; i < f_src->subframe_cnt; ++i) {
+            pjmedia_frame_ext_subframe *sf;
+            sf = pjmedia_frame_ext_get_subframe(f_src, i);
+            pjmedia_frame_ext_append_subframe(f_dst, sf->data, sf->bitlen, 
+                                              param.samples_per_frame);
+        }
+    } else {
+        f_dst->base.type = PJMEDIA_FRAME_TYPE_NONE;
+    }
+}
 
 /* Logging callback */
@@ -138 +156 @@
     PJ_UNUSED_ARG(user_data);
 
-    pjmedia_delay_buf_put(delaybuf, (pj_int16_t*)frame->buf);
-
-    if (frame->size != SAMPLES_PER_FRAME*2) {
-                PJ_LOG(3, (THIS_FILE, "Size captured = %u",
-                           frame->size));
+    if (param.ext_fmt.id == PJMEDIA_FORMAT_PCM) {
+        pjmedia_delay_buf_put(delaybuf, (pj_int16_t*)frame->buf);
+    
+        if (frame->size != SAMPLES_PER_FRAME*2) {
+                    PJ_LOG(3, (THIS_FILE, "Size captured = %u",
+                               frame->size));
+        }
+    } else {
+        pjmedia_frame_ext *f_src = (pjmedia_frame_ext*)frame;
+        pjmedia_frame_ext *f_dst = (pjmedia_frame_ext*)frame_buf;
+        
+        copy_frame_ext(f_dst, f_src);
     }
 
@@ -155 +180 @@
     PJ_UNUSED_ARG(user_data);
 
-    pjmedia_delay_buf_get(delaybuf, (pj_int16_t*)frame->buf);
-    frame->size = SAMPLES_PER_FRAME*2;
-    frame->type = PJMEDIA_FRAME_TYPE_AUDIO;
+    if (param.ext_fmt.id == PJMEDIA_FORMAT_PCM) {
+        pjmedia_delay_buf_get(delaybuf, (pj_int16_t*)frame->buf);
+        frame->size = SAMPLES_PER_FRAME*2;
+        frame->type = PJMEDIA_FRAME_TYPE_AUDIO;
+    } else {
+        pjmedia_frame_ext *f_src = (pjmedia_frame_ext*)frame_buf;
+        pjmedia_frame_ext *f_dst = (pjmedia_frame_ext*)frame;
+
+        copy_frame_ext(f_dst, f_src);
+    }
 
     ++play_cnt;
@@ -166 +198 @@
 static pj_status_t snd_start(unsigned flag)
 {
-    pjmedia_aud_param param;
     pj_status_t status;
 
@@ -179 +210 @@
     param.samples_per_frame = SAMPLES_PER_FRAME;
     param.dir = (pjmedia_dir) flag;
+    param.ext_fmt.id = PJMEDIA_FORMAT_AMR;
+    param.ext_fmt.bitrate = 12200;
+    param.output_route = PJMEDIA_AUD_DEV_ROUTE_LOUDSPEAKER;
 
     status = pjmedia_aud_stream_create(&param, &rec_cb, &play_cb, NULL, &strm);