Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / libjingle / source / talk / media / base / mediachannel.h

diff --git a/src/third_party/libjingle/source/talk/media/base/mediachannel.h b/src/third_party/libjingle/source/talk/media/base/mediachannel.h
index 3759acc..5232e5d 100644 (file)
--- a/src/third_party/libjingle/source/talk/media/base/mediachannel.h
+++ b/src/third_party/libjingle/source/talk/media/base/mediachannel.h
@@ -182,7 +182,7 @@ struct AudioOptions {
     recording_sample_rate.SetFrom(change.recording_sample_rate);
     playout_sample_rate.SetFrom(change.playout_sample_rate);
     dscp.SetFrom(change.dscp);
-    opus_fec.SetFrom(change.opus_fec);
+    combined_audio_video_bwe.SetFrom(change.combined_audio_video_bwe);
   }
 
   bool operator==(const AudioOptions& o) const {
@@ -209,7 +209,7 @@ struct AudioOptions {
         recording_sample_rate == o.recording_sample_rate &&
         playout_sample_rate == o.playout_sample_rate &&
         dscp == o.dscp &&
-        opus_fec == o.opus_fec;
+        combined_audio_video_bwe == o.combined_audio_video_bwe;
   }
 
   std::string ToString() const {
@@ -240,7 +240,7 @@ struct AudioOptions {
     ost << ToStringIfSet("recording_sample_rate", recording_sample_rate);
     ost << ToStringIfSet("playout_sample_rate", playout_sample_rate);
     ost << ToStringIfSet("dscp", dscp);
-    ost << ToStringIfSet("opus_fec", opus_fec);
+    ost << ToStringIfSet("combined_audio_video_bwe", combined_audio_video_bwe);
     ost << "}";
     return ost.str();
   }
@@ -278,8 +278,8 @@ struct AudioOptions {
   Settable<uint32> playout_sample_rate;
   // Set DSCP value for packet sent from audio channel.
   Settable<bool> dscp;
-  // Set Opus FEC
-  Settable<bool> opus_fec;
+  // Enable combined audio+bandwidth BWE.
+  Settable<bool> combined_audio_video_bwe;
 };
 
 // Options that can be applied to a VideoMediaChannel or a VideoMediaEngine.
@@ -334,8 +334,6 @@ struct VideoOptions {
     unsignalled_recv_stream_limit.SetFrom(change.unsignalled_recv_stream_limit);
     use_simulcast_adapter.SetFrom(change.use_simulcast_adapter);
     screencast_min_bitrate.SetFrom(change.screencast_min_bitrate);
-    use_improved_wifi_bandwidth_estimator.SetFrom(
-        change.use_improved_wifi_bandwidth_estimator);
     use_payload_padding.SetFrom(change.use_payload_padding);
   }
 
@@ -372,8 +370,6 @@ struct VideoOptions {
         unsignalled_recv_stream_limit == o.unsignalled_recv_stream_limit &&
         use_simulcast_adapter == o.use_simulcast_adapter &&
         screencast_min_bitrate == o.screencast_min_bitrate &&
-        use_improved_wifi_bandwidth_estimator ==
-            o.use_improved_wifi_bandwidth_estimator &&
         use_payload_padding == o.use_payload_padding;
   }
 
@@ -414,8 +410,6 @@ struct VideoOptions {
                          unsignalled_recv_stream_limit);
     ost << ToStringIfSet("use simulcast adapter", use_simulcast_adapter);
     ost << ToStringIfSet("screencast min bitrate", screencast_min_bitrate);
-    ost << ToStringIfSet("improved wifi bwe",
-                         use_improved_wifi_bandwidth_estimator);
     ost << ToStringIfSet("payload padding", use_payload_padding);
     ost << "}";
     return ost.str();
@@ -488,8 +482,6 @@ struct VideoOptions {
   Settable<bool> use_simulcast_adapter;
   // Force screencast to use a minimum bitrate
   Settable<int> screencast_min_bitrate;
-  // Enable improved bandwidth estiamtor on wifi.
-  Settable<bool> use_improved_wifi_bandwidth_estimator;
   // Enable payload padding.
   Settable<bool> use_payload_padding;
 };