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

Timestamp:

Jun 30, 2009 1:37:26 PM (15 years ago)

Author:

nanang

Message:

Ticket #909:

• Added new audio device VAS for Symbian platform.
• Updated symsndtest to use the latest audio device framework.

File:

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

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

@@ -18 +18 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
+#include <pjmedia-audiodev/audiodev.h>
 #include <pjmedia/delaybuf.h>
-#include <pjmedia/sound.h>
+#include <pj/assert.h>
 #include <pj/errno.h>
 #include <pj/os.h>
@@ -37 +38 @@
 
 static pj_caching_pool cp;
-static pjmedia_snd_stream *strm;
+static pjmedia_aud_stream *strm;
 static unsigned rec_cnt, play_cnt;
 static pj_time_val t_start;
@@ -86 +87 @@
 
     /* Init sound subsystem */
-    status = pjmedia_snd_init(&cp.factory);
+    status = pjmedia_aud_subsys_init(&cp.factory);
     if (status != PJ_SUCCESS) {
         app_perror("pjmedia_snd_init()", status);
@@ -94 +95 @@
     }
 
-    count = pjmedia_snd_get_dev_count();
+    count = pjmedia_aud_dev_count();
     PJ_LOG(3,(THIS_FILE, "Device count: %d", count));
     for (i=0; i<count; ++i) {
-        const pjmedia_snd_dev_info *info;
-
-        info = pjmedia_snd_get_dev_info(i);
+        pjmedia_aud_dev_info info;
+        pj_status_t status;
+
+        status = pjmedia_aud_dev_get_info(i, &info);
+        pj_assert(status == PJ_SUCCESS);
         PJ_LOG(3, (THIS_FILE, "%d: %s %d/%d %dHz",
-                   i, info->name, info->input_count, info->output_count,
-                   info->default_samples_per_sec));
+                   i, info.name, info.input_count, info.output_count,
+                   info.default_samples_per_sec));
     }
 
@@ -131 +134 @@
 /* Sound capture callback */
 static pj_status_t rec_cb(void *user_data,
-                          pj_uint32_t timestamp,
-                          void *input,
-                          unsigned size)
+                          pjmedia_frame *frame)
 {
     PJ_UNUSED_ARG(user_data);
-    PJ_UNUSED_ARG(timestamp);
-    PJ_UNUSED_ARG(size);
-
-    pjmedia_delay_buf_put(delaybuf, (pj_int16_t*)input);
-
-    if (size != SAMPLES_PER_FRAME*2) {
+
+    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",
-                           size));
+                           frame->size));
     }
 
@@ -152 +151 @@
 /* Play cb */
 static pj_status_t play_cb(void *user_data,
-                           pj_uint32_t timestamp,
-                           void *output,
-                           unsigned size)
+                           pjmedia_frame *frame)
 {
     PJ_UNUSED_ARG(user_data);
-    PJ_UNUSED_ARG(timestamp);
-    PJ_UNUSED_ARG(size);
-
-    pjmedia_delay_buf_get(delaybuf, (pj_int16_t*)output);
+
+    pjmedia_delay_buf_get(delaybuf, (pj_int16_t*)frame->buf);
+    frame->size = SAMPLES_PER_FRAME*2;
+    frame->type = PJMEDIA_FRAME_TYPE_AUDIO;
 
     ++play_cnt;
@@ -169 +166 @@
 static pj_status_t snd_start(unsigned flag)
 {
+    pjmedia_aud_param param;
     pj_status_t status;
 
@@ -176 +174 @@
     }
 
-    if (flag==PJMEDIA_DIR_CAPTURE_PLAYBACK)
-        status = pjmedia_snd_open(-1, -1, CLOCK_RATE, CHANNEL_COUNT,
-                                  SAMPLES_PER_FRAME, BITS_PER_SAMPLE,
-                                  &rec_cb, &play_cb, NULL, &strm);
-    else if (flag==PJMEDIA_DIR_CAPTURE)
-        status = pjmedia_snd_open_rec(-1, CLOCK_RATE, CHANNEL_COUNT,
-                                      SAMPLES_PER_FRAME, BITS_PER_SAMPLE,
-                                      &rec_cb, NULL, &strm);
-    else
-        status = pjmedia_snd_open_player(-1, CLOCK_RATE, CHANNEL_COUNT,
-                                         SAMPLES_PER_FRAME, BITS_PER_SAMPLE,
-                                         &play_cb, NULL, &strm);
-
+    pjmedia_aud_dev_default_param(0, &param);
+    param.channel_count = CHANNEL_COUNT;
+    param.clock_rate = CLOCK_RATE;
+    param.samples_per_frame = SAMPLES_PER_FRAME;
+    param.dir = (pjmedia_dir) flag;
+
+    status = pjmedia_aud_stream_create(&param, &rec_cb, &play_cb, NULL, &strm);
     if (status != PJ_SUCCESS) {
         app_perror("snd open", status);
@@ -199 +191 @@
     pjmedia_delay_buf_reset(delaybuf);
 
-    status = pjmedia_snd_stream_start(strm);
+    status = pjmedia_aud_stream_start(strm);
     if (status != PJ_SUCCESS) {
         app_perror("snd start", status);
-        pjmedia_snd_stream_close(strm);
+        pjmedia_aud_stream_destroy(strm);
         strm = NULL;
         return status;
@@ -221 +213 @@
     }
 
-    status = pjmedia_snd_stream_stop(strm);
+    status = pjmedia_aud_stream_stop(strm);
     if (status != PJ_SUCCESS) {
         app_perror("snd failed to stop", status);
     }
-    status = pjmedia_snd_stream_close(strm);
+    status = pjmedia_aud_stream_destroy(strm);
     strm = NULL;
 
@@ -244 +236 @@
         snd_stop();
 
-    pjmedia_snd_deinit();
+    pjmedia_aud_subsys_shutdown();
     pjmedia_delay_buf_destroy(delaybuf);
     pj_pool_release(pool);