Deprecate write-only member CodecInfo::is_hardware_accelerated
This member of the CodecInfo struct was set in several places, but not
used for anything. To aid deletion, this cl defines a default implementation
of VideoEncoderFactory::QueryVideoEncoder.
The next step is to delete almost all downstream implementations of that method,
since the only classes that have to implement it are the few factories that
produce "internal source" encoders, e.g., for Chromium remoting.
Bug: None
Change-Id: I1f0dbf0d302933004ebdc779460cb2cb3a894e02
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/179520
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31844}
diff --git a/api/test/video/function_video_encoder_factory.h b/api/test/video/function_video_encoder_factory.h
index 40a187a..a452eee 100644
--- a/api/test/video/function_video_encoder_factory.h
+++ b/api/test/video/function_video_encoder_factory.h
@@ -43,14 +43,6 @@
return {};
}
- CodecInfo QueryVideoEncoder(
- const SdpVideoFormat& /* format */) const override {
- CodecInfo codec_info;
- codec_info.is_hardware_accelerated = false;
- codec_info.has_internal_source = false;
- return codec_info;
- }
-
std::unique_ptr<VideoEncoder> CreateVideoEncoder(
const SdpVideoFormat& format) override {
return create_(format);
diff --git a/api/video_codecs/builtin_video_encoder_factory.cc b/api/video_codecs/builtin_video_encoder_factory.cc
index 6888daa..2f722a4 100644
--- a/api/video_codecs/builtin_video_encoder_factory.cc
+++ b/api/video_codecs/builtin_video_encoder_factory.cc
@@ -50,8 +50,6 @@
RTC_DCHECK(IsFormatSupported(
internal_encoder_factory_->GetSupportedFormats(), format));
VideoEncoderFactory::CodecInfo info;
- info.has_internal_source = false;
- info.is_hardware_accelerated = false;
return info;
}
diff --git a/api/video_codecs/video_encoder_factory.h b/api/video_codecs/video_encoder_factory.h
index c396090..0a3c1ae 100644
--- a/api/video_codecs/video_encoder_factory.h
+++ b/api/video_codecs/video_encoder_factory.h
@@ -28,8 +28,7 @@
public:
// TODO(magjed): Try to get rid of this struct.
struct CodecInfo {
- // |is_hardware_accelerated| is true if the encoders created by this factory
- // of the given codec will use hardware support.
+ // TODO(nisse): Unused in webrtc, delete as soon as downstream use is fixed.
bool is_hardware_accelerated = false;
// |has_internal_source| is true if encoders created by this factory of the
// given codec will use internal camera sources, meaning that they don't
@@ -73,8 +72,13 @@
// Returns information about how this format will be encoded. The specified
// format must be one of the supported formats by this factory.
- // TODO(magjed): Try to get rid of this method.
- virtual CodecInfo QueryVideoEncoder(const SdpVideoFormat& format) const = 0;
+
+ // TODO(magjed): Try to get rid of this method. Since is_hardware_accelerated
+ // is unused, only factories producing internal source encoders (in itself a
+ // deprecated feature) needs to override this method.
+ virtual CodecInfo QueryVideoEncoder(const SdpVideoFormat& format) const {
+ return CodecInfo();
+ }
// Creates a VideoEncoder for the specified format.
virtual std::unique_ptr<VideoEncoder> CreateVideoEncoder(
diff --git a/media/engine/fake_video_codec_factory.cc b/media/engine/fake_video_codec_factory.cc
index ba7513b..63a1d50 100644
--- a/media/engine/fake_video_codec_factory.cc
+++ b/media/engine/fake_video_codec_factory.cc
@@ -44,11 +44,6 @@
1, SdpVideoFormat(kFakeCodecFactoryCodecName));
}
-VideoEncoderFactory::CodecInfo FakeVideoEncoderFactory::QueryVideoEncoder(
- const SdpVideoFormat& format) const {
- return VideoEncoderFactory::CodecInfo{false, false};
-}
-
std::unique_ptr<VideoEncoder> FakeVideoEncoderFactory::CreateVideoEncoder(
const SdpVideoFormat& format) {
return std::make_unique<test::FakeEncoder>(Clock::GetRealTimeClock());
diff --git a/media/engine/fake_video_codec_factory.h b/media/engine/fake_video_codec_factory.h
index 029a695..4a99120 100644
--- a/media/engine/fake_video_codec_factory.h
+++ b/media/engine/fake_video_codec_factory.h
@@ -30,8 +30,6 @@
// VideoEncoderFactory implementation
std::vector<SdpVideoFormat> GetSupportedFormats() const override;
- VideoEncoderFactory::CodecInfo QueryVideoEncoder(
- const SdpVideoFormat& format) const override;
std::unique_ptr<VideoEncoder> CreateVideoEncoder(
const SdpVideoFormat& format) override;
};
diff --git a/media/engine/fake_webrtc_video_engine.cc b/media/engine/fake_webrtc_video_engine.cc
index d767522..c1fc2e6 100644
--- a/media/engine/fake_webrtc_video_engine.cc
+++ b/media/engine/fake_webrtc_video_engine.cc
@@ -244,7 +244,6 @@
const webrtc::SdpVideoFormat& format) const {
webrtc::VideoEncoderFactory::CodecInfo info;
info.has_internal_source = encoders_have_internal_sources_;
- info.is_hardware_accelerated = true;
return info;
}
diff --git a/media/engine/internal_encoder_factory.cc b/media/engine/internal_encoder_factory.cc
index aabb810..738516e 100644
--- a/media/engine/internal_encoder_factory.cc
+++ b/media/engine/internal_encoder_factory.cc
@@ -41,14 +41,6 @@
return SupportedFormats();
}
-VideoEncoderFactory::CodecInfo InternalEncoderFactory::QueryVideoEncoder(
- const SdpVideoFormat& format) const {
- CodecInfo info;
- info.is_hardware_accelerated = false;
- info.has_internal_source = false;
- return info;
-}
-
std::unique_ptr<VideoEncoder> InternalEncoderFactory::CreateVideoEncoder(
const SdpVideoFormat& format) {
if (absl::EqualsIgnoreCase(format.name, cricket::kVp8CodecName))
diff --git a/media/engine/internal_encoder_factory.h b/media/engine/internal_encoder_factory.h
index c15d179..3f43e46 100644
--- a/media/engine/internal_encoder_factory.h
+++ b/media/engine/internal_encoder_factory.h
@@ -26,8 +26,6 @@
static std::vector<SdpVideoFormat> SupportedFormats();
std::vector<SdpVideoFormat> GetSupportedFormats() const override;
- CodecInfo QueryVideoEncoder(const SdpVideoFormat& format) const override;
-
std::unique_ptr<VideoEncoder> CreateVideoEncoder(
const SdpVideoFormat& format) override;
};
diff --git a/media/engine/multiplex_codec_factory.cc b/media/engine/multiplex_codec_factory.cc
index 5a220d5..fb29681 100644
--- a/media/engine/multiplex_codec_factory.cc
+++ b/media/engine/multiplex_codec_factory.cc
@@ -57,14 +57,6 @@
return formats;
}
-VideoEncoderFactory::CodecInfo MultiplexEncoderFactory::QueryVideoEncoder(
- const SdpVideoFormat& format) const {
- if (!IsMultiplexCodec(cricket::VideoCodec(format)))
- return factory_->QueryVideoEncoder(format);
- return factory_->QueryVideoEncoder(
- SdpVideoFormat(kMultiplexAssociatedCodecName));
-}
-
std::unique_ptr<VideoEncoder> MultiplexEncoderFactory::CreateVideoEncoder(
const SdpVideoFormat& format) {
if (!IsMultiplexCodec(cricket::VideoCodec(format)))
diff --git a/media/engine/multiplex_codec_factory.h b/media/engine/multiplex_codec_factory.h
index b8a15e2..ea57149 100644
--- a/media/engine/multiplex_codec_factory.h
+++ b/media/engine/multiplex_codec_factory.h
@@ -49,7 +49,6 @@
bool supports_augmenting_data = false);
std::vector<SdpVideoFormat> GetSupportedFormats() const override;
- CodecInfo QueryVideoEncoder(const SdpVideoFormat& format) const override;
std::unique_ptr<VideoEncoder> CreateVideoEncoder(
const SdpVideoFormat& format) override;
diff --git a/media/engine/simulcast_encoder_adapter_unittest.cc b/media/engine/simulcast_encoder_adapter_unittest.cc
index 9a23ca4..703d283 100644
--- a/media/engine/simulcast_encoder_adapter_unittest.cc
+++ b/media/engine/simulcast_encoder_adapter_unittest.cc
@@ -167,8 +167,6 @@
std::unique_ptr<VideoEncoder> CreateVideoEncoder(
const SdpVideoFormat& format) override;
- CodecInfo QueryVideoEncoder(const SdpVideoFormat& format) const override;
-
const std::vector<MockVideoEncoder*>& encoders() const;
void SetEncoderNames(const std::vector<const char*>& encoder_names);
void set_init_encode_return_value(int32_t value);
@@ -357,11 +355,6 @@
}
}
-VideoEncoderFactory::CodecInfo MockVideoEncoderFactory::QueryVideoEncoder(
- const SdpVideoFormat& format) const {
- return CodecInfo();
-}
-
const std::vector<MockVideoEncoder*>& MockVideoEncoderFactory::encoders()
const {
return encoders_;
diff --git a/media/engine/webrtc_video_engine_unittest.cc b/media/engine/webrtc_video_engine_unittest.cc
index eae8393..8b45c65 100644
--- a/media/engine/webrtc_video_engine_unittest.cc
+++ b/media/engine/webrtc_video_engine_unittest.cc
@@ -1129,7 +1129,6 @@
// Mock encoder creation. |engine| take ownership of the encoder.
webrtc::VideoEncoderFactory::CodecInfo codec_info;
- codec_info.is_hardware_accelerated = false;
codec_info.has_internal_source = false;
const webrtc::SdpVideoFormat format("VP8");
EXPECT_CALL(*encoder_factory, QueryVideoEncoder(format))
diff --git a/sdk/android/src/jni/video_encoder_factory_wrapper.cc b/sdk/android/src/jni/video_encoder_factory_wrapper.cc
index d6a6cfa..8ab4191 100644
--- a/sdk/android/src/jni/video_encoder_factory_wrapper.cc
+++ b/sdk/android/src/jni/video_encoder_factory_wrapper.cc
@@ -101,21 +101,6 @@
return implementations_;
}
-VideoEncoderFactory::CodecInfo VideoEncoderFactoryWrapper::QueryVideoEncoder(
- const SdpVideoFormat& format) const {
- JNIEnv* jni = AttachCurrentThreadIfNeeded();
- ScopedJavaLocalRef<jobject> j_codec_info =
- SdpVideoFormatToVideoCodecInfo(jni, format);
- ScopedJavaLocalRef<jobject> encoder = Java_VideoEncoderFactory_createEncoder(
- jni, encoder_factory_, j_codec_info);
-
- CodecInfo codec_info;
- // Check if this is a wrapped native software encoder implementation.
- codec_info.is_hardware_accelerated = IsHardwareVideoEncoder(jni, encoder);
- codec_info.has_internal_source = false;
- return codec_info;
-}
-
std::unique_ptr<VideoEncoderFactory::EncoderSelectorInterface>
VideoEncoderFactoryWrapper::GetEncoderSelector() const {
JNIEnv* jni = AttachCurrentThreadIfNeeded();
diff --git a/sdk/android/src/jni/video_encoder_factory_wrapper.h b/sdk/android/src/jni/video_encoder_factory_wrapper.h
index 799ae0f..2be6b1b 100644
--- a/sdk/android/src/jni/video_encoder_factory_wrapper.h
+++ b/sdk/android/src/jni/video_encoder_factory_wrapper.h
@@ -37,8 +37,6 @@
std::vector<SdpVideoFormat> GetImplementations() const override;
- CodecInfo QueryVideoEncoder(const SdpVideoFormat& format) const override;
-
std::unique_ptr<EncoderSelectorInterface> GetEncoderSelector() const override;
private:
diff --git a/sdk/objc/native/src/objc_video_encoder_factory.h b/sdk/objc/native/src/objc_video_encoder_factory.h
index 7e474c9..38db5e6 100644
--- a/sdk/objc/native/src/objc_video_encoder_factory.h
+++ b/sdk/objc/native/src/objc_video_encoder_factory.h
@@ -33,7 +33,6 @@
std::vector<SdpVideoFormat> GetImplementations() const override;
std::unique_ptr<VideoEncoder> CreateVideoEncoder(
const SdpVideoFormat& format) override;
- CodecInfo QueryVideoEncoder(const SdpVideoFormat& format) const override;
std::unique_ptr<EncoderSelectorInterface> GetEncoderSelector() const override;
private:
diff --git a/sdk/objc/native/src/objc_video_encoder_factory.mm b/sdk/objc/native/src/objc_video_encoder_factory.mm
index b54945f..78434c5 100644
--- a/sdk/objc/native/src/objc_video_encoder_factory.mm
+++ b/sdk/objc/native/src/objc_video_encoder_factory.mm
@@ -174,19 +174,6 @@
return GetSupportedFormats();
}
-VideoEncoderFactory::CodecInfo ObjCVideoEncoderFactory::QueryVideoEncoder(
- const SdpVideoFormat &format) const {
- // TODO(andersc): This is a hack until we figure out how this should be done properly.
- NSString *formatName = [NSString stringForStdString:format.name];
- NSSet *wrappedSoftwareFormats =
- [NSSet setWithObjects:kRTCVideoCodecVp8Name, kRTCVideoCodecVp9Name, nil];
-
- CodecInfo codec_info;
- codec_info.is_hardware_accelerated = ![wrappedSoftwareFormats containsObject:formatName];
- codec_info.has_internal_source = false;
- return codec_info;
-}
-
std::unique_ptr<VideoEncoder> ObjCVideoEncoderFactory::CreateVideoEncoder(
const SdpVideoFormat &format) {
RTC_OBJC_TYPE(RTCVideoCodecInfo) *info =
diff --git a/test/peer_scenario/peer_scenario_client.cc b/test/peer_scenario/peer_scenario_client.cc
index 1ae53ee..465ee45 100644
--- a/test/peer_scenario/peer_scenario_client.cc
+++ b/test/peer_scenario/peer_scenario_client.cc
@@ -125,8 +125,6 @@
CodecInfo QueryVideoEncoder(const SdpVideoFormat& format) const override {
RTC_CHECK_EQ(format.name, "VP8");
CodecInfo info;
- info.has_internal_source = false;
- info.is_hardware_accelerated = false;
return info;
}
std::unique_ptr<VideoEncoder> CreateVideoEncoder(
diff --git a/test/video_encoder_proxy_factory.h b/test/video_encoder_proxy_factory.h
index 70e2c8a..7c412ba 100644
--- a/test/video_encoder_proxy_factory.h
+++ b/test/video_encoder_proxy_factory.h
@@ -38,7 +38,6 @@
encoder_selector_(encoder_selector),
num_simultaneous_encoder_instances_(0),
max_num_simultaneous_encoder_instances_(0) {
- codec_info_.is_hardware_accelerated = false;
codec_info_.has_internal_source = false;
}
@@ -70,9 +69,6 @@
return nullptr;
}
- void SetIsHardwareAccelerated(bool is_hardware_accelerated) {
- codec_info_.is_hardware_accelerated = is_hardware_accelerated;
- }
void SetHasInternalSource(bool has_internal_source) {
codec_info_.has_internal_source = has_internal_source;
}
