zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make SendStatisticsProxy paramter mandatory in ViEEncoder ctor.

Browse Source 
The only implementation which used a nullptr was a mock used in tests,
so add a dummy instance there instead.
Remove tests for stats_proxy_ in vie_encoder and just dcheck in the
constructor instead.

BUG=None

Review-Url: https://codereview.webrtc.org/2695643002
Cr-Commit-Position: refs/heads/master@{#16577}
This commit is contained in:
sprang
2017-02-13 04:41:45 -08:00
committed by Commit bot
parent 1458462303
commit 552c7c70b0
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
webrtc/video/encoder_rtcp_feedback_unittest.cc
View File

@ -13,6 +13,7 @@
#include "webrtc/modules/utility/include/mock/mock_process_thread.h"
#include "webrtc/test/gmock.h"
#include "webrtc/test/gtest.h"
#include "webrtc/video/send_statistics_proxy.h"
#include "webrtc/video/vie_encoder.h"
using ::testing::NiceMock;
@ -21,9 +22,9 @@ namespace webrtc {
class MockVieEncoder : public ViEEncoder {
public:
MockVieEncoder()
explicit MockVieEncoder(SendStatisticsProxy* send_stats_proxy)
: ViEEncoder(1,
nullptr,
send_stats_proxy,
VideoSendStream::Config::EncoderSettings("fake", 0, nullptr),
nullptr,
nullptr) {}
@ -38,6 +39,10 @@ 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),
@ -45,8 +50,10 @@ class VieKeyRequestTest : public ::testing::Test {
protected:
const uint32_t kSsrc = 1234;
MockVieEncoder encoder_;
SimulatedClock simulated_clock_;
SendStatisticsProxy send_stats_proxy_;
MockVieEncoder encoder_;
EncoderRtcpFeedback encoder_rtcp_feedback_;
};