Remove PayloadRouter dependency from ViEEncoder

webrtc/video/payload_router.h

 /*
  *  Copyright (c) 2015 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 18 matching lines @@
 // PayloadRouter routes outgoing data to the correct sending RTP module, based
 // on the simulcast layer in RTPVideoHeader.
 class PayloadRouter : public EncodedImageCallback {
  public:
   // Rtp modules are assumed to be sorted in simulcast index order.
   explicit PayloadRouter(const std::vector<RtpRtcp*>& rtp_modules,
                          int payload_type);
   ~PayloadRouter();
 
   static size_t DefaultMaxPayloadLength();
-  void SetSendingRtpModules(size_t num_sending_modules);
+  void SetSendCodec(const VideoCodec& codec);

[pbos-webrtc, 2016/04/22 15:24:20]

Can this take a std::vector<VideoStream> instead? I don't like the VideoCodec
struct in general.

[perkj_webrtc, 2016/04/27 08:00:57]

ok- but I had to add the streams to the EncoderConfig. We should really try to
create one codec struct shared with libjingle, webrtc and chrome....

 
   // PayloadRouter will only route packets if being active, all packets will be
   // dropped otherwise.
   void set_active(bool active);
   bool active();
 
   // Implements EncodedImageCallback.
   // Returns 0 if the packet was routed / sent, -1 otherwise.
   int32_t Encoded(const EncodedImage& encoded_image,
                   const CodecSpecificInfo* codec_specific_info,
                   const RTPFragmentationHeader* fragmentation) override;
 
-  // Configures current target bitrate per module. 'stream_bitrates' is assumed
-  // to be in the same order as 'SetSendingRtpModules'.
-  void SetTargetSendBitrates(const std::vector<uint32_t>& stream_bitrates);
+  // Configures current target bitrate.
+  void SetTargetSendBitrate(uint32_t bitrate_bps);
 
   // Returns the maximum allowed data payload length, given the configured MTU
   // and RTP headers.
   size_t MaxPayloadLength() const;
 
  private:
   void UpdateModuleSendingState() EXCLUSIVE_LOCKS_REQUIRED(crit_);
 
   rtc::CriticalSection crit_;
   bool active_ GUARDED_BY(crit_);
+  VideoCodec codec_ GUARDED_BY(crit_);
   size_t num_sending_modules_ GUARDED_BY(crit_);
 
   // Rtp modules are assumed to be sorted in simulcast index order. Not owned.
   const std::vector<RtpRtcp*> rtp_modules_;
   const int payload_type_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(PayloadRouter);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_PAYLOAD_ROUTER_H_