Commit 163e7157 authored by Hirokazu Honda's avatar Hirokazu Honda Committed by Commit Bot

media: Remove VaapiH264AMDEncoder

The feature is launched and no bug has been reported.
Let's remove VaapiH264AMDEncoder.

Bug: 1035788
Test: None
Change-Id: I7b2994b8ffafb93f49bfe903c808f31fe0ca3a6d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2249259Reviewed-by: default avatarBecca Hughes <beccahughes@chromium.org>
Commit-Queue: Hirokazu Honda <hiroh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#779603}
parent bd23dace
...@@ -414,10 +414,6 @@ const base::Feature kUseR16Texture{"use-r16-texture", ...@@ -414,10 +414,6 @@ const base::Feature kUseR16Texture{"use-r16-texture",
const base::Feature kUnifiedAutoplay{"UnifiedAutoplay", const base::Feature kUnifiedAutoplay{"UnifiedAutoplay",
base::FEATURE_ENABLED_BY_DEFAULT}; base::FEATURE_ENABLED_BY_DEFAULT};
// Enable VA-API hardware encode acceleration for H264 on AMD.
const base::Feature kVaapiH264AMDEncoder{"VaapiH264AMDEncoder",
base::FEATURE_ENABLED_BY_DEFAULT};
// Enable VA-API hardware low power encoder for all codecs on intel Gen9x gpu. // Enable VA-API hardware low power encoder for all codecs on intel Gen9x gpu.
const base::Feature kVaapiLowPowerEncoderGen9x{ const base::Feature kVaapiLowPowerEncoderGen9x{
"VaapiLowPowerEncoderGen9x", base::FEATURE_DISABLED_BY_DEFAULT}; "VaapiLowPowerEncoderGen9x", base::FEATURE_DISABLED_BY_DEFAULT};
......
...@@ -166,7 +166,6 @@ MEDIA_EXPORT extern const base::Feature kUseFakeDeviceForMediaStream; ...@@ -166,7 +166,6 @@ MEDIA_EXPORT extern const base::Feature kUseFakeDeviceForMediaStream;
MEDIA_EXPORT extern const base::Feature kUseMediaHistoryStore; MEDIA_EXPORT extern const base::Feature kUseMediaHistoryStore;
MEDIA_EXPORT extern const base::Feature kUseNewMediaCache; MEDIA_EXPORT extern const base::Feature kUseNewMediaCache;
MEDIA_EXPORT extern const base::Feature kUseR16Texture; MEDIA_EXPORT extern const base::Feature kUseR16Texture;
MEDIA_EXPORT extern const base::Feature kVaapiH264AMDEncoder;
MEDIA_EXPORT extern const base::Feature kVaapiLowPowerEncoderGen9x; MEDIA_EXPORT extern const base::Feature kVaapiLowPowerEncoderGen9x;
MEDIA_EXPORT extern const base::Feature kVaapiVP8Encoder; MEDIA_EXPORT extern const base::Feature kVaapiVP8Encoder;
MEDIA_EXPORT extern const base::Feature kVaapiVP9Encoder; MEDIA_EXPORT extern const base::Feature kVaapiVP9Encoder;
......
...@@ -301,19 +301,6 @@ bool IsBlackListedDriver(const std::string& va_vendor_string, ...@@ -301,19 +301,6 @@ bool IsBlackListedDriver(const std::string& va_vendor_string,
if (!IsModeEncoding(mode)) if (!IsModeEncoding(mode))
return false; return false;
// TODO(crbug.com/828482): Remove once H264 encoder on AMD is enabled by
// default.
if (VendorStringToImplementationType(va_vendor_string) ==
VAImplementation::kMesaGallium &&
base::Contains(va_vendor_string, "AMD STONEY") &&
!base::FeatureList::IsEnabled(kVaapiH264AMDEncoder)) {
constexpr VAProfile kH264Profiles[] = {VAProfileH264Baseline,
VAProfileH264Main, VAProfileH264High,
VAProfileH264ConstrainedBaseline};
if (base::Contains(kH264Profiles, va_profile))
return true;
}
// TODO(posciak): Remove once VP8 encoding is to be enabled by default. // TODO(posciak): Remove once VP8 encoding is to be enabled by default.
if (va_profile == VAProfileVP8Version0_3 && if (va_profile == VAProfileVP8Version0_3 &&
!base::FeatureList::IsEnabled(kVaapiVP8Encoder)) { !base::FeatureList::IsEnabled(kVaapiVP8Encoder)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment