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

Fix FakeVp8Encoder name.

Browse Source 
Bug: None
Change-Id: Iaa11a452fcb6fb6f33d1396eb4e6fe9c050166ad
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/169845
Commit-Queue: Nikita Zetilov <zetilovn@google.com>
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30703}
This commit is contained in:
Nikita Zetilov 2020-03-06 10:43:41 +01:00 committed by Commit Bot
parent 10aeb7403f
commit 8e9fd4857e
6 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/call_test.cc
View File

@ -43,7 +43,7 @@ CallTest::CallTest()
fake_encoder_factory_([this]() {
std::unique_ptr<FakeEncoder> fake_encoder;
if (video_encoder_configs_[0].codec_type == kVideoCodecVP8) {
fake_encoder = std::make_unique<FakeVP8Encoder>(clock_);
fake_encoder = std::make_unique<FakeVp8Encoder>(clock_);
} else {
fake_encoder = std::make_unique<FakeEncoder>(clock_);
}

12
test/fake_vp8_encoder.cc
View File

@ -45,11 +45,11 @@ namespace webrtc {
namespace test {
FakeVP8Encoder::FakeVP8Encoder(Clock* clock) : FakeEncoder(clock) {
FakeVp8Encoder::FakeVp8Encoder(Clock* clock) : FakeEncoder(clock) {
sequence_checker_.Detach();
}
int32_t FakeVP8Encoder::InitEncode(const VideoCodec* config,
int32_t FakeVp8Encoder::InitEncode(const VideoCodec* config,
const Settings& settings) {
RTC_DCHECK_RUN_ON(&sequence_checker_);
auto result = FakeEncoder::InitEncode(config, settings);
@ -64,13 +64,13 @@ int32_t FakeVP8Encoder::InitEncode(const VideoCodec* config,
return WEBRTC_VIDEO_CODEC_OK;
}
int32_t FakeVP8Encoder::Release() {
int32_t FakeVp8Encoder::Release() {
auto result = FakeEncoder::Release();
sequence_checker_.Detach();
return result;
}
void FakeVP8Encoder::PopulateCodecSpecific(CodecSpecificInfo* codec_specific,
void FakeVp8Encoder::PopulateCodecSpecific(CodecSpecificInfo* codec_specific,
size_t size_bytes,
VideoFrameType frame_type,
int stream_idx,
@ -88,7 +88,7 @@ void FakeVP8Encoder::PopulateCodecSpecific(CodecSpecificInfo* codec_specific,
}
}
std::unique_ptr<RTPFragmentationHeader> FakeVP8Encoder::EncodeHook(
std::unique_ptr<RTPFragmentationHeader> FakeVp8Encoder::EncodeHook(
EncodedImage* encoded_image,
CodecSpecificInfo* codec_specific) {
RTC_DCHECK_RUN_ON(&sequence_checker_);
@ -107,7 +107,7 @@ std::unique_ptr<RTPFragmentationHeader> FakeVP8Encoder::EncodeHook(
return nullptr;
}
VideoEncoder::EncoderInfo FakeVP8Encoder::GetEncoderInfo() const {
VideoEncoder::EncoderInfo FakeVp8Encoder::GetEncoderInfo() const {
EncoderInfo info;
info.implementation_name = "FakeVp8Encoder";
return info;

7
test/fake_vp8_encoder.h
View File

@ -32,10 +32,10 @@
namespace webrtc {
namespace test {
class FakeVP8Encoder : public FakeEncoder {
class FakeVp8Encoder : public FakeEncoder {
public:
explicit FakeVP8Encoder(Clock* clock);
virtual ~FakeVP8Encoder() = default;
explicit FakeVp8Encoder(Clock* clock);
virtual ~FakeVp8Encoder() = default;
int32_t InitEncode(const VideoCodec* config,
const Settings& settings) override;
@ -70,6 +70,7 @@ class FakeVP8Encoder : public FakeEncoder {
std::unique_ptr<Vp8FrameBufferController> frame_buffer_controller_
RTC_GUARDED_BY(sequence_checker_);
};
using FakeVP8Encoder = FakeVp8Encoder;
} // namespace test
} // namespace webrtc

2
test/fake_vp8_encoder_unittest.cc
View File

@ -28,7 +28,7 @@ namespace {
std::unique_ptr<SimulcastTestFixture> CreateSpecificSimulcastTestFixture() {
std::unique_ptr<VideoEncoderFactory> encoder_factory =
std::make_unique<FunctionVideoEncoderFactory>([]() {
return std::make_unique<FakeVP8Encoder>(Clock::GetRealTimeClock());
return std::make_unique<FakeVp8Encoder>(Clock::GetRealTimeClock());
});
std::unique_ptr<VideoDecoderFactory> decoder_factory =
std::make_unique<FunctionVideoDecoderFactory>(

2
test/peer_scenario/peer_scenario_client.cc
View File

@ -131,7 +131,7 @@ class FakeVideoEncoderFactory : public VideoEncoderFactory {
}
std::unique_ptr<VideoEncoder> CreateVideoEncoder(
const SdpVideoFormat& format) override {
return std::make_unique<FakeVP8Encoder>(clock_);
return std::make_unique<FakeVp8Encoder>(clock_);
}
private:

2
test/scenario/video_stream.cc
View File

@ -375,7 +375,7 @@ SendVideoStream::SendVideoStream(CallClient* sender,
rtc::CritScope cs(&crit_);
std::unique_ptr<FakeEncoder> encoder;
if (config_.encoder.codec == Codec::kVideoCodecVP8) {
encoder = std::make_unique<test::FakeVP8Encoder>(sender_->clock_);
encoder = std::make_unique<test::FakeVp8Encoder>(sender_->clock_);
} else if (config_.encoder.codec == Codec::kVideoCodecGeneric) {
encoder = std::make_unique<test::FakeEncoder>(sender_->clock_);
} else {