From df351f4b545b0df019b59204b94804bbf2a87f14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Spr=C3=A5ng?= Date: Tue, 6 Nov 2018 11:33:15 +0100 Subject: [PATCH] Update FakeEncoder to use EncoderInfo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:9890 Change-Id: Ia6f268b35b5cc62fb6318f59bd66bbf65e97a23d Reviewed-on: https://webrtc-review.googlesource.com/c/109565 Reviewed-by: Sebastian Jansson Commit-Queue: Erik Språng Cr-Commit-Position: refs/heads/master@{#25515} --- test/fake_encoder.cc | 6 ++++-- test/fake_encoder.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test/fake_encoder.cc b/test/fake_encoder.cc index eeeaa0d01f..6ce756b4a5 100644 --- a/test/fake_encoder.cc +++ b/test/fake_encoder.cc @@ -245,8 +245,10 @@ int32_t FakeEncoder::SetRateAllocation( } const char* FakeEncoder::kImplementationName = "fake_encoder"; -const char* FakeEncoder::ImplementationName() const { - return kImplementationName; +VideoEncoder::EncoderInfo FakeEncoder::GetEncoderInfo() const { + EncoderInfo info; + info.implementation_name = kImplementationName; + return info; } int FakeEncoder::GetConfiguredInputFramerate() const { diff --git a/test/fake_encoder.h b/test/fake_encoder.h index 2e6cdd1372..888322501f 100644 --- a/test/fake_encoder.h +++ b/test/fake_encoder.h @@ -43,8 +43,8 @@ class FakeEncoder : public VideoEncoder { int32_t Release() override; int32_t SetRateAllocation(const VideoBitrateAllocation& rate_allocation, uint32_t framerate) override; - const char* ImplementationName() const override; int GetConfiguredInputFramerate() const; + EncoderInfo GetEncoderInfo() const override; static const char* kImplementationName;