Changeset 4730

Timestamp:

Feb 4, 2014 1:24:28 PM (11 years ago)

Author:

bennylp

Message:

Fixed #1732: Error setting audio output route in BlackBerry? 10 (BB10) version 10.2.1

File:

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

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

@@ -455 +455 @@
                                          SND_PCM_CHANNEL_PLAYBACK)) < 0)
     {
-        close_play_pcm(stream);
         TRACE_((THIS_FILE, "pb_thread_func failed prepare = %d", result));
         return PJ_SUCCESS;
@@ -516 +515 @@
 
     flush_play(stream);
-    close_play_pcm(stream);
     TRACE_((THIS_FILE, "pb_thread_func: Stopped"));
 
@@ -551 +549 @@
                                           SND_PCM_CHANNEL_CAPTURE)) < 0)
     {
-        close_capture_pcm(stream);
         TRACE_((THIS_FILE, "ca_thread_func failed prepare = %d", result));
         return PJ_SUCCESS;
@@ -617 +614 @@
 
     flush_capture(stream);
-    close_capture_pcm(stream);
     TRACE_((THIS_FILE, "ca_thread_func: Stopped"));
 
@@ -1033 +1029 @@
     {
         pjmedia_aud_dev_route route;
+        pj_bool_t need_restart;
         pj_status_t ret;
 
         PJ_ASSERT_RETURN(value, PJ_EINVAL);
 
+        /* OS 10.2.1 requires pausing audio stream */
+        need_restart = (stream->pb_thread != NULL);
+        if (need_restart) {
+            PJ_LOG(4,(THIS_FILE, "pausing audio stream.."));
+            ret = bb10_stream_stop(strm);
+            if (ret != PJ_SUCCESS) {
+                PJ_PERROR(1,(THIS_FILE, ret, "Error pausing stream"));
+                return ret;
+            }
+        }
+
         route = *((pjmedia_aud_dev_route*)value);
+        PJ_LOG(4,(THIS_FILE, "setting audio route to %d..", route));
+
         /* Use the initialization function which lazy-inits the
          * handle for routing
@@ -1046 +1056 @@
             ret = bb10_initialize_playback_ctrl(stream,false);
         }
+
+        if (need_restart) {
+            PJ_LOG(4,(THIS_FILE, "resuming audio stream.."));
+            ret = bb10_stream_start(strm);
+            if (ret != PJ_SUCCESS) {
+                PJ_PERROR(1,(THIS_FILE, ret, "Error resuming stream"));
+            }
+        }
+
         return ret;
 
@@ -1130 +1149 @@
     bb10_stream_stop (s);
 
+    close_play_pcm(stream);
+    close_capture_pcm(stream);
+
     pj_pool_release (stream->pool);