commit 9fdbda6aa3f66ea872344c22e79b23361047cbab
author perkj <perkj@webrtc.org> Thu Sep 15 16:19:20 2016
committer Commit bot <commit-bot@chromium.org> Thu Sep 15 16:19:28 2016
tree 68305e9a5da23c6b7c527881fb0dffbd3c828985
parent 95a226f55ae7e32b83a6ba96232fb105a014dc6c

Revert of Replace interface VideoCapturerInput with VideoSinkInterface. (patchset #13 id:280001 of https://codereview.webrtc.org/2257413002/ )

Reason for revert:
Fails on Mac and Linux webrtc_perf_tests

Original issue's description:
> Replace VideoCapturerInput with VideoSinkInterface.
> Adds new method VideoSendStream::SetSource(rtc::VideoSourceInterface* and VieEncoder::SetSource(rtc::VideoSourceInterface*)
>
> This is the first step needed in order for the ViEEncoder to request downscaling using rtc::VideoSinkWants instead of separately reporting CPU overuse and internally doing downscaling due to QP values.
>
> BUG=webrtc:5687
> // Android CQ seems broken.
> NOTRY=true
>
> Committed: https://crrev.com/95a226f55ae7e32b83a6ba96232fb105a014dc6c
> Cr-Commit-Position: refs/heads/master@{#14238}

TBR=nisse@webrtc.org,sprang@webrtc.org,mflodman@webrtc.org,stefan@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:5687

Review-Url: https://codereview.webrtc.org/2344923002
Cr-Commit-Position: refs/heads/master@{#14239}

webrtc/call/bitrate_estimator_tests.cc

diff --git a/webrtc/call/bitrate_estimator_tests.cc b/webrtc/call/bitrate_estimator_tests.cc
index 2896c67..b8a148c 100644
--- a/webrtc/call/bitrate_estimator_tests.cc
+++ b/webrtc/call/bitrate_estimator_tests.cc
@@ -177,10 +177,9 @@
           test_->video_encoder_config_.Copy());
       RTC_DCHECK_EQ(1u, test_->video_encoder_config_.streams.size());
       frame_generator_capturer_.reset(test::FrameGeneratorCapturer::Create(
-          test_->video_encoder_config_.streams[0].width,
+          send_stream_->Input(), test_->video_encoder_config_.streams[0].width,
           test_->video_encoder_config_.streams[0].height, 30,
           Clock::GetRealTimeClock()));
-      send_stream_->SetSource(frame_generator_capturer_.get());
       send_stream_->Start();
       frame_generator_capturer_->Start();
 
@@ -217,8 +216,8 @@
 
     ~Stream() {
       EXPECT_FALSE(is_sending_receiving_);
-      test_->sender_call_->DestroyVideoSendStream(send_stream_);
       frame_generator_capturer_.reset(nullptr);
+      test_->sender_call_->DestroyVideoSendStream(send_stream_);
       send_stream_ = nullptr;
       if (audio_receive_stream_) {
         test_->receiver_call_->DestroyAudioReceiveStream(audio_receive_stream_);