Changeset 4778 for pjproject/trunk

Timestamp:

Mar 5, 2014 10:16:55 AM (11 years ago)

Author:

bennylp

Message:

Fixed #1743: Unplugging the earpeace while audio is running would cause audio to stop in BB10 10.2.1. This also fix the issue in #1732

File:

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

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

@@ -500 +500 @@
                 if (status.status == SND_PCM_STATUS_READY ||
                     status.status == SND_PCM_STATUS_UNDERRUN ||
-                    status.status == SND_PCM_STATUS_ERROR )
+                    status.status == SND_PCM_STATUS_ERROR ||
+                    status.status == SND_PCM_STATUS_CHANGE)
                 {
                     if (snd_pcm_plugin_prepare (stream->pb_pcm,
@@ -584 +585 @@
                 if (status.status == SND_PCM_STATUS_READY ||
                         status.status == SND_PCM_STATUS_OVERRUN ||
-                        status.status == SND_PCM_STATUS_ERROR)
+                        status.status == SND_PCM_STATUS_ERROR ||
+                        status.status == SND_PCM_STATUS_CHANGE)
                 {
                     if (snd_pcm_plugin_prepare (stream->ca_pcm,
@@ -1035 +1037 @@
 
         /* OS 10.2.1 requires pausing audio stream */
+        /* No longer necessary!
+         * See https://trac.pjsip.org/repos/ticket/1743
+         */
+        need_restart = PJ_FALSE;
+        /*
         need_restart = (stream->pb_thread != NULL);
         if (need_restart) {
@@ -1044 +1051 @@
             }
         }
+        */
 
         route = *((pjmedia_aud_dev_route*)value);