Refactor the relationship between BaseChannel and MediaChannel so that we send over all the paramet…

talk/app/webrtc/webrtcsdp.cc

Index: talk/app/webrtc/webrtcsdp.cc
diff --git a/talk/app/webrtc/webrtcsdp.cc b/talk/app/webrtc/webrtcsdp.cc
index b6f23ca9d00577e9ae7e4834bd128a8efbecdd0e..3b30e79798799027f30f383eb692be315160607d 100644
--- a/talk/app/webrtc/webrtcsdp.cc
+++ b/talk/app/webrtc/webrtcsdp.cc
@@ -164,8 +164,6 @@ static const char kAttributeSctpPort[] = "sctp-port";
 // Experimental flags
 static const char kAttributeXGoogleFlag[] = "x-google-flag";
 static const char kValueConference[] = "conference";
-static const char kAttributeXGoogleBufferLatency[] =

[pbos-webrtc, 2015/07/12 15:56:08]

Part of different CL right?

[pthatcher1, 2015/07/13 22:58:27]

Yeah, I merged that CL into this one.  It will be submitted first, though.

-    "x-google-buffer-latency";
 
 // Candidate
 static const char kCandidateHost[] = "host";
@@ -1427,15 +1425,6 @@ void BuildRtpContentAttributes(
   // [/<encodingparameters>]
   BuildRtpMap(media_desc, media_type, message);
 
-  // Specify latency for buffered mode.
-  // a=x-google-buffer-latency:<value>
-  if (media_desc->buffered_mode_latency() != cricket::kBufferedModeDisabled) {
-    std::ostringstream os;
-    InitAttrLine(kAttributeXGoogleBufferLatency, &os);
-    os << kSdpDelimiterColon << media_desc->buffered_mode_latency();
-    AddLine(os.str(), message);
-  }
-
   for (StreamParamsVec::const_iterator track = media_desc->streams().begin();
        track != media_desc->streams().end(); ++track) {
     // Require that the track belongs to a media stream,
@@ -2631,22 +2620,6 @@ bool ParseContent(const std::string& message,
         }
         if (flag_value.compare(kValueConference) == 0)
           media_desc->set_conference_mode(true);
-      } else if (HasAttribute(line, kAttributeXGoogleBufferLatency)) {
-        // Experimental attribute.
-        // TODO: expose API to set this directly.
-        std::string flag_value;
-        if (!GetValue(line, kAttributeXGoogleBufferLatency, &flag_value,
-                      error)) {
-          return false;
-        }
-        int buffer_latency = 0;
-        if (!GetValueFromString(line, flag_value, &buffer_latency, error)) {
-          return false;
-        }
-        if (buffer_latency < 0) {
-          return ParseFailed(line, "Buffer latency less than 0.", error);
-        }
-        media_desc->set_buffered_mode_latency(buffer_latency);
       }
     } else {
       // Only parse lines that we are interested of.