commit 8f66ddbae3250f71b173f9f5c96c1edf3d4b585f
author Steve Anton <steveanton@webrtc.org> Tue Dec 11 00:08:05 2018
committer Steve Anton <steveanton@webrtc.org> Tue Dec 11 01:14:42 2018
tree 0de5c1c3fcf726510931d124fa49d5829934b3f1
parent 5c72e71e14cfa76a2d1b0979d6b918abe187c208

Move is_unified_plan flag to a member variable

This changes MediaSessionFactory to take the unified plan
configuration option as an explicit setter rathen than a
MediaSessionOptions flag. This is fine since a PeerConnection will
always be in unified plan mode or not, and we know this at
construction.

Bug: None
Change-Id: Ifca45d1d7c9d62b2b41bb879f8665fb39b4cdcd0
Reviewed-on: https://webrtc-review.googlesource.com/c/113824
Reviewed-by: Seth Hampson <shampson@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25960}

pc/mediasession.h

diff --git a/pc/mediasession.h b/pc/mediasession.h
index 9495bdc..13ecf70 100644
--- a/pc/mediasession.h
+++ b/pc/mediasession.h
@@ -93,7 +93,6 @@
   bool vad_enabled = true;  // When disabled, removes all CN codecs from SDP.
   bool rtcp_mux_enabled = true;
   bool bundle_enabled = false;
-  bool is_unified_plan = false;
   bool offer_extmap_allow_mixed = false;
   std::string rtcp_cname = kDefaultRtcpCname;
   webrtc::CryptoOptions crypto_options;
@@ -127,10 +126,10 @@
   void set_audio_rtp_header_extensions(const RtpHeaderExtensions& extensions) {
     audio_rtp_extensions_ = extensions;
   }
-  RtpHeaderExtensions audio_rtp_header_extensions(bool unified_plan) const {
+  RtpHeaderExtensions audio_rtp_header_extensions() const {
     RtpHeaderExtensions extensions = audio_rtp_extensions_;
     // If we are Unified Plan, also offer the MID header extension.
-    if (unified_plan) {
+    if (is_unified_plan_) {
       extensions.push_back(webrtc::RtpExtension(
           webrtc::RtpExtension::kMidUri, webrtc::RtpExtension::kMidDefaultId));
     }
@@ -141,10 +140,10 @@
   void set_video_rtp_header_extensions(const RtpHeaderExtensions& extensions) {
     video_rtp_extensions_ = extensions;
   }
-  RtpHeaderExtensions video_rtp_header_extensions(bool unified_plan) const {
+  RtpHeaderExtensions video_rtp_header_extensions() const {
     RtpHeaderExtensions extensions = video_rtp_extensions_;
     // If we are Unified Plan, also offer the MID header extension.
-    if (unified_plan) {
+    if (is_unified_plan_) {
       extensions.push_back(webrtc::RtpExtension(
           webrtc::RtpExtension::kMidUri, webrtc::RtpExtension::kMidDefaultId));
     }
@@ -159,6 +158,10 @@
     enable_encrypted_rtp_header_extensions_ = enable;
   }
 
+  void set_is_unified_plan(bool is_unified_plan) {
+    is_unified_plan_ = is_unified_plan;
+  }
+
   SessionDescription* CreateOffer(
       const MediaSessionOptions& options,
       const SessionDescription* current_description) const;
@@ -186,7 +189,6 @@
       DataCodecs* data_codecs) const;
   void GetRtpHdrExtsToOffer(
       const std::vector<const ContentInfo*>& current_active_contents,
-      bool is_unified_plan,
       RtpHeaderExtensions* audio_extensions,
       RtpHeaderExtensions* video_extensions) const;
   bool AddTransportOffer(const std::string& content_name,
@@ -284,6 +286,7 @@
 
   void ComputeAudioCodecsIntersectionAndUnion();
 
+  bool is_unified_plan_ = false;
   AudioCodecs audio_send_codecs_;
   AudioCodecs audio_recv_codecs_;
   // Intersection of send and recv.