4db138e889
This is a reland of fb82fcc7f9c414dc8ba1ddd314e9524fee54cb80 Original change's description: > Move creating encoder to VideoStreamEncoder. > > This used to be in WebRtcVideoChannel::WebRtcVideoSendStream. > One implication is that encoder is not created until the first > frame arrives, and some of the tests needed updates to emit a > frame or two. > > Bug: webrtc:8830 > Change-Id: I78169b2bb4dfa4197b4b4229af9fd69d0f747835 > Reviewed-on: https://webrtc-review.googlesource.com/64885 > Commit-Queue: Niels Moller <nisse@webrtc.org> > Reviewed-by: Erik Språng <sprang@webrtc.org> > Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22905} TBR=magjed@webrtc.org,kwiberg@webrtc.org Bug: webrtc:8830 Change-Id: I9565095ea1880fb49d15111198c08b2fcb84f18c Reviewed-on: https://webrtc-review.googlesource.com/70740 Commit-Queue: Niels Moller <nisse@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22930}
79 lines
2.6 KiB
C++
79 lines
2.6 KiB
C++
/*
|
|
* 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 "video/encoder_rtcp_feedback.h"
|
|
|
|
#include <memory>
|
|
|
|
#include "test/gmock.h"
|
|
#include "test/gtest.h"
|
|
#include "video/send_statistics_proxy.h"
|
|
#include "video/video_stream_encoder.h"
|
|
|
|
using ::testing::NiceMock;
|
|
|
|
namespace webrtc {
|
|
|
|
class MockVideoStreamEncoder : public VideoStreamEncoder {
|
|
public:
|
|
explicit MockVideoStreamEncoder(SendStatisticsProxy* send_stats_proxy)
|
|
: VideoStreamEncoder(1,
|
|
send_stats_proxy,
|
|
VideoSendStream::Config::EncoderSettings(),
|
|
nullptr,
|
|
rtc::MakeUnique<OveruseFrameDetector>(nullptr)) {}
|
|
~MockVideoStreamEncoder() { Stop(); }
|
|
|
|
MOCK_METHOD0(SendKeyFrame, void());
|
|
};
|
|
|
|
class VieKeyRequestTest : public ::testing::Test {
|
|
public:
|
|
VieKeyRequestTest()
|
|
: simulated_clock_(123456789),
|
|
send_stats_proxy_(&simulated_clock_,
|
|
VideoSendStream::Config(nullptr),
|
|
VideoEncoderConfig::ContentType::kRealtimeVideo),
|
|
encoder_(&send_stats_proxy_),
|
|
encoder_rtcp_feedback_(
|
|
&simulated_clock_,
|
|
std::vector<uint32_t>(1, VieKeyRequestTest::kSsrc),
|
|
&encoder_) {}
|
|
|
|
protected:
|
|
const uint32_t kSsrc = 1234;
|
|
|
|
SimulatedClock simulated_clock_;
|
|
SendStatisticsProxy send_stats_proxy_;
|
|
MockVideoStreamEncoder encoder_;
|
|
EncoderRtcpFeedback encoder_rtcp_feedback_;
|
|
};
|
|
|
|
TEST_F(VieKeyRequestTest, CreateAndTriggerRequests) {
|
|
EXPECT_CALL(encoder_, SendKeyFrame()).Times(1);
|
|
encoder_rtcp_feedback_.OnReceivedIntraFrameRequest(kSsrc);
|
|
}
|
|
|
|
TEST_F(VieKeyRequestTest, TooManyOnReceivedIntraFrameRequest) {
|
|
EXPECT_CALL(encoder_, SendKeyFrame()).Times(1);
|
|
encoder_rtcp_feedback_.OnReceivedIntraFrameRequest(kSsrc);
|
|
encoder_rtcp_feedback_.OnReceivedIntraFrameRequest(kSsrc);
|
|
simulated_clock_.AdvanceTimeMilliseconds(10);
|
|
encoder_rtcp_feedback_.OnReceivedIntraFrameRequest(kSsrc);
|
|
|
|
EXPECT_CALL(encoder_, SendKeyFrame()).Times(1);
|
|
simulated_clock_.AdvanceTimeMilliseconds(300);
|
|
encoder_rtcp_feedback_.OnReceivedIntraFrameRequest(kSsrc);
|
|
encoder_rtcp_feedback_.OnReceivedIntraFrameRequest(kSsrc);
|
|
encoder_rtcp_feedback_.OnReceivedIntraFrameRequest(kSsrc);
|
|
}
|
|
|
|
} // namespace webrtc
|