Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(503)

Unified Diff: webrtc/video/video_send_stream_tests.cc

Issue 2070343002: Remove ViEncoder::Pause / Start (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Addressed comments. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/video/video_send_stream.cc ('k') | webrtc/video/vie_encoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/video_send_stream_tests.cc
diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc
index 6a77530f71e42c8ea88d24433e0cf6e711f89061..8adf24717cc374e3d61fd2d8112dfa2716d3592e 100644
--- a/webrtc/video/video_send_stream_tests.cc
+++ b/webrtc/video/video_send_stream_tests.cc
@@ -1193,6 +1193,79 @@ TEST_F(VideoSendStreamTest, CanReconfigureToUseStartBitrateAbovePreviousMax) {
DestroyStreams();
}
+// This test that if the encoder use an internal source, VideoEncoder::SetRates
+// will be called with zero bitrate during initialization and that
+// VideoSendStream::Stop also triggers VideoEncoder::SetRates Start to be called
+// with zero bitrate.
+TEST_F(VideoSendStreamTest, VideoSendStreamStopSetEncoderRateToZero) {
+ class StartStopBitrateObserver : public test::FakeEncoder {
+ public:
+ StartStopBitrateObserver()
+ : FakeEncoder(Clock::GetRealTimeClock()),
+ encoder_init_(false, false),
+ bitrate_changed_(false, false),
+ bitrate_kbps_(0) {}
+ int32_t InitEncode(const VideoCodec* config,
+ int32_t number_of_cores,
+ size_t max_payload_size) override {
+ rtc::CritScope lock(&crit_);
+ bitrate_kbps_ = config->startBitrate;
+ encoder_init_.Set();
+ return FakeEncoder::InitEncode(config, number_of_cores, max_payload_size);
+ }
+
+ int32_t SetRates(uint32_t new_target_bitrate, uint32_t framerate) override {
+ rtc::CritScope lock(&crit_);
+ bitrate_kbps_ = new_target_bitrate;
+ bitrate_changed_.Set();
+ return FakeEncoder::SetRates(new_target_bitrate, framerate);
+ }
+
+ int GetBitrateKbps() const {
+ rtc::CritScope lock(&crit_);
+ return bitrate_kbps_;
+ }
+
+ bool WaitForEncoderInit() {
+ return encoder_init_.Wait(VideoSendStreamTest::kDefaultTimeoutMs);
+ }
+ bool WaitBitrateChanged() {
+ return bitrate_changed_.Wait(VideoSendStreamTest::kDefaultTimeoutMs);
+ }
+
+ private:
+ rtc::CriticalSection crit_;
+ rtc::Event encoder_init_;
+ rtc::Event bitrate_changed_;
+ int bitrate_kbps_ GUARDED_BY(crit_);
+ };
+
+ CreateSenderCall(Call::Config());
+
+ test::NullTransport transport;
+ CreateSendConfig(1, 0, &transport);
+
+ StartStopBitrateObserver encoder;
+ video_send_config_.encoder_settings.encoder = &encoder;
+ video_send_config_.encoder_settings.internal_source = true;
+
+ CreateVideoStreams();
+
+ EXPECT_TRUE(encoder.WaitForEncoderInit());
+ EXPECT_GT(encoder.GetBitrateKbps(), 0);
+ video_send_stream_->Start();
+ EXPECT_TRUE(encoder.WaitBitrateChanged());
+ EXPECT_GT(encoder.GetBitrateKbps(), 0);
+ video_send_stream_->Stop();
+ EXPECT_TRUE(encoder.WaitBitrateChanged());
+ EXPECT_EQ(0, encoder.GetBitrateKbps());
+ video_send_stream_->Start();
+ EXPECT_TRUE(encoder.WaitBitrateChanged());
+ EXPECT_GT(encoder.GetBitrateKbps(), 0);
+
+ DestroyStreams();
+}
+
TEST_F(VideoSendStreamTest, CapturesTextureAndVideoFrames) {
class FrameObserver : public rtc::VideoSinkInterface<VideoFrame> {
public:
« no previous file with comments | « webrtc/video/video_send_stream.cc ('k') | webrtc/video/vie_encoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698