Enable setting the maximum bitrate limit in RtpSender.

webrtc/media/engine/webrtcvideoengine2.h

 /*
  *  Copyright (c) 2014 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 127 matching lines @@
                       const std::vector<VideoCodec>& recv_codecs,
                       WebRtcVideoEncoderFactory* external_encoder_factory,
                       WebRtcVideoDecoderFactory* external_decoder_factory);
   ~WebRtcVideoChannel2() override;
 
   // VideoMediaChannel implementation
   rtc::DiffServCodePoint PreferredDscp() const override;
 
   bool SetSendParameters(const VideoSendParameters& params) override;
   bool SetRecvParameters(const VideoRecvParameters& params) override;
+  webrtc::RtpParameters GetRtpParameters(uint32_t ssrc) const override;
+  bool SetRtpParameters(uint32_t ssrc,
+                        const webrtc::RtpParameters& parameters) override;
   bool GetSendCodec(VideoCodec* send_codec) override;
   bool SetSend(bool send) override;
   bool SetVideoSend(uint32_t ssrc,
                     bool mute,
                     const VideoOptions* options) override;
   bool AddSendStream(const StreamParams& sp) override;
   bool RemoveSendStream(uint32_t ssrc) override;
   bool AddRecvStream(const StreamParams& sp) override;
   bool AddRecvStream(const StreamParams& sp, bool default_stream);
   bool RemoveRecvStream(uint32_t ssrc) override;
@@ skipping 80 matching lines @@
         bool enable_cpu_overuse_detection,
         int max_bitrate_bps,
         const rtc::Optional<VideoCodecSettings>& codec_settings,
         const std::vector<webrtc::RtpExtension>& rtp_extensions,
         const VideoSendParameters& send_params);
     virtual ~WebRtcVideoSendStream();
 
     void SetOptions(const VideoOptions& options);
     // TODO(pbos): Move logic from SetOptions into this method.
     void SetSendParameters(const ChangedSendParameters& send_params);
+    bool SetRtpParameters(const webrtc::RtpParameters& parameters);
 
     void OnFrame(const cricket::VideoFrame& frame) override;
     bool SetCapturer(VideoCapturer* capturer);
     void MuteStream(bool mute);
     bool DisconnectCapturer();
 
     void Start();
     void Stop();
 
+    webrtc::RtpParameters rtp_parameters() const { return rtp_parameters_; }
+
     // Implements webrtc::LoadObserver.
     void OnLoadUpdate(Load load) override;
 
     const std::vector<uint32_t>& GetSsrcs() const;
     VideoSenderInfo GetVideoSenderInfo();
     void FillBandwidthEstimationInfo(BandwidthEstimationInfo* bwe_info);
 
    private:
     // Parameters needed to reconstruct the underlying stream.
     // webrtc::VideoSendStream doesn't support setting a lot of options on the
@@ skipping 64 matching lines @@
     void DestroyVideoEncoder(AllocatedEncoder* encoder)
         EXCLUSIVE_LOCKS_REQUIRED(lock_);
     void SetCodec(const VideoCodecSettings& codec)
         EXCLUSIVE_LOCKS_REQUIRED(lock_);
     void RecreateWebRtcStream() EXCLUSIVE_LOCKS_REQUIRED(lock_);
     webrtc::VideoEncoderConfig CreateVideoEncoderConfig(
         const Dimensions& dimensions,
         const VideoCodec& codec) const EXCLUSIVE_LOCKS_REQUIRED(lock_);
     void SetDimensions(int width, int height)
         EXCLUSIVE_LOCKS_REQUIRED(lock_);
+    bool ValidateRtpParameters(const webrtc::RtpParameters& parameters);
+    void ApplyBitrateLimit(int max_bitrate_bps) EXCLUSIVE_LOCKS_REQUIRED(lock_);
 
     rtc::ThreadChecker thread_checker_;
     rtc::AsyncInvoker invoker_;
     rtc::Thread* worker_thread_;
     const std::vector<uint32_t> ssrcs_;
     const std::vector<SsrcGroup> ssrc_groups_;
     webrtc::Call* const call_;
     rtc::VideoSinkWants sink_wants_;
     // Counter used for deciding if the video resolution is currently
     // restricted by CPU usage. It is reset if |capturer_| is changed.
@@ skipping 18 matching lines @@
     bool sending_ GUARDED_BY(lock_);
     bool muted_ GUARDED_BY(lock_);
 
     // The timestamp of the first frame received
     // Used to generate the timestamps of subsequent frames
     int64_t first_frame_timestamp_ms_ GUARDED_BY(lock_);
 
     // The timestamp of the last frame received
     // Used to generate timestamp for the black frame when capturer is removed
     int64_t last_frame_timestamp_ms_ GUARDED_BY(lock_);
+
+    webrtc::RtpParameters rtp_parameters_;
+    int global_max_bitrate_;

[pthatcher1, 2016/03/16 00:48:42]

We have:

parameters_;
rtp_parameters_;
global_max_bitrate_;

First, I think we can remove the last one, and simply compute the min of the
other two every time we reconfigure the encoder and not store it.

Second, we should make it clear why we have two parameters, and what goes in
each.

Perhaps something like:

// parameters_ contains settings that are the same for all streams in the
MediaChannel, such as codecs and header extensions.
VideoSendStreamParameters parameters_;
// rtp_parameters_ contains settings that are unique for each stream, such as
max bitrate.
// TODO: Move ssrcs_ and ssrcs_groups_ into rtp_parameters_.
// TODO: Combine parameters_ and rtp_parameters once we have only one stream per
MediaChannel.
webrtc::RtpParameters rtp_parameters_;

[skvlad, 2016/03/16 02:29:22]

Done.

   };
 
   // Wrapper for the receiver part, contains configs etc. that are needed to
   // reconstruct the underlying VideoReceiveStream. Also serves as a wrapper
   // between webrtc::VideoRenderer and cricket::VideoRenderer.
   class WebRtcVideoReceiveStream : public webrtc::VideoRenderer {
    public:
     WebRtcVideoReceiveStream(
         webrtc::Call* call,
         const StreamParams& sp,
@@ skipping 126 matching lines @@
   webrtc::Call::Config::BitrateConfig bitrate_config_;
   // TODO(deadbeef): Don't duplicate information between
   // send_params/recv_params, rtp_extensions, options, etc.
   VideoSendParameters send_params_;
   VideoRecvParameters recv_params_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_