diff -up chromium-114.0.5735.35/media/gpu/vaapi/vaapi_video_encode_accelerator.cc.me chromium-114.0.5735.35/media/gpu/vaapi/vaapi_video_encode_accelerator.cc --- chromium-114.0.5735.35/media/gpu/vaapi/vaapi_video_encode_accelerator.cc.me 2023-05-21 10:05:00.357860329 +0200 +++ chromium-114.0.5735.35/media/gpu/vaapi/vaapi_video_encode_accelerator.cc 2023-05-21 10:18:09.665432735 +0200 @@ -41,7 +41,6 @@ #include "media/gpu/gpu_video_encode_accelerator_helpers.h" #include "media/gpu/h264_dpb.h" #include "media/gpu/macros.h" -#include "media/gpu/vaapi/av1_vaapi_video_encoder_delegate.h" #include "media/gpu/vaapi/h264_vaapi_video_encoder_delegate.h" #include "media/gpu/vaapi/va_surface.h" #include "media/gpu/vaapi/vaapi_common.h" @@ -200,7 +199,7 @@ bool VaapiVideoEncodeAccelerator::Initia const VideoCodec codec = VideoCodecProfileToVideoCodec(config.output_profile); if (codec != VideoCodec::kH264 && codec != VideoCodec::kVP8 && - codec != VideoCodec::kVP9 && codec != VideoCodec::kAV1) { + codec != VideoCodec::kVP9) { MEDIA_LOG(ERROR, media_log.get()) << "Unsupported profile: " << GetProfileName(config.output_profile); return false; @@ -293,7 +292,6 @@ void VaapiVideoEncodeAccelerator::Initia break; case VideoCodec::kVP8: case VideoCodec::kVP9: - case VideoCodec::kAV1: mode = VaapiWrapper::kEncodeConstantQuantizationParameter; break; default: @@ -356,12 +354,6 @@ void VaapiVideoEncodeAccelerator::Initia vaapi_wrapper_, error_cb); } break; - case VideoCodec::kAV1: - if (!IsConfiguredForTesting()) { - encoder_ = std::make_unique( - vaapi_wrapper_, error_cb); - } - break; default: NOTREACHED() << "Unsupported codec type " << GetCodecName(output_codec_); return; @@ -835,10 +827,6 @@ VaapiVideoEncodeAccelerator::CreateEncod case VideoCodec::kVP9: picture = new VaapiVP9Picture(std::move(reconstructed_surface)); break; - case VideoCodec::kAV1: - picture = new VaapiAV1Picture(/*display_va_surface=*/nullptr, - std::move(reconstructed_surface)); - break; default: return nullptr; } diff -up chromium-114.0.5735.35/media/gpu/BUILD.gn.revert-av1enc chromium-114.0.5735.35/media/gpu/BUILD.gn --- chromium-114.0.5735.35/media/gpu/BUILD.gn.revert-av1enc 2023-05-18 00:37:57.000000000 +0200 +++ chromium-114.0.5735.35/media/gpu/BUILD.gn 2023-05-20 13:14:10.755183630 +0200 @@ -373,10 +373,7 @@ source_set("common") { "vp9_svc_layers.h", ] configs += [ "//third_party/libvpx:libvpx_config" ] - deps += [ - "//third_party/libaom:libaomrc", - "//third_party/libvpx:libvpxrc", - ] + deps += [ "//third_party/libvpx:libvpxrc" ] } if (use_libgav1_parser) { sources += [ diff -up chromium-114.0.5735.35/media/gpu/vaapi/BUILD.gn.revert-av1enc chromium-114.0.5735.35/media/gpu/vaapi/BUILD.gn --- chromium-114.0.5735.35/media/gpu/vaapi/BUILD.gn.revert-av1enc 2023-05-18 00:37:57.000000000 +0200 +++ chromium-114.0.5735.35/media/gpu/vaapi/BUILD.gn 2023-05-20 13:14:10.756183626 +0200 @@ -38,8 +38,6 @@ source_set("vaapi") { sources = [ "av1_vaapi_video_decoder_delegate.cc", "av1_vaapi_video_decoder_delegate.h", - "av1_vaapi_video_encoder_delegate.cc", - "av1_vaapi_video_encoder_delegate.h", "h264_vaapi_video_decoder_delegate.cc", "h264_vaapi_video_decoder_delegate.h", "h264_vaapi_video_encoder_delegate.cc", @@ -107,7 +105,6 @@ source_set("vaapi") { "//media/gpu/chromeos:common", "//media/parsers", "//mojo/public/cpp/bindings", - "//third_party/libaom:libaomrc", "//third_party/libvpx:libvpxrc", "//third_party/libyuv", "//ui/gfx",