admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update several tests: FakeVideoCapturer -> FakeVideoCapturerWithTaskQueue.

Browse Source 
Bug: webrtc:8848
Change-Id: Iae41d6e47dbca563918f7283d902eb52b7839b12
Reviewed-on: https://webrtc-review.googlesource.com/49281
Reviewed-by: Niels Moller <nisse@webrtc.org>
Commit-Queue: Tommi <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21954}
This commit is contained in:
Tommi 2018-02-07 19:26:06 +01:00 committed by Commit Bot
parent c1cab0a134
commit 8595993c5b
5 changed files with 75 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
media/base/videoadapter_unittest.cc
View File

@ -29,8 +29,8 @@ const int kDefaultFps = 30;
class VideoAdapterTest : public testing::Test {
public:
virtual void SetUp() {
capturer_.reset(new FakeVideoCapturer);
void SetUp() override {
capturer_.reset(new FakeVideoCapturerWithTaskQueue());
capture_format_ = capturer_->GetSupportedFormats()->at(0);
capture_format_.interval = VideoFormat::FpsToInterval(kDefaultFps);
@ -38,7 +38,7 @@ class VideoAdapterTest : public testing::Test {
capturer_->AddOrUpdateSink(listener_.get(), rtc::VideoSinkWants());
}
virtual void TearDown() {
void TearDown() override {
// Explicitly disconnect the VideoCapturer before to avoid data races
// (frames delivered to VideoCapturerListener while it's being destructed).
capturer_->RemoveSink(listener_.get());
@ -69,7 +69,7 @@ class VideoAdapterTest : public testing::Test {
dropped_frames_(0),
last_adapt_was_no_op_(false) {}
void OnFrame(const webrtc::VideoFrame& frame) {
void OnFrame(const webrtc::VideoFrame& frame) override {
rtc::CritScope lock(&crit_);
const int in_width = frame.width();
const int in_height = frame.height();
@ -131,7 +131,7 @@ class VideoAdapterTest : public testing::Test {
EXPECT_EQ(out_height, stats.out_height);
}
std::unique_ptr<FakeVideoCapturer> capturer_;
std::unique_ptr<FakeVideoCapturerWithTaskQueue> capturer_;
VideoAdapter adapter_;
int cropped_width_;
int cropped_height_;

8
media/base/videocapturer_unittest.cc
View File

@ -21,7 +21,7 @@
#include "rtc_base/logging.h"
#include "rtc_base/thread.h"
using cricket::FakeVideoCapturer;
using cricket::FakeVideoCapturerWithTaskQueue;
namespace {
@ -42,8 +42,8 @@ class VideoCapturerTest
protected:
void InitCapturer(bool is_screencast) {
capturer_ = std::unique_ptr<FakeVideoCapturer>(
new FakeVideoCapturer(is_screencast));
capturer_ = std::unique_ptr<FakeVideoCapturerWithTaskQueue>(
new FakeVideoCapturerWithTaskQueue(is_screencast));
capturer_->SignalStateChange.connect(this,
&VideoCapturerTest::OnStateChange);
capturer_->AddOrUpdateSink(&renderer_, rtc::VideoSinkWants());
@ -58,7 +58,7 @@ class VideoCapturerTest
cricket::CaptureState capture_state() { return capture_state_; }
int num_state_changes() { return num_state_changes_; }
std::unique_ptr<cricket::FakeVideoCapturer> capturer_;
std::unique_ptr<FakeVideoCapturerWithTaskQueue> capturer_;
cricket::CaptureState capture_state_;
int num_state_changes_;
cricket::FakeVideoRenderer renderer_;

55
media/base/videoengine_unittest.h
View File

@ -105,8 +105,8 @@ class VideoMediaChannelTest : public testing::Test,
channel_->SetVideoSend(kSsrc, true, nullptr, video_capturer_.get()));
}
virtual cricket::FakeVideoCapturer* CreateFakeVideoCapturer() {
return new cricket::FakeVideoCapturer();
virtual cricket::FakeVideoCapturerWithTaskQueue* CreateFakeVideoCapturer() {
return new cricket::FakeVideoCapturerWithTaskQueue();
}
// Utility method to setup an additional stream to send and receive video.
@ -192,8 +192,7 @@ class VideoMediaChannelTest : public testing::Test,
if (video_capturer_2_) {
video_capturer_2_->CaptureFrame();
}
return video_capturer_.get() &&
video_capturer_->CaptureFrame();
return video_capturer_.get() && video_capturer_->CaptureFrame();
}
bool WaitAndSendFrame(int wait_ms) {
bool ret = rtc::Thread::Current()->ProcessMessages(wait_ms);
@ -543,7 +542,7 @@ class VideoMediaChannelTest : public testing::Test,
// Add an additional capturer, and hook up a renderer to receive it.
cricket::FakeVideoRenderer renderer2;
std::unique_ptr<cricket::FakeVideoCapturer> capturer(
std::unique_ptr<cricket::FakeVideoCapturerWithTaskQueue> capturer(
CreateFakeVideoCapturer());
const int kTestWidth = 160;
const int kTestHeight = 120;
@ -557,8 +556,8 @@ class VideoMediaChannelTest : public testing::Test,
EXPECT_TRUE(channel_->AddRecvStream(
cricket::StreamParams::CreateLegacy(5678)));
EXPECT_TRUE(channel_->SetSink(5678, &renderer2));
EXPECT_TRUE(capturer->CaptureCustomFrame(
kTestWidth, kTestHeight, cricket::FOURCC_I420));
EXPECT_TRUE(capturer->CaptureCustomFrame(kTestWidth, kTestHeight,
cricket::FOURCC_I420));
EXPECT_FRAME_ON_RENDERER_WAIT(
renderer2, 1, kTestWidth, kTestHeight, kTimeout);
@ -745,41 +744,43 @@ class VideoMediaChannelTest : public testing::Test,
// Tests that we can add and remove capturers and frames are sent out properly
void AddRemoveCapturer() {
cricket::VideoCodec codec = DefaultCodec();
const int time_between_send_ms =
cricket::VideoFormat::FpsToInterval(kFramerate);
using cricket::VideoCodec;
using cricket::VideoOptions;
using cricket::VideoFormat;
using cricket::FOURCC_I420;
VideoCodec codec = DefaultCodec();
const int time_between_send_ms = VideoFormat::FpsToInterval(kFramerate);
EXPECT_TRUE(SetOneCodec(codec));
EXPECT_TRUE(SetSend(true));
EXPECT_TRUE(channel_->SetSink(kDefaultReceiveSsrc, &renderer_));
EXPECT_EQ(0, renderer_.num_rendered_frames());
EXPECT_TRUE(SendFrame());
EXPECT_FRAME_WAIT(1, kVideoWidth, kVideoHeight, kTimeout);
std::unique_ptr<cricket::FakeVideoCapturer> capturer(
std::unique_ptr<cricket::FakeVideoCapturerWithTaskQueue> capturer(
CreateFakeVideoCapturer());
// TODO(nisse): This testcase fails if we don't configure
// screencast. It's unclear why, I see nothing obvious in this
// test which is related to screencast logic.
cricket::VideoOptions video_options;
VideoOptions video_options;
video_options.is_screencast = true;
channel_->SetVideoSend(kSsrc, true, &video_options, nullptr);
cricket::VideoFormat format(480, 360,
cricket::VideoFormat::FpsToInterval(30),
cricket::FOURCC_I420);
VideoFormat format(480, 360, VideoFormat::FpsToInterval(30), FOURCC_I420);
EXPECT_EQ(cricket::CS_RUNNING, capturer->Start(format));
// All capturers start generating frames with the same timestamp. ViE does
// not allow the same timestamp to be used. Capture one frame before
// associating the capturer with the channel.
EXPECT_TRUE(capturer->CaptureCustomFrame(format.width, format.height,
cricket::FOURCC_I420));
EXPECT_TRUE(
capturer->CaptureCustomFrame(format.width, format.height, FOURCC_I420));
int captured_frames = 1;
for (int iterations = 0; iterations < 2; ++iterations) {
EXPECT_TRUE(channel_->SetVideoSend(kSsrc, true, nullptr, capturer.get()));
rtc::Thread::Current()->ProcessMessages(time_between_send_ms);
EXPECT_TRUE(capturer->CaptureCustomFrame(format.width, format.height,
cricket::FOURCC_I420));
FOURCC_I420));
++captured_frames;
// Wait until frame of right size is captured.
EXPECT_TRUE_WAIT(renderer_.num_rendered_frames() >= captured_frames &&
@ -809,7 +810,7 @@ class VideoMediaChannelTest : public testing::Test,
// not render a frame with the same timestamp so capture another frame
// with the frame capturer to increment the next frame's timestamp.
EXPECT_TRUE(capturer->CaptureCustomFrame(format.width, format.height,
cricket::FOURCC_I420));
FOURCC_I420));
}
}
@ -856,7 +857,7 @@ class VideoMediaChannelTest : public testing::Test,
EXPECT_TRUE(channel_->SetSink(1, &renderer1));
EXPECT_TRUE(channel_->AddSendStream(
cricket::StreamParams::CreateLegacy(1)));
std::unique_ptr<cricket::FakeVideoCapturer> capturer1(
std::unique_ptr<cricket::FakeVideoCapturerWithTaskQueue> capturer1(
CreateFakeVideoCapturer());
EXPECT_EQ(cricket::CS_RUNNING, capturer1->Start(capture_format));
// Set up additional stream 2.
@ -867,7 +868,7 @@ class VideoMediaChannelTest : public testing::Test,
EXPECT_TRUE(channel_->SetSink(2, &renderer2));
EXPECT_TRUE(channel_->AddSendStream(
cricket::StreamParams::CreateLegacy(2)));
std::unique_ptr<cricket::FakeVideoCapturer> capturer2(
std::unique_ptr<cricket::FakeVideoCapturerWithTaskQueue> capturer2(
CreateFakeVideoCapturer());
EXPECT_EQ(cricket::CS_RUNNING, capturer2->Start(capture_format));
// State for all the streams.
@ -881,13 +882,13 @@ class VideoMediaChannelTest : public testing::Test,
// Test capturer associated with engine.
const int kTestWidth = 160;
const int kTestHeight = 120;
EXPECT_TRUE(capturer1->CaptureCustomFrame(
kTestWidth, kTestHeight, cricket::FOURCC_I420));
EXPECT_TRUE(capturer1->CaptureCustomFrame(kTestWidth, kTestHeight,
cricket::FOURCC_I420));
EXPECT_FRAME_ON_RENDERER_WAIT(
renderer1, 1, kTestWidth, kTestHeight, kTimeout);
// Capture a frame with additional capturer2, frames should be received
EXPECT_TRUE(capturer2->CaptureCustomFrame(
kTestWidth, kTestHeight, cricket::FOURCC_I420));
EXPECT_TRUE(capturer2->CaptureCustomFrame(kTestWidth, kTestHeight,
cricket::FOURCC_I420));
EXPECT_FRAME_ON_RENDERER_WAIT(
renderer2, 1, kTestWidth, kTestHeight, kTimeout);
// Successfully remove the capturer.
@ -931,8 +932,8 @@ class VideoMediaChannelTest : public testing::Test,
webrtc::RtcEventLogNullImpl event_log_;
const std::unique_ptr<webrtc::Call> call_;
E engine_;
std::unique_ptr<cricket::FakeVideoCapturer> video_capturer_;
std::unique_ptr<cricket::FakeVideoCapturer> video_capturer_2_;
std::unique_ptr<cricket::FakeVideoCapturerWithTaskQueue> video_capturer_;
std::unique_ptr<cricket::FakeVideoCapturerWithTaskQueue> video_capturer_2_;
std::unique_ptr<C> channel_;
cricket::FakeNetworkInterface network_interface_;
cricket::FakeVideoRenderer renderer_;

72
media/engine/webrtcvideoengine_unittest.cc
View File

@ -41,6 +41,7 @@
#include "test/field_trial.h"
#include "test/gmock.h"
using cricket::FakeVideoCapturerWithTaskQueue;
using webrtc::RtpExtension;
namespace {
@ -293,7 +294,7 @@ TEST_F(WebRtcVideoEngineTest, SupportsVideoRotationHeaderExtension) {
TEST_F(WebRtcVideoEngineTest, CVOSetHeaderExtensionBeforeCapturer) {
// Allocate the capturer first to prevent early destruction before channel's
// dtor is called.
cricket::FakeVideoCapturer capturer;
FakeVideoCapturerWithTaskQueue capturer;
encoder_factory_->AddSupportedVideoCodecType("VP8");
@ -323,7 +324,7 @@ TEST_F(WebRtcVideoEngineTest, CVOSetHeaderExtensionBeforeCapturer) {
TEST_F(WebRtcVideoEngineTest, CVOSetHeaderExtensionBeforeAddSendStream) {
// Allocate the capturer first to prevent early destruction before channel's
// dtor is called.
cricket::FakeVideoCapturer capturer;
FakeVideoCapturerWithTaskQueue capturer;
encoder_factory_->AddSupportedVideoCodecType("VP8");
@ -345,7 +346,7 @@ TEST_F(WebRtcVideoEngineTest, CVOSetHeaderExtensionBeforeAddSendStream) {
}
TEST_F(WebRtcVideoEngineTest, CVOSetHeaderExtensionAfterCapturer) {
cricket::FakeVideoCapturer capturer;
FakeVideoCapturerWithTaskQueue capturer;
encoder_factory_->AddSupportedVideoCodecType("VP8");
encoder_factory_->AddSupportedVideoCodecType("VP9");
@ -409,7 +410,7 @@ TEST_F(WebRtcVideoEngineTest, UseExternalFactoryForVp8WhenSupported) {
channel->AddSendStream(cricket::StreamParams::CreateLegacy(kSsrc)));
EXPECT_EQ(0, encoder_factory_->GetNumCreatedEncoders());
EXPECT_TRUE(channel->SetSend(true));
cricket::FakeVideoCapturer capturer;
FakeVideoCapturerWithTaskQueue capturer;
EXPECT_TRUE(channel->SetVideoSend(kSsrc, true, nullptr, &capturer));
EXPECT_EQ(cricket::CS_RUNNING,
capturer.Start(capturer.GetSupportedFormats()->front()));
@ -525,7 +526,7 @@ TEST_F(WebRtcVideoEngineTest, PropagatesInputFrameTimestamp) {
EXPECT_TRUE(
channel->AddSendStream(cricket::StreamParams::CreateLegacy(kSsrc)));
FakeVideoCapturer capturer;
FakeVideoCapturerWithTaskQueue capturer;
EXPECT_TRUE(channel->SetVideoSend(kSsrc, true, nullptr, &capturer));
capturer.Start(cricket::VideoFormat(1280, 720,
cricket::VideoFormat::FpsToInterval(60),
@ -634,7 +635,7 @@ TEST_F(WebRtcVideoEngineTest, UsesSimulcastAdapterForVp8Factories) {
channel->AddSendStream(CreateSimStreamParams("cname", ssrcs)));
EXPECT_TRUE(channel->SetSend(true));
cricket::FakeVideoCapturer capturer;
FakeVideoCapturerWithTaskQueue capturer;
EXPECT_TRUE(channel->SetVideoSend(ssrcs.front(), true, nullptr, &capturer));
EXPECT_EQ(cricket::CS_RUNNING,
capturer.Start(capturer.GetSupportedFormats()->front()));
@ -711,7 +712,7 @@ TEST_F(WebRtcVideoEngineTest,
// Send a fake frame, or else the media engine will configure the simulcast
// encoder adapter at a low-enough size that it'll only create a single
// encoder layer.
cricket::FakeVideoCapturer capturer;
FakeVideoCapturerWithTaskQueue capturer;
EXPECT_TRUE(channel->SetVideoSend(ssrcs.front(), true, nullptr, &capturer));
EXPECT_EQ(cricket::CS_RUNNING,
capturer.Start(capturer.GetSupportedFormats()->front()));
@ -745,7 +746,7 @@ TEST_F(WebRtcVideoEngineTest,
// Send a frame of 720p. This should trigger a "real" encoder initialization.
cricket::VideoFormat format(
1280, 720, cricket::VideoFormat::FpsToInterval(30), cricket::FOURCC_I420);
cricket::FakeVideoCapturer capturer;
FakeVideoCapturerWithTaskQueue capturer;
EXPECT_TRUE(channel->SetVideoSend(kSsrc, true, nullptr, &capturer));
EXPECT_EQ(cricket::CS_RUNNING, capturer.Start(format));
EXPECT_TRUE(capturer.CaptureFrame());
@ -770,7 +771,7 @@ TEST_F(WebRtcVideoEngineTest, SimulcastDisabledForH264) {
// Send a frame of 720p. This should trigger a "real" encoder initialization.
cricket::VideoFormat format(
1280, 720, cricket::VideoFormat::FpsToInterval(30), cricket::FOURCC_I420);
cricket::FakeVideoCapturer capturer;
FakeVideoCapturerWithTaskQueue capturer;
EXPECT_TRUE(channel->SetVideoSend(ssrcs[0], true, nullptr, &capturer));
EXPECT_EQ(cricket::CS_RUNNING, capturer.Start(format));
EXPECT_TRUE(capturer.CaptureFrame());
@ -1094,7 +1095,7 @@ TEST_F(WebRtcVideoEngineTest, DISABLED_RecreatesEncoderOnContentTypeChange) {
channel->SetSend(true);
ASSERT_TRUE(channel->SetSendParameters(parameters));
cricket::FakeVideoCapturer capturer;
FakeVideoCapturerWithTaskQueue capturer;
VideoOptions options;
EXPECT_TRUE(channel->SetVideoSend(kSsrc, true, &options, &capturer));
@ -1399,7 +1400,7 @@ class WebRtcVideoChannelTest : public WebRtcVideoEngineTest {
FakeVideoSendStream* SetDenoisingOption(
uint32_t ssrc,
cricket::FakeVideoCapturer* capturer,
FakeVideoCapturerWithTaskQueue* capturer,
bool enabled) {
cricket::VideoOptions options;
options.video_noise_reduction = enabled;
@ -1879,7 +1880,7 @@ TEST_F(WebRtcVideoChannelTest, ReconfiguresEncodersWhenNotSending) {
EXPECT_EQ(0u, streams[0].width);
EXPECT_EQ(0u, streams[0].height);
cricket::FakeVideoCapturer capturer;
FakeVideoCapturerWithTaskQueue capturer;
EXPECT_TRUE(channel_->SetVideoSend(last_ssrc_, true, nullptr, &capturer));
VideoFormat capture_format = capturer.GetSupportedFormats()->front();
EXPECT_EQ(cricket::CS_RUNNING, capturer.Start(capture_format));
@ -1901,7 +1902,7 @@ TEST_F(WebRtcVideoChannelTest, UsesCorrectSettingsForScreencast) {
EXPECT_TRUE(channel_->SetSendParameters(parameters));
AddSendStream();
cricket::FakeVideoCapturer capturer;
FakeVideoCapturerWithTaskQueue capturer;
VideoOptions min_bitrate_options;
min_bitrate_options.screencast_min_bitrate_kbps = kScreenshareMinBitrateKbps;
EXPECT_TRUE(channel_->SetVideoSend(last_ssrc_, true, &min_bitrate_options,
@ -1967,7 +1968,7 @@ TEST_F(WebRtcVideoChannelTest,
AddSendStream();
VideoOptions options;
options.is_screencast = true;
cricket::FakeVideoCapturer capturer;
FakeVideoCapturerWithTaskQueue capturer;
EXPECT_TRUE(channel_->SetVideoSend(last_ssrc_, true, &options, &capturer));
cricket::VideoFormat capture_format_hd =
capturer.GetSupportedFormats()->front();
@ -2042,7 +2043,7 @@ TEST_F(WebRtcVideoChannelTest, VerifyVp8SpecificSettings) {
// both RTX and regular SSRCs).
FakeVideoSendStream* stream = SetUpSimulcast(false, true);
cricket::FakeVideoCapturer capturer;
FakeVideoCapturerWithTaskQueue capturer;
EXPECT_EQ(cricket::CS_RUNNING,
capturer.Start(capturer.GetSupportedFormats()->front()));
EXPECT_TRUE(channel_->SetVideoSend(last_ssrc_, true, nullptr, &capturer));
@ -2109,7 +2110,7 @@ TEST_F(WebRtcVideoChannelTest, VerifyVp8SpecificSettings) {
// reconfigured.
TEST_F(WebRtcVideoChannelTest, SetIdenticalOptionsDoesntReconfigureEncoder) {
VideoOptions options;
cricket::FakeVideoCapturer capturer;
FakeVideoCapturerWithTaskQueue capturer;
AddSendStream();
EXPECT_EQ(cricket::CS_RUNNING,
@ -2161,7 +2162,7 @@ TEST_F(Vp9SettingsTest, VerifyVp9SpecificSettings) {
FakeVideoSendStream* stream = SetUpSimulcast(false, false);
cricket::FakeVideoCapturer capturer;
FakeVideoCapturerWithTaskQueue capturer;
EXPECT_EQ(cricket::CS_RUNNING,
capturer.Start(capturer.GetSupportedFormats()->front()));
EXPECT_TRUE(channel_->SetVideoSend(last_ssrc_, true, nullptr, &capturer));
@ -2221,7 +2222,7 @@ class Vp9SettingsTestWithFieldTrial : public Vp9SettingsTest {
FakeVideoSendStream* stream = SetUpSimulcast(false, false);
cricket::FakeVideoCapturer capturer;
FakeVideoCapturerWithTaskQueue capturer;
EXPECT_EQ(cricket::CS_RUNNING,
capturer.Start(capturer.GetSupportedFormats()->front()));
EXPECT_TRUE(channel_->SetVideoSend(last_ssrc_, true, nullptr, &capturer));
@ -2331,7 +2332,7 @@ TEST_F(WebRtcVideoChannelTest, AdaptsOnOveruseAndChangeResolution) {
AddSendStream();
cricket::FakeVideoCapturer capturer;
FakeVideoCapturerWithTaskQueue capturer;
ASSERT_TRUE(channel_->SetVideoSend(last_ssrc_, true, nullptr, &capturer));
ASSERT_EQ(cricket::CS_RUNNING,
capturer.Start(capturer.GetSupportedFormats()->front()));
@ -2412,7 +2413,7 @@ TEST_F(WebRtcVideoChannelTest, PreviousAdaptationDoesNotApplyToScreenshare) {
AddSendStream();
cricket::FakeVideoCapturer capturer;
FakeVideoCapturerWithTaskQueue capturer;
ASSERT_EQ(cricket::CS_RUNNING,
capturer.Start(capturer.GetSupportedFormats()->front()));
ASSERT_TRUE(channel_->SetSend(true));
@ -2440,7 +2441,7 @@ TEST_F(WebRtcVideoChannelTest, PreviousAdaptationDoesNotApplyToScreenshare) {
EXPECT_EQ(720 * 3 / 4, send_stream->GetLastHeight());
// Switch to screen share. Expect no CPU adaptation.
cricket::FakeVideoCapturer screen_share(true);
FakeVideoCapturerWithTaskQueue screen_share(true);
ASSERT_EQ(cricket::CS_RUNNING,
screen_share.Start(screen_share.GetSupportedFormats()->front()));
cricket::VideoOptions screenshare_options;
@ -2490,7 +2491,7 @@ void WebRtcVideoChannelTest::TestDegradationPreference(
AddSendStream();
cricket::FakeVideoCapturer capturer;
FakeVideoCapturerWithTaskQueue capturer;
VideoOptions options;
EXPECT_TRUE(channel_->SetVideoSend(last_ssrc_, true, &options, &capturer));
cricket::VideoFormat capture_format = capturer.GetSupportedFormats()->front();
@ -2525,7 +2526,7 @@ void WebRtcVideoChannelTest::TestCpuAdaptation(bool enable_overuse,
AddSendStream();
cricket::FakeVideoCapturer capturer;
FakeVideoCapturerWithTaskQueue capturer;
VideoOptions options;
options.is_screencast = is_screenshare;
EXPECT_TRUE(channel_->SetVideoSend(last_ssrc_, true, &options, &capturer));
@ -3064,7 +3065,7 @@ TEST_F(WebRtcVideoChannelTest, SetSendCodecsChangesExistingStreams) {
channel_->SetSend(true);
FakeVideoSendStream* stream = AddSendStream();
cricket::FakeVideoCapturer capturer;
FakeVideoCapturerWithTaskQueue capturer;
EXPECT_TRUE(channel_->SetVideoSend(last_ssrc_, true, nullptr, &capturer));
std::vector<webrtc::VideoStream> streams = stream->GetVideoStreams();
@ -3194,7 +3195,7 @@ TEST_F(WebRtcVideoChannelTest, SetMaxSendBitrateCanIncreaseSenderBitrate) {
FakeVideoSendStream* stream = AddSendStream();
cricket::FakeVideoCapturer capturer;
FakeVideoCapturerWithTaskQueue capturer;
EXPECT_TRUE(channel_->SetVideoSend(last_ssrc_, true, nullptr, &capturer));
EXPECT_EQ(cricket::CS_RUNNING,
capturer.Start(capturer.GetSupportedFormats()->front()));
@ -3223,7 +3224,7 @@ TEST_F(WebRtcVideoChannelTest,
cricket::CreateSimStreamParams("cname", MAKE_VECTOR(kSsrcs3)));
// Send a frame to make sure this scales up to >1 stream (simulcast).
cricket::FakeVideoCapturer capturer;
FakeVideoCapturerWithTaskQueue capturer;
EXPECT_TRUE(channel_->SetVideoSend(kSsrcs3[0], true, nullptr, &capturer));
EXPECT_EQ(cricket::CS_RUNNING,
capturer.Start(capturer.GetSupportedFormats()->front()));
@ -4323,7 +4324,7 @@ TEST_F(WebRtcVideoChannelTest,
TEST_F(WebRtcVideoChannelTest, CanSentMaxBitrateForExistingStream) {
AddSendStream();
cricket::FakeVideoCapturer capturer;
FakeVideoCapturerWithTaskQueue capturer;
EXPECT_TRUE(channel_->SetVideoSend(last_ssrc_, true, nullptr, &capturer));
cricket::VideoFormat capture_format_hd =
capturer.GetSupportedFormats()->front();
@ -4460,10 +4461,10 @@ TEST_F(WebRtcVideoChannelTest, SetRtpSendParametersPrioritySimulcastStreams) {
AddSendStream(stream_params);
uint32_t primary_ssrc = stream_params.first_ssrc();
// Using the FakeVideoCapturer, we manually send a full size frame. This
// creates multiple VideoStreams for all simulcast layers when reconfiguring,
// and allows us to test this behavior.
cricket::FakeVideoCapturer capturer;
// Using the FakeVideoCapturerWithTaskQueue, we manually send a full size
// frame. This creates multiple VideoStreams for all simulcast layers when
// reconfiguring, and allows us to test this behavior.
FakeVideoCapturerWithTaskQueue capturer;
VideoOptions options;
EXPECT_TRUE(channel_->SetVideoSend(primary_ssrc, true, &options, &capturer));
EXPECT_EQ(cricket::CS_RUNNING,
@ -4546,9 +4547,10 @@ TEST_F(WebRtcVideoChannelTest, SetRtpSendParametersMultipleEncodingsActive) {
FakeVideoSendStream* fake_video_send_stream = AddSendStream(stream_params);
uint32_t primary_ssrc = stream_params.first_ssrc();
// Using the FakeVideoCapturer, we manually send a full size frame. This
// allows us to test that ReconfigureEncoder is called appropriately.
cricket::FakeVideoCapturer capturer;
// Using the FakeVideoCapturerWithTaskQueue, we manually send a full size
// frame. This allows us to test that ReconfigureEncoder is called
// appropriately.
cricket::FakeVideoCapturerWithTaskQueue capturer;
VideoOptions options;
EXPECT_TRUE(channel_->SetVideoSend(primary_ssrc, true, &options, &capturer));
EXPECT_EQ(cricket::CS_RUNNING,
@ -4913,7 +4915,7 @@ class WebRtcVideoChannelSimulcastTest : public testing::Test {
AddSendStream(CreateSimStreamParams("cname", ssrcs));
// Send a full-size frame to trigger a stream reconfiguration to use all
// expected simulcast layers.
cricket::FakeVideoCapturer capturer;
FakeVideoCapturerWithTaskQueue capturer;
VideoOptions options;
if (screenshare)
options.is_screencast = screenshare;

2
pc/videotrack_unittest.cc
View File

@ -39,7 +39,7 @@ class VideoTrackTest : public testing::Test {
}
protected:
cricket::FakeVideoCapturer capturer_;
cricket::FakeVideoCapturerWithTaskQueue capturer_;
rtc::scoped_refptr<VideoTrackSource> video_track_source_;
rtc::scoped_refptr<VideoTrackInterface> video_track_;
};