mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 05:40:42 +01:00
Implement Create instead of CreateVideoDecoder in remaining test VideoDecoderFactories
to allow Create become virtual in the VideoDecoderFactory interface Bug: webrtc:15791 Change-Id: Id0d793164906473fa37346fa9177248ad8ef29bb Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/340341 Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Auto-Submit: Danil Chapovalov <danilchap@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Cr-Commit-Position: refs/heads/main@{#41791}
This commit is contained in:
parent
de3b1cd597
commit
bf20cf8a30
7 changed files with 13 additions and 11 deletions
|
@ -61,7 +61,8 @@ std::vector<SdpVideoFormat> FakeVideoDecoderFactory::GetSupportedFormats()
|
|||
1, SdpVideoFormat(kFakeCodecFactoryCodecName));
|
||||
}
|
||||
|
||||
std::unique_ptr<VideoDecoder> FakeVideoDecoderFactory::CreateVideoDecoder(
|
||||
std::unique_ptr<VideoDecoder> FakeVideoDecoderFactory::Create(
|
||||
const Environment& env,
|
||||
const SdpVideoFormat& format) {
|
||||
return std::make_unique<test::FakeDecoder>();
|
||||
}
|
||||
|
|
|
@ -44,7 +44,7 @@ class RTC_EXPORT FakeVideoDecoderFactory : public VideoDecoderFactory {
|
|||
|
||||
// VideoDecoderFactory implementation
|
||||
std::vector<SdpVideoFormat> GetSupportedFormats() const override;
|
||||
std::unique_ptr<VideoDecoder> CreateVideoDecoder(
|
||||
std::unique_ptr<VideoDecoder> Create(const Environment& env,
|
||||
const SdpVideoFormat& format) override;
|
||||
};
|
||||
|
||||
|
|
|
@ -95,8 +95,8 @@ FakeWebRtcVideoDecoderFactory::GetSupportedFormats() const {
|
|||
return formats;
|
||||
}
|
||||
|
||||
std::unique_ptr<webrtc::VideoDecoder>
|
||||
FakeWebRtcVideoDecoderFactory::CreateVideoDecoder(
|
||||
std::unique_ptr<webrtc::VideoDecoder> FakeWebRtcVideoDecoderFactory::Create(
|
||||
const webrtc::Environment& env,
|
||||
const webrtc::SdpVideoFormat& format) {
|
||||
if (format.IsCodecInList(supported_codec_formats_)) {
|
||||
num_created_decoders_++;
|
||||
|
|
|
@ -63,7 +63,8 @@ class FakeWebRtcVideoDecoderFactory : public webrtc::VideoDecoderFactory {
|
|||
FakeWebRtcVideoDecoderFactory();
|
||||
|
||||
std::vector<webrtc::SdpVideoFormat> GetSupportedFormats() const override;
|
||||
std::unique_ptr<webrtc::VideoDecoder> CreateVideoDecoder(
|
||||
std::unique_ptr<webrtc::VideoDecoder> Create(
|
||||
const webrtc::Environment& env,
|
||||
const webrtc::SdpVideoFormat& format) override;
|
||||
|
||||
void DecoderDestroyed(FakeWebRtcVideoDecoder* decoder);
|
||||
|
|
|
@ -1421,7 +1421,7 @@ TEST(WebRtcVideoEngineNewVideoCodecFactoryTest, Vp8) {
|
|||
|
||||
// Expect no decoder to be created at this point. The decoder will only be
|
||||
// created if we receive payload data.
|
||||
EXPECT_CALL(*decoder_factory, CreateVideoDecoder(format)).Times(0);
|
||||
EXPECT_CALL(*decoder_factory, Create).Times(0);
|
||||
|
||||
// Create a call.
|
||||
webrtc::GlobalSimulatedTimeController time_controller(
|
||||
|
|
|
@ -195,7 +195,7 @@ class FakeVideoDecoderFactory : public VideoDecoderFactory {
|
|||
std::vector<SdpVideoFormat> GetSupportedFormats() const override {
|
||||
return {SdpVideoFormat("VP8")};
|
||||
}
|
||||
std::unique_ptr<VideoDecoder> CreateVideoDecoder(
|
||||
std::unique_ptr<VideoDecoder> Create(const Environment& env,
|
||||
const SdpVideoFormat& format) override {
|
||||
return std::make_unique<FakeDecoder>();
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@ class VideoDecoderProxyFactory final : public VideoDecoderFactory {
|
|||
return {};
|
||||
}
|
||||
|
||||
std::unique_ptr<VideoDecoder> CreateVideoDecoder(
|
||||
std::unique_ptr<VideoDecoder> Create(const Environment& env,
|
||||
const SdpVideoFormat& format) override {
|
||||
return std::make_unique<DecoderProxy>(decoder_);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue