Changeset 3841 for pjproject/trunk/pjmedia/src/pjmedia-audiodev/symb_vas_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_vas_dev.cpp (modified) (4 diffs)

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

@@ -1131 +1131 @@
                 } else {
                     enum {NO_DATA_FT = 15 };
-                    pj_uint8_t amr_header = 4 || (NO_DATA_FT << 3);
+                    pj_uint8_t amr_header = 4 | (NO_DATA_FT << 3);
 
                     buffer.Append(amr_header);
@@ -1140 +1140 @@
             } else { /* PJMEDIA_FRAME_TYPE_NONE */
                 enum {NO_DATA_FT = 15 };
-                pj_uint8_t amr_header = 4 || (NO_DATA_FT << 3);
+                pj_uint8_t amr_header = 4 | (NO_DATA_FT << 3);
 
                 buffer.Append(amr_header);
@@ -1747 +1747 @@
     }
 
-    /* Apply output volume setting if specified */
-    if (param->flags & PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING) {
-        stream_set_cap(&strm->base, PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING, 
-                       &param->output_vol);
-    }
-
     /* Done */
     strm->base.op = &stream_op;
@@ -1946 +1940 @@
                  (now.MicroSecondsFrom(start) < VAS_WAIT_START * 1000));
         
-        if (stream->engine->IsStarted())
+        if (stream->engine->IsStarted()) {
+            
+            /* Apply output volume setting if specified */
+            if (stream->param.flags & 
+                PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING) 
+            {
+                stream_set_cap(strm,
+                               PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING, 
+                               &stream->param.output_vol);
+            }
+
             return PJ_SUCCESS;
-        else
+        } else {
             return PJ_ETIMEDOUT;
+        }
     }