Changeset 3136 for pjproject

Timestamp:

Apr 12, 2010 10:42:23 AM (14 years ago)

Author:

nanang

Message:

Ticket #1055: Fixed possibility of APS server panic in codec detection on few devices, e.g:N95, by adding short delay before closing APS session.

File:

• pjproject/trunk/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp (modified) (5 diffs)

pjproject/trunk/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp

@@ -182 +182 @@
 }
 
+/*
+ * Utility: wait for specified time.
+ */
+static void snd_wait(unsigned ms) 
+{
+    TTime start, now;
+    
+    start.UniversalTime();
+    do {
+        pj_symbianos_poll(-1, ms);
+        now.UniversalTime();
+    } while (now.MicroSecondsFrom(start) < ms * 1000);
+}
+
 typedef void(*PjAudioCallback)(TAPSCommBuffer &buf, void *user_data);
 
@@ -652 +666 @@
 
     if (session_opened) {
-        TTime start, now;
         enum { APS_CLOSE_WAIT_TIME = 200 }; /* in msecs */
         
@@ -658 +671 @@
         // APS server panic KERN-EXEC 0, so let's wait for sometime before
         // closing the client session.
-        start.UniversalTime();
-        do {
-            pj_symbianos_poll(-1, APS_CLOSE_WAIT_TIME);
-            now.UniversalTime();
-        } while (now.MicroSecondsFrom(start) < APS_CLOSE_WAIT_TIME * 1000);
+        snd_wait(APS_CLOSE_WAIT_TIME);
 
         iSession.Close();
@@ -1357 +1366 @@
             if (err == KErrNone)
                 err = iSession.InitializeRecorder(iRecSettings);
+            
+            // On some devices, immediate closing causes APS Server panic,
+            // e.g: N95, so let's just wait for some time before closing.
+            enum { APS_CLOSE_WAIT_TIME = 200 }; /* in msecs */
+            snd_wait(APS_CLOSE_WAIT_TIME);
+            
             iSession.Close();
 
@@ -1366 +1381 @@
                  * let's wait before retrying.
                  */
-                enum { RETRY_WAIT = 3000 }; /* in msecs */
-                TTime start, now;
-                
-                start.UniversalTime();
-                do {
-                    pj_symbianos_poll(-1, RETRY_WAIT);
-                    now.UniversalTime();
-                } while (now.MicroSecondsFrom(start) < RETRY_WAIT * 1000);
+                enum { RETRY_WAIT_TIME = 3000 }; /* in msecs */
+                snd_wait(RETRY_WAIT_TIME);
             } else {
                 /* Seems that this format is not supported */