d1f7eb6e83
This will enable changing thresholds when switching between hardware and software encoders. It is also a partial revert of https://webrtc-review.googlesource.com/33340: construction of the OveruseFrameDetector is still in VideoSendStream, but configuration is moved back to VideoStreamEncoder. Longer term, information about HW vs SW, or generally, about resources consumed by the encoder, should be passed in the per-frame callbacks to OveruseFrameDetector, and then the CpuOveruseOptions could move back to construction time. Bug: webrtc:8504, webrtc:8830 Change-Id: I44577519d4e05356730cac9bd9ae3c74bfc17ed7 Reviewed-on: https://webrtc-review.googlesource.com/65163 Reviewed-by: Erik Språng <sprang@webrtc.org> Commit-Queue: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22761}
80 lines
2.6 KiB
C++
80 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),
|
|
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
|