Bug 884071 Signaling - stop setting video prefs when in SDP mode r=jesup
authorEthan Hugg <ethanhugg@gmail.com>
Sat, 22 Jun 2013 19:59:25 -0700
changeset 136216 d3f627a6273e6fa31ead86505060e9834f065e06
parent 136215 a0dfe6abef7391aaa7d828cfd3ec63e36ffc2c0f
child 136217 79194143ec895d32320c20076ebbf6fad779076d
push id24867
push useremorley@mozilla.com
push dateMon, 24 Jun 2013 12:35:17 +0000
treeherdermozilla-central@7edda78eca8b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup
bugs884071
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 884071 Signaling - stop setting video prefs when in SDP mode r=jesup
media/webrtc/signaling/src/sipcc/core/ccapp/ccprovider.c
--- a/media/webrtc/signaling/src/sipcc/core/ccapp/ccprovider.c
+++ b/media/webrtc/signaling/src/sipcc/core/ccapp/ccprovider.c
@@ -626,23 +626,30 @@ processSessionEvent (line_t line_id, cal
     int instance = line_id;
     boolean incoming = FALSE;
     session_data_t * sess_data_p;
     char digits[CC_MAX_DIALSTRING_LEN];
     char* data = (char*)ccData.info;
     char* data1 =(char*)ccData.info1;
     long strtol_result;
     char *strtol_end;
+    int sdpmode = 0;
 
     CCAPP_DEBUG(DEB_L_C_F_PREFIX"event=%d data=%s",
                 DEB_L_C_F_PREFIX_ARGS(SIP_CC_PROV, call_id, line_id, fname), event,
                 ((event == CC_FEATURE_KEYPRESS) ? "..." : data));
 
     memset(&featdata, 0, sizeof(cc_feature_data_t));
-    updateVideoPref(event, line_id, call_id, video_pref);
+
+
+    config_get_value(CFGID_SDPMODE, &sdpmode, sizeof(sdpmode));
+    if (!sdpmode) {
+        updateVideoPref(event, line_id, call_id, video_pref);
+    }
+
     switch(event) {
          case CC_FEATURE_ONHOOK:
              getLineIdAndCallId(&line_id, &call_id);
              CCAPP_DEBUG(DEB_F_PREFIX"CC_FEATURE_ONHOOK = %s", DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname), data);
              cc_onhook_ext(CC_SRC_UI, call_id, line_id, FALSE,
                          (data && (strncasecmp(data, "ACTIVECALLS", sizeof("ACTIVECALLS")) == 0))?
                              CC_REASON_ACTIVECALL_LIST: CC_REASON_NULL );
 	     break;