Disable vp8 screen content for vaapi

Bug: chromium:853185, b:111781384
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I7bc0dc619503bbb5d0b1ed5420187f0338e160a4
Reviewed-on: https://chromium-review.googlesource.com/1201859
Commit-Queue: Erik Språng <sprang@chromium.org>
Reviewed-by: Emircan Uysaler <emircan@chromium.org>
Reviewed-by: Pawel Osciak <posciak@chromium.org>
Cr-Commit-Position: refs/heads/master@{#589874}

content/renderer/media/webrtc/rtc_video_encoder.cc

@@ -323,7 +323,11 @@ void RTCVideoEncoder::Impl::CreateAndInitializeVEA(
   }
   input_visible_size_ = input_visible_size;
   const media::VideoEncodeAccelerator::Config config(
-      media::PIXEL_FORMAT_I420, input_visible_size_, profile, bitrate * 1000);
+      media::PIXEL_FORMAT_I420, input_visible_size_, profile, bitrate * 1000,
+      base::nullopt, base::nullopt,
+      video_content_type_ == webrtc::VideoContentType::SCREENSHARE
+          ? media::VideoEncodeAccelerator::Config::ContentType::kDisplay
+          : media::VideoEncodeAccelerator::Config::ContentType::kCamera);
   if (!video_encoder_->Initialize(config, this)) {
     LogAndNotifyError(FROM_HERE, "Error initializing video_encoder",
                       media::VideoEncodeAccelerator::kInvalidArgumentError);

media/gpu/vaapi/vaapi_video_encode_accelerator.cc

@@ -220,6 +220,12 @@ bool VaapiVideoEncodeAccelerator::Initialize(const Config& config,
     return false;
   }
 
+  if (codec_ == kCodecVP8 &&
+      config.content_type == Config::ContentType::kDisplay) {
+    VLOGF(1) << "Vaapi VP8 encoder does not currently support screen content.";
+    return false;
+  }
+
   if (config.input_format != PIXEL_FORMAT_I420) {
     VLOGF(1) << "Unsupported input format: "
              << VideoPixelFormatToString(config.input_format);