Changeset 4151 for pjproject/trunk

Timestamp:

Jun 1, 2012 4:49:57 AM (12 years ago)

Author:

ming

Message:

Re #1521: minor fixes to BB10 dev.

File:

• pjproject/trunk/pjmedia/src/pjmedia-audiodev/bb10_dev.c (modified) (6 diffs)

pjproject/trunk/pjmedia/src/pjmedia-audiodev/bb10_dev.c

@@ -20 +20 @@
 /*
  * This is the implementation of BlackBerry 10 (BB10) audio device.
- * Original code was kindly donated by Truphone Ltd.
+ * Original code was kindly donated by Truphone Ltd. (http://www.truphone.com)
  * The key methods here are bb10_capture_open, bb10_play_open together
  * with the capture and play threads ca_thread_func and pb_thread_func
@@ -568 +568 @@
     snd_pcm_channel_setup_t setup;
     snd_mixer_group_t group;
+    snd_pcm_channel_params_t pp;
     unsigned int rate;
     unsigned long tmp_buf_size;
@@ -590 +591 @@
     }
 
-    snd_pcm_channel_params_t pp;
     memset (&pp, 0, sizeof (pp));
 
@@ -607 +607 @@
     pp.format.interleave = 1;
     /* HARD CODE for the time being PJMEDIA expects 16khz */
-    PJ_TODO(REMOVE_SAMPLE_RATE_HARD_CODE);    
+    PJ_TODO(REMOVE_SAMPLE_RATE_HARD_CODE);
+    pj_assert(param->clock_rate == VOIP_SAMPLE_RATE * 2);
     pp.format.rate = VOIP_SAMPLE_RATE*2;
     pp.format.voices = 1;
@@ -713 +714 @@
     /* HARD CODE for the time being PJMEDIA expects 16khz */
     PJ_TODO(REMOVE_SAMPLE_RATE_HARD_CODE);
+    pj_assert(param->clock_rate == VOIP_SAMPLE_RATE * 2);
     pp.format.rate = VOIP_SAMPLE_RATE*2;
     pp.format.voices = 1;
@@ -956 +958 @@
     bb10_stream_stop (s);
 
-    if (stream->param.dir & PJMEDIA_DIR_PLAYBACK) {
-        /*
-        snd_mixer_close (stream->pb_mixer);
-        snd_pcm_close (stream->pb_pcm);
-        stream->pb_mixer = NULL;
-        stream->pb_pcm = NULL;
-        */
-    }
-    if (stream->param.dir & PJMEDIA_DIR_CAPTURE) {
-        /*
-        snd_mixer_close (stream->ca_mixer);
-        snd_pcm_close (stream->ca_pcm);
-        stream->ca_mixer = NULL;
-        stream->ca_pcm = NULL;
-        */
-    }
-
     pj_pool_release (stream->pool);