Changeset 3748 for pjproject

Timestamp:

Sep 9, 2011 9:51:10 AM (13 years ago)

Author:

nanang

Message:

More Symbian MDA fixes (re #1365):

• Added config setting to control sync/async start. Due to problem with async start: any volume query performed immediately after starting the device will always return zero.
• Fixed get_default_param() to set the flags to zero (was copied from caps, i.e: input/output volume flags without setting the value).
• Fixed stream_get_param() to also check the input and output volume level.

Location:

pjproject/branches/1.x/pjmedia

Files:

• include/pjmedia-audiodev/config.h (modified) (1 diff)
• src/pjmedia-audiodev/symb_mda_dev.cpp (modified) (13 diffs)

pjproject/branches/1.x/pjmedia/include/pjmedia-audiodev/config.h

@@ -146 +146 @@
 
 /**
+ * This setting controls whether the Symbian audio with built-in multimedia
+ * framework backend should be started synchronously. Note that synchronous
+ * start will block the application/UI, e.g: about 40ms for each direction
+ * on N95. While asynchronous start may cause invalid value (always zero)
+ * returned in input/output volume query, if the query is performed when
+ * the internal start procedure is not completely finished.
+ * 
+ * Default: 1 (yes)
+ */
+#ifndef PJMEDIA_AUDIO_DEV_MDA_USE_SYNC_START
+#   define PJMEDIA_AUDIO_DEV_MDA_USE_SYNC_START 1
+#endif
+
+
+/**
  * This setting controls whether the Audio Device API should support
  * device implementation that is based on the old sound device API

pjproject/branches/1.x/pjmedia/src/pjmedia-audiodev/symb_mda_dev.cpp

@@ -240 +240 @@
     TInt                     lastError_;
     pj_uint32_t              timeStamp_;
+    CActiveSchedulerWait     startAsw_;
 
     // cache variable
@@ -364 +365 @@
     iInputStream_->Open(&iStreamSettings);
     
+#if defined(PJMEDIA_AUDIO_DEV_MDA_USE_SYNC_START) && \
+    PJMEDIA_AUDIO_DEV_MDA_USE_SYNC_START != 0
+    
+    startAsw_.Start();
+    
+#endif
+    
     // Success
     PJ_LOG(4,(THIS_FILE, "Sound capture started."));
@@ -387 +395 @@
     }
     
+    if (startAsw_.IsStarted()) {
+        startAsw_.AsyncStop();
+    }
+    
     state_ = STATE_INACTIVE;
 }
@@ -400 +412 @@
 void CPjAudioInputEngine::MaiscOpenComplete(TInt aError)
 {
+    if (startAsw_.IsStarted()) {
+        startAsw_.AsyncStop();
+    }
+    
     lastError_ = aError;
     if (aError != KErrNone) {
@@ -406 +422 @@
     }
 
-    /* Apply output volume setting if specified */
+    /* Apply input volume setting if specified */
     if (parentStrm_->param.flags & 
         PJMEDIA_AUD_DEV_CAP_INPUT_VOLUME_SETTING) 
@@ -424 +440 @@
     if (err2) {
         PJ_LOG(4,(THIS_FILE, "Exception in iInputStream_->ReadL()"));
-    }
+        lastError_ = err2;
+        return;
+    }
+
+    // input stream opened succesfully, set status to Active
+    state_ = STATE_ACTIVE;
 }
 
@@ -557 +578 @@
     TInt                     lastError_;
     unsigned                 timestamp_;
+    CActiveSchedulerWait     startAsw_;
 
     CPjAudioOutputEngine(struct mda_stream *parent_strm,
@@ -648 +670 @@
     lastError_ = KRequestPending;
     iOutputStream_->Open(&iStreamSettings);
+    
+#if defined(PJMEDIA_AUDIO_DEV_MDA_USE_SYNC_START) && \
+    PJMEDIA_AUDIO_DEV_MDA_USE_SYNC_START != 0
+    
+    startAsw_.Start();
+    
+#endif
 
     // Success
@@ -672 +701 @@
     }
     
+    if (startAsw_.IsStarted()) {
+        startAsw_.AsyncStop();
+    }
+    
     state_ = STATE_INACTIVE;
 }
@@ -677 +710 @@
 void CPjAudioOutputEngine::MaoscOpenComplete(TInt aError)
 {
+    if (startAsw_.IsStarted()) {
+        startAsw_.AsyncStop();
+    }
+
     lastError_ = aError;
     
     if (aError==KErrNone) {
-        // output stream opened succesfully, set status to Active
-        state_ = STATE_ACTIVE;
-
         // set stream properties, 16bit 8KHz mono
         TMdaAudioDataSettings iSettings;
@@ -737 +771 @@
         frame_.Set(frameBuf_, frameBufSize_);
         iOutputStream_->WriteL(frame_);
+
+        // output stream opened succesfully, set status to Active
+        state_ = STATE_ACTIVE;
     } else {
         snd_perror("Error in MaoscOpenComplete()", aError);
@@ -900 +937 @@
     param->samples_per_frame = af->dev_info.default_samples_per_sec * 20 / 1000;
     param->bits_per_sample = BITS_PER_SAMPLE;
-    param->flags = af->dev_info.caps;
+    // Don't set the flags without specifying the flags value.
+    //param->flags = af->dev_info.caps;
 
     return PJ_SUCCESS;
@@ -974 +1012 @@
 
     pj_memcpy(pi, &strm->param, sizeof(*pi));
+    
+    /* Update the output volume setting */
+    if (stream_get_cap(s, PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING,
+                       &pi->output_vol) == PJ_SUCCESS)
+    {
+        pi->flags |= PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING;
+    }
+    
+    /* Update the input volume setting */
+    if (stream_get_cap(s, PJMEDIA_AUD_DEV_CAP_INPUT_VOLUME_SETTING,
+                       &pi->input_vol) == PJ_SUCCESS)
+    {
+        pi->flags |= PJMEDIA_AUD_DEV_CAP_INPUT_VOLUME_SETTING;
+    }
     
     return PJ_SUCCESS;