commit c36b31b78e6115dcc5783f70f9f37cdbd8e2cbed
author nisse <nisse@webrtc.org> Mon Apr 11 23:25:29 2016 -0700
committer Commit bot <commit-bot@chromium.org> Tue Apr 12 06:25:34 2016 +0000
tree 9f54ce4f1ceaeeef875b551b25e94dc06b9107db
parent 9c4fadc1997e99f1ba48408fc4ee8910f4cbcae1

Embed a cricket::MediaConfig in RTCConfiguration.

This eliminates some instances rtc:Optional and makes the code
simpler. No changes in defaults or other behaviour are intended.

BUG=webrtc:4906

Review URL: https://codereview.webrtc.org/1818033002

Cr-Commit-Position: refs/heads/master@{#12326}

webrtc/api/mediaconstraintsinterface.cc

diff --git a/webrtc/api/mediaconstraintsinterface.cc b/webrtc/api/mediaconstraintsinterface.cc
index af25891..a567870 100644
--- a/webrtc/api/mediaconstraintsinterface.cc
+++ b/webrtc/api/mediaconstraintsinterface.cc
@@ -179,29 +179,23 @@
     return;
   }
 
-  bool value;
+  bool enable_ipv6;
   if (FindConstraint(constraints, MediaConstraintsInterface::kEnableIPv6,
-                     &value, nullptr)) {
-    if (!value) {
-      configuration->disable_ipv6 = true;
-    }
+                     &enable_ipv6, nullptr)) {
+    configuration->disable_ipv6 = !enable_ipv6;
   }
-  ConstraintToOptionalBool(constraints, MediaConstraintsInterface::kEnableDscp,
-                           &configuration->enable_dscp);
-  ConstraintToOptionalBool(constraints,
-                           MediaConstraintsInterface::kCpuOveruseDetection,
-                           &configuration->cpu_overuse_detection);
-  if (FindConstraint(constraints,
-                     MediaConstraintsInterface::kEnableRtpDataChannels, &value,
-                     NULL) &&
-      value) {
-    configuration->enable_rtp_data_channel = true;
-  }
+  FindConstraint(constraints, MediaConstraintsInterface::kEnableDscp,
+                 &configuration->media_config.enable_dscp, nullptr);
+  FindConstraint(
+      constraints, MediaConstraintsInterface::kCpuOveruseDetection,
+      &configuration->media_config.video.enable_cpu_overuse_detection, nullptr);
+  FindConstraint(constraints, MediaConstraintsInterface::kEnableRtpDataChannels,
+                 &configuration->enable_rtp_data_channel, nullptr);
   // Find Suspend Below Min Bitrate constraint.
-  ConstraintToOptionalBool(
-      constraints,
-      MediaConstraintsInterface::kEnableVideoSuspendBelowMinBitrate,
-      &configuration->suspend_below_min_bitrate);
+  FindConstraint(constraints,
+                 MediaConstraintsInterface::kEnableVideoSuspendBelowMinBitrate,
+                 &configuration->media_config.video.suspend_below_min_bitrate,
+                 nullptr);
   ConstraintToOptionalInt(constraints,
                           MediaConstraintsInterface::kScreencastMinBitrate,
                           &configuration->screencast_min_bitrate);