Extract bitrate allocation of spatial/temporal layers out of codec impl.

webrtc/modules/video_coding/video_coding_impl.cc

 /*
  *  Copyright (c) 2012 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.
  */
 
 #include "webrtc/modules/video_coding/video_coding_impl.h"
 
 #include <algorithm>
+#include <utility>
 
 #include "webrtc/common_types.h"
+#include "webrtc/common_video/include/video_bitrate_allocator.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/base/criticalsection.h"
+#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h"
+#include "webrtc/modules/video_coding/include/video_codec_initializer.h"
 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
 #include "webrtc/modules/video_coding/encoded_frame.h"
 #include "webrtc/modules/video_coding/jitter_buffer.h"
 #include "webrtc/modules/video_coding/packet.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
 namespace webrtc {
 namespace vcm {
 
 int64_t VCMProcessTimer::Period() const {
@@ skipping 69 matching lines @@
   }
 
   void Process() override {
     sender_.Process();
     receiver_.Process();
   }
 
   int32_t RegisterSendCodec(const VideoCodec* sendCodec,
                             uint32_t numberOfCores,
                             uint32_t maxPayloadSize) override {
+    if (sendCodec != nullptr && sendCodec->codecType == kVideoCodecVP8) {
+      VideoCodec vp8_codec = *sendCodec;
+      std::unique_ptr<TemporalLayersFactory> tl_factory(
+          new TemporalLayersFactory());
+      vp8_codec.VP8()->tl_factory = tl_factory.get();
+      rate_allocator_ = VideoCodecInitializer::GetBitrateAllocator(
+          vp8_codec, std::move(tl_factory));
+      return sender_.RegisterSendCodec(&vp8_codec, numberOfCores,
+                                       maxPayloadSize);

[stefan-webrtc, 2016/11/09 11:58:12]

I find it a bit difficult to understand lifetime of objects here. tl_factory
ownership is handed over to rate_allocator_, which lives up until
VideoCodingModuleImpl is destroyed? Or does it live only until RegisterSendCodec
is called again? Is it safe for vp8_codec to have a pointer to it? Maybe at
least worth commenting on.

[sprang_webrtc, 2016/11/09 12:26:18]

The TemporalLayersFactory is owned by the BitrateAllocator yes, and it must live
when InitEncode() is called on the codec implementation. Since this is done on a
task queue we can't really know when that is, so we let the instance live until
we destroy the video coding module or we register a new send codec.
I can add a comment.

[stefan-webrtc, 2016/11/09 12:40:26]

Does it make more sense to let the codec own the allocator? It seems to be the
only one really using it?

+    }
     return sender_.RegisterSendCodec(sendCodec, numberOfCores, maxPayloadSize);
   }
 
   int32_t RegisterExternalEncoder(VideoEncoder* externalEncoder,
                                   uint8_t payloadType,
                                   bool internalSource) override {
     sender_.RegisterExternalEncoder(externalEncoder, payloadType,
                                     internalSource);
     return 0;
   }
 
   int Bitrate(unsigned int* bitrate) const override {
     return sender_.Bitrate(bitrate);
   }
 
   int FrameRate(unsigned int* framerate) const override {
     return sender_.FrameRate(framerate);
   }
 
   int32_t SetChannelParameters(uint32_t target_bitrate,  // bits/s.
                                uint8_t lossRate,
                                int64_t rtt) override {
-    return sender_.SetChannelParameters(target_bitrate, lossRate, rtt);
+    return sender_.SetChannelParameters(target_bitrate, lossRate, rtt,
+                                        rate_allocator_.get());
   }
 
   int32_t RegisterProtectionCallback(
       VCMProtectionCallback* protection) override {
     return sender_.RegisterProtectionCallback(protection);
   }
 
   int32_t SetVideoProtection(VCMVideoProtection videoProtection,
                              bool enable) override {
     // TODO(pbos): Remove enable from receive-side protection modes as well.
@@ skipping 109 matching lines @@
   void RegisterPostEncodeImageCallback(
       EncodedImageCallback* observer) override {
     post_encode_callback_.Register(observer);
   }
 
   void TriggerDecoderShutdown() override { receiver_.TriggerDecoderShutdown(); }
 
  private:
   EncodedImageCallbackWrapper post_encode_callback_;
   vcm::VideoSender sender_;
+  std::unique_ptr<VideoBitrateAllocator> rate_allocator_;
   vcm::VideoReceiver receiver_;
 };
 }  // namespace
 
 void VideoCodingModule::Codec(VideoCodecType codecType, VideoCodec* codec) {
   VCMCodecDataBase::Codec(codecType, codec);
 }
 
 // Create method for the new jitter buffer.
 VideoCodingModule* VideoCodingModule::Create(
@@ skipping 22 matching lines @@
     EventFactory* event_factory,
     NackSender* nack_sender,
     KeyFrameRequestSender* keyframe_request_sender) {
   assert(clock);
   assert(event_factory);
   return new VideoCodingModuleImpl(clock, event_factory, nack_sender,
                                    keyframe_request_sender, nullptr);
 }
 
 }  // namespace webrtc