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

talk/app/webrtc/webrtcsdp.cc

 /*
  * libjingle
  * Copyright 2011 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 146 matching lines @@
 static const char kAttributeRtcpFb[] = "rtcp-fb";
 static const char kAttributeSendRecv[] = "sendrecv";
 static const char kAttributeInactive[] = "inactive";
 // draft-ietf-mmusic-sctp-sdp-07
 // a=sctp-port
 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";
 static const char kCandidateSrflx[] = "srflx";
 // TODO: How to map the prflx with circket candidate type
 // static const char kCandidatePrflx[] = "prflx";
 static const char kCandidateRelay[] = "relay";
 static const char kTcpCandidateType[] = "tcptype";
 
 static const char kSdpDelimiterEqual = '=';
@@ skipping 1241 matching lines @@
       os << " " << it->session_params;
     }
     AddLine(os.str(), message);
   }
 
   // RFC 4566
   // a=rtpmap:<payload type> <encoding name>/<clock rate>
   // [/<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,
     // ie the sync_label is set. This extra check is necessary since the
     // MediaContentDescription always contains a streamparam with an ssrc even
     // if no track or media stream have been created.
     if (track->sync_label.empty()) continue;
 
     // Build the ssrc-group lines.
     for (size_t i = 0; i < track->ssrc_groups.size(); ++i) {
@@ skipping 1175 matching lines @@
       } else if (HasAttribute(line, kAttributeXGoogleFlag)) {
         // Experimental attribute.  Conference mode activates more aggressive
         // AEC and NS settings.
         // TODO: expose API to set these directly.
         std::string flag_value;
         if (!GetValue(line, kAttributeXGoogleFlag, &flag_value, error)) {
           return false;
         }
         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.
       LOG(LS_INFO) << "Ignored line: " << line;
       continue;
     }
   }
 
   // Create tracks from the |ssrc_infos|.
   CreateTracksFromSsrcInfos(ssrc_infos, &tracks);
@@ skipping 438 matching lines @@
     UpdateCodec<AudioContentDescription, cricket::AudioCodec>(
         media_desc, payload_type, feedback_param);
   } else if (media_type == cricket::MEDIA_TYPE_VIDEO) {
     UpdateCodec<VideoContentDescription, cricket::VideoCodec>(
         media_desc, payload_type, feedback_param);
   }
   return true;
 }
 
 }  // namespace webrtc