commit a27958421c8f4444471b0cd64c7d048f5035df95
author Elad Alon <eladalon@webrtc.org> Fri Jun 07 23:10:00 2019 +0200
committer Commit Bot <commit-bot@chromium.org> Tue Jun 11 19:26:23 2019 +0000
tree 71fbb873a34dfe45e5d650ad01050e5cb69ad7cb
parent 00e71ef49e9138c3253a3f22ff0c717033bbb986

Inform FrameBufferController of encoder capabilities

Bug: webrtc:10720
Change-Id: I958b83e29e8e87252e08419b8e16d554983a1a63
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/140941
Commit-Queue: Elad Alon <eladalon@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28242}

modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc

diff --git a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
index 06cf870..70a00d2 100644
--- a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
+++ b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
@@ -486,10 +486,11 @@
 
   RTC_DCHECK(!frame_buffer_controller_);
   if (frame_buffer_controller_factory_) {
-    frame_buffer_controller_ = frame_buffer_controller_factory_->Create(*inst);
+    frame_buffer_controller_ =
+        frame_buffer_controller_factory_->Create(*inst, settings);
   } else {
     Vp8TemporalLayersFactory factory;
-    frame_buffer_controller_ = factory.Create(*inst);
+    frame_buffer_controller_ = factory.Create(*inst, settings);
   }
   RTC_DCHECK(frame_buffer_controller_);
 

modules/video_coding/video_codec_initializer_unittest.cc

diff --git a/modules/video_coding/video_codec_initializer_unittest.cc b/modules/video_coding/video_codec_initializer_unittest.cc
index 09b01f6..5cac795 100644
--- a/modules/video_coding/video_codec_initializer_unittest.cc
+++ b/modules/video_coding/video_codec_initializer_unittest.cc
@@ -98,7 +98,9 @@
     // Make sure temporal layers instances have been created.
     if (codec_out_.codecType == VideoCodecType::kVideoCodecVP8) {
       Vp8TemporalLayersFactory factory;
-      frame_buffer_controller_ = factory.Create(codec_out_);
+      const VideoEncoder::Settings settings(VideoEncoder::Capabilities(false),
+                                            1, 1000);
+      frame_buffer_controller_ = factory.Create(codec_out_, settings);
     }
     return true;
   }