Enable setting the maximum bitrate limit in RtpSender.

webrtc/pc/channel.cc

 /*
  *  Copyright 2004 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 1371 matching lines @@
 
 void VoiceChannel::SetRawAudioSink(
     uint32_t ssrc,
     rtc::scoped_ptr<webrtc::AudioSinkInterface> sink) {
   // We need to work around Bind's lack of support for scoped_ptr and ownership
   // passing.  So we invoke to our own little routine that gets a pointer to
   // our local variable.  This is OK since we're synchronously invoking.
   InvokeOnWorker(Bind(&SetRawAudioSink_w, media_channel(), ssrc, &sink));
 }
 
+webrtc::RTCRtpParameters VoiceChannel::GetRtpParameters(uint32_t ssrc) {
+  webrtc::RTCRtpParameters parameters;
+  InvokeOnWorker(
+      Bind(&VoiceChannel::GetRtpParameters_w, this, ssrc, &parameters));
+  return parameters;
+}
+
+bool VoiceChannel::GetRtpParameters_w(uint32_t ssrc,
+                                      webrtc::RTCRtpParameters* parameters) {
+  *parameters = media_channel()->GetRtpParameters(ssrc);
+  return true;

[pthatcher1, 2016/03/12 01:21:04]

Just make it a void if it can't fail.

[skvlad, 2016/03/15 21:18:18]

For some reason I saw the definition of InvokeOnWorker and thought that only
methods that return bool are supported; I was blind to the existence of the
underlying thread::Invoke<T> method.
Fixed.

+}
+
+bool VoiceChannel::SetRtpParameters(
+    uint32_t ssrc,
+    const webrtc::RTCRtpParameters& parameters) {
+  return InvokeOnWorker(
+      Bind(&VoiceChannel::SetRtpParameters_w, this, ssrc, parameters));
+}
+
+bool VoiceChannel::SetRtpParameters_w(uint32_t ssrc,
+                                      webrtc::RTCRtpParameters parameters) {
+  return media_channel()->SetRtpParameters(ssrc, parameters);
+}
+
 bool VoiceChannel::GetStats(VoiceMediaInfo* stats) {
   return InvokeOnWorker(Bind(&VoiceMediaChannel::GetStats,
                              media_channel(), stats));
 }
 
 void VoiceChannel::StartMediaMonitor(int cms) {
   media_monitor_.reset(new VoiceMediaMonitor(media_channel(), worker_thread(),
       rtc::Thread::Current()));
   media_monitor_->SignalUpdate.connect(
       this, &VoiceChannel::OnMediaMonitorUpdate);
@@ skipping 135 matching lines @@
 
   if (!SetRtpTransportParameters_w(content, action, CS_REMOTE, error_desc)) {
     return false;
   }
 
   AudioSendParameters send_params = last_send_params_;
   RtpSendParametersFromMediaDescription(audio, &send_params);
   if (audio->agc_minus_10db()) {
     send_params.options.adjust_agc_delta = rtc::Optional<int>(kAgcMinus10db);
   }
-  if (!media_channel()->SetSendParameters(send_params)) {
+
+  bool parameters_applied = ApplySendParameters(send_params);
+  if (!parameters_applied) {
     SafeSetError("Failed to set remote audio description send parameters.",
                  error_desc);
     return false;
   }
   last_send_params_ = send_params;
 
   // TODO(pthatcher): Move remote streams into AudioRecvParameters,
   // and only give it to the media channel once we have a local
   // description too (without a local description, we won't be able to
   // recv them anyway).
   if (!UpdateRemoteStreams_w(audio->streams(), action, error_desc)) {
     SafeSetError("Failed to set remote audio description streams.", error_desc);
     return false;
   }
 
   if (audio->rtp_header_extensions_set()) {
     MaybeCacheRtpAbsSendTimeHeaderExtension(audio->rtp_header_extensions());
   }
 
   set_remote_content_direction(content->direction());
   ChangeState();
   return true;
 }
 
+bool VoiceChannel::ApplySendParameters(const AudioSendParameters& parameters) {
+  return media_channel()->SetSendParameters(parameters);

[pthatcher1, 2016/03/12 01:21:04]

Why was this moved to a separate method?

[skvlad, 2016/03/15 21:18:18]

Oops, this is a leftover from an earlier version where this method was doing
more. Thanks for spotting.

+}
+
 void VoiceChannel::HandleEarlyMediaTimeout() {
   // This occurs on the main thread, not the worker thread.
   if (!received_media_) {
     LOG(LS_INFO) << "No early media received before timeout";
     SignalEarlyMediaTimeout(this);
   }
 }
 
 bool VoiceChannel::InsertDtmf_w(uint32_t ssrc,
                                 int event,
@@ skipping 104 matching lines @@
   return InvokeOnWorker(Bind(&VideoChannel::IsScreencasting_w, this));
 }
 
 bool VideoChannel::SetVideoSend(uint32_t ssrc,
                                 bool mute,
                                 const VideoOptions* options) {
   return InvokeOnWorker(Bind(&VideoMediaChannel::SetVideoSend, media_channel(),
                              ssrc, mute, options));
 }
 
+webrtc::RTCRtpParameters VideoChannel::GetRtpParameters(uint32_t ssrc) {
+  webrtc::RTCRtpParameters parameters;
+  InvokeOnWorker(
+      Bind(&VideoChannel::GetRtpParameters_w, this, ssrc, &parameters));
+  return parameters;
+}
+
+bool VideoChannel::GetRtpParameters_w(uint32_t ssrc,
+                                      webrtc::RTCRtpParameters* parameters) {
+  *parameters = media_channel()->GetRtpParameters(ssrc);
+  return true;

[pthatcher1, 2016/03/12 01:21:04]

same here

[skvlad, 2016/03/15 21:18:18]

Done.

+}
+
+bool VideoChannel::SetRtpParameters(
+    uint32_t ssrc,
+    const webrtc::RTCRtpParameters& parameters) {
+  return InvokeOnWorker(
+      Bind(&VideoChannel::SetRtpParameters_w, this, ssrc, parameters));
+}
+
+bool VideoChannel::SetRtpParameters_w(uint32_t ssrc,
+                                      webrtc::RTCRtpParameters parameters) {
+  return media_channel()->SetRtpParameters(ssrc, parameters);
+}
 void VideoChannel::ChangeState() {
   // Send outgoing data if we're the active call, we have the remote content,
   // and we have had some form of connectivity.
   bool send = IsReadyToSend();
   if (!media_channel()->SetSend(send)) {
     LOG(LS_ERROR) << "Failed to SetSend on video channel";
     // TODO(gangji): Report error back to server.
   }
 
   LOG(LS_INFO) << "Changing video state, send=" << send;
@@ skipping 87 matching lines @@
 
   if (!SetRtpTransportParameters_w(content, action, CS_REMOTE, error_desc)) {
     return false;
   }
 
   VideoSendParameters send_params = last_send_params_;
   RtpSendParametersFromMediaDescription(video, &send_params);
   if (video->conference_mode()) {
     send_params.conference_mode = true;
   }
-  if (!media_channel()->SetSendParameters(send_params)) {
+
+  bool parameters_applied = ApplySendParameters(send_params);
+
+  if (!parameters_applied) {
     SafeSetError("Failed to set remote video description send parameters.",
                  error_desc);
     return false;
   }
   last_send_params_ = send_params;
 
   // TODO(pthatcher): Move remote streams into VideoRecvParameters,
   // and only give it to the media channel once we have a local
   // description too (without a local description, we won't be able to
   // recv them anyway).
@@ skipping 34 matching lines @@
 bool VideoChannel::IsScreencasting_w() const {
   return !screencast_capturers_.empty();
 }
 
 void VideoChannel::OnScreencastWindowEvent_s(uint32_t ssrc,
                                              rtc::WindowEvent we) {
   ASSERT(signaling_thread() == rtc::Thread::Current());
   SignalScreencastWindowEvent(ssrc, we);
 }
 
+bool VideoChannel::ApplySendParameters(const VideoSendParameters& parameters) {
+  return media_channel()->SetSendParameters(parameters);
+}

[pthatcher1, 2016/03/12 01:21:04]

same here

[skvlad, 2016/03/15 21:18:18]

Done.

+
 void VideoChannel::OnMessage(rtc::Message *pmsg) {
   switch (pmsg->message_id) {
     case MSG_SCREENCASTWINDOWEVENT: {
       const ScreencastEventMessageData* data =
           static_cast<ScreencastEventMessageData*>(pmsg->pdata);
       OnScreencastWindowEvent_s(data->ssrc, data->event);
       delete data;
       break;
     }
     case MSG_CHANNEL_ERROR: {
@@ skipping 380 matching lines @@
   return (data_channel_type_ == DCT_RTP) && BaseChannel::ShouldSetupDtlsSrtp();
 }
 
 void DataChannel::OnStreamClosedRemotely(uint32_t sid) {
   rtc::TypedMessageData<uint32_t>* message =
       new rtc::TypedMessageData<uint32_t>(sid);
   signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message);
 }
 
 }  // namespace cricket