Changeset 2504 for pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp

Timestamp:

Mar 11, 2009 2:52:10 PM (14 years ago)

Author:

nanang

Message:

Fixed Symbian APS auddev that Stop() should wait until initialization completed (if initialization is on progress).

File:

• pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp (modified) (9 diffs)

pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp

@@ -360 +360 @@
     {
         STATE_NULL,
+        STATE_INITIALIZING,
         STATE_READY,
-        STATE_STREAMING
+        STATE_STREAMING,
+        STATE_PENDING_STOP
     };
 
@@ -482 +484 @@
         iWriteCommQ.Close();
     }
+    
+    TRACE_((THIS_FILE, "Sound device destroyed"));
 }
 
 TInt CPjAudioEngine::InitPlayL()
 {
-    if (state_ == STATE_STREAMING || state_ == STATE_READY)
-        return 0;
-
     TInt err = iSession.InitializePlayer(iPlaySettings);
     if (err != KErrNone) {
@@ -518 +519 @@
 TInt CPjAudioEngine::InitRecL()
 {
-    if (state_ == STATE_STREAMING || state_ == STATE_READY)
-        return 0;
-
     // Initialize input stream device
     TInt err = iSession.InitializeRecorder(iRecSettings);
@@ -558 +556 @@
         return StartStreamL();
 
+    PJ_ASSERT_RETURN(state_ == STATE_NULL, PJMEDIA_EAUD_INVOP);
+    
     // Even if only capturer are opened, playback thread of APS Server need
     // to be run(?). Since some messages will be delivered via play comm queue.
+    state_ = STATE_INITIALIZING;
+
     return InitPlayL();
 }
@@ -569 +571 @@
         state_ = STATE_READY;
         TRACE_((THIS_FILE, "Sound device stopped"));
+    } else if (state_ == STATE_INITIALIZING) {
+        // Initialization is on progress, so let's set the state to 
+        // STATE_PENDING_STOP to prevent it starting the stream.
+        state_ = STATE_PENDING_STOP;
+        
+        // Then wait until initialization done.
+        while (state_ != STATE_READY)
+            pj_symbianos_poll(-1, 100);
     }
 }
@@ -596 +606 @@
 TInt CPjAudioEngine::StartStreamL()
 {
-    if (state_ == STATE_STREAMING)
-        return 0;
-
+    pj_assert(state_==STATE_READY || state_==STATE_INITIALIZING); 
+    
     iSession.SetCng(setting_.cng);
     iSession.SetVadMode(setting_.vad);
@@ -619 +628 @@
 
     state_ = STATE_STREAMING;
+    
     return 0;
 }
@@ -626 +636 @@
     TRACE_((THIS_FILE, "Recorder initialized, err=%d", aStatus));
 
-    state_ = STATE_READY;
     if (aStatus == KErrNone) {
-        StartStreamL();
+        // Don't start the stream since Stop() has been requested. 
+        if (state_ != STATE_PENDING_STOP) {
+            StartStreamL();
+        } else {
+            state_ = STATE_READY;
+        }
     }
 }
@@ -638 +652 @@
     if (aStatus == KErrNone) {
         if (parentStrm_->param.dir == PJMEDIA_DIR_PLAYBACK) {
-            state_ = STATE_READY;
-            // Only playback, start directly
-            StartStreamL();
+            // Don't start the stream since Stop() has been requested.
+            if (state_ != STATE_PENDING_STOP) {
+                StartStreamL();
+            } else {
+                state_ = STATE_READY;
+            }
         } else
             InitRecL();