Changeset 3841 for pjproject/trunk/pjmedia/src/pjmedia-audiodev/symb_mda_dev.cpp

Timestamp:

Oct 24, 2011 9:28:13 AM (13 years ago)

Author:

ming

Message:

Re #1395: Backport of PJSIP 1.x branch into PJSIP 2.0 trunk

• Backport of r3557:r3832

TODO: ticket #1268 (Option for automatic/manual sending of RTCP SDES/BYE for the stream) for video stream.

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia-audiodev/symb_mda_dev.cpp (modified) (14 diffs)

pjproject/trunk/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) {
         snd_perror("Error in MaiscOpenComplete()", aError);
         return;
+    }
+
+    /* Apply input volume setting if specified */
+    if (parentStrm_->param.flags & 
+        PJMEDIA_AUD_DEV_CAP_INPUT_VOLUME_SETTING) 
+    {
+        stream_set_cap(&parentStrm_->base,
+                       PJMEDIA_AUD_DEV_CAP_INPUT_VOLUME_SETTING, 
+                       &parentStrm_->param.input_vol);
     }
 
@@ -415 +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;
 }
 
@@ -548 +578 @@
     TInt                     lastError_;
     unsigned                 timestamp_;
+    CActiveSchedulerWait     startAsw_;
 
     CPjAudioOutputEngine(struct mda_stream *parent_strm,
@@ -639 +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
@@ -663 +701 @@
     }
     
+    if (startAsw_.IsStarted()) {
+        startAsw_.AsyncStop();
+    }
+    
     state_ = STATE_INACTIVE;
 }
@@ -668 +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;
@@ -684 +727 @@
                                             iSettings.iChannels);
 
-        // set volume to 1/2th of stream max volume
-        iOutputStream_->SetVolume(iOutputStream_->MaxVolume()/2);
+        /* Apply output volume setting if specified */
+        if (parentStrm_->param.flags & 
+            PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING) 
+        {
+            stream_set_cap(&parentStrm_->base,
+                           PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING, 
+                           &parentStrm_->param.output_vol);
+        } else {
+            // set volume to 1/2th of stream max volume
+            iOutputStream_->SetVolume(iOutputStream_->MaxVolume()/2);
+        }
         
         // set stream priority to normal and time sensitive
@@ -719 +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);
@@ -882 +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;
@@ -956 +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;
@@ -1035 +1105 @@
         break;
     case PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING:
-        if (strm->param.dir & PJMEDIA_DIR_CAPTURE) {
+        if (strm->param.dir & PJMEDIA_DIR_PLAYBACK) {
             PJ_ASSERT_RETURN(strm->out_engine, PJ_EINVAL);