Merge ~hectorcao/chromium-browser:dev-update-from-intel into ~chromium-team/chromium-browser/+git/snap-from-source:hwacc-beta

[Hector CAO]

Update chromium flags and patch

New topic : https://chromium-review.googlesource.com/q/topic:%22le-tot%22
Fix the issue of one-copy that breaks chromium on GNOME/XOrg

[Nathan Teodosio (nteodosio)]

There are no actual changes in

- enable-vda-video-encoder-on-wayland.diff
- linux-unstable-deb.diff

Why are they included?

[Nathan Teodosio (nteodosio)]

review: Needs Information

[Hector CAO (hectorcao)]

> There are no actual changes in
>
> - enable-vda-video-encoder-on-wayland.diff
> - linux-unstable-deb.diff
>
> Why are they included?

They should have changes, at least in git commit hash, i will fix

[Nathan Teodosio (nteodosio)]

Yes, their changes are only commit hashes and such metadata, I think it is potentially confusing in the future to read git logs and such that those will show up as changes.

[Hector CAO (hectorcao)]

> Yes, their changes are only commit hashes and such metadata, I think it is
> potentially confusing in the future to read git logs and such that those will
> show up as changes.

I double checked, in fact, it was intentional, i want to use the patches as they are in the topic (commit hashes and metadata), it is easier for us to follow.

diff --git a/build/chromium-patches/optimization/topic-intel/ad27bcd:one-copy.diff b/build/chromium-patches/optimization/topic-intel/1937d60:one-copy.diff
similarity index 86%
rename from build/chromium-patches/optimization/topic-intel/ad27bcd:one-copy.diff
rename to build/chromium-patches/optimization/topic-intel/1937d60:one-copy.diff
index 869ceab..7f589b5 100644
--- a/build/chromium-patches/optimization/topic-intel/ad27bcd:one-copy.diff
+++ b/build/chromium-patches/optimization/topic-intel/1937d60:one-copy.diff
@@ -1,21 +1,20 @@
-From ad27bcdb6b8a38d3ec0a7b7dabc9f81a82c4f26c Mon Sep 17 00:00:00 2001
+From 1937d6067bf5b24728b64e5f09f07c00dc348073 Mon Sep 17 00:00:00 2001
 From: Yaowei Zhou <[e-mail]>
-Date: Fri, 03 Mar 2023 09:56:09 +0800
-Subject: [PATCH] Add One-copy for Linux Video Capture
+Date: Thu, 20 Apr 2023 13:31:34 +0800
+Subject: [PATCH] [Duplicate] Add the one-copy for Linux* video capture
 
-Enable the gpu memory buffer with NV12 format of Linux camera capture path for local view and video encode.
+Duplicate the "Add one-copy for Linux* video capture" before upstream
+done.
 
-Design Doc: https://docs.google.com/document/d/1_9ABHX-effg5WD5sC3J1mDXiYaU4zZnf/edit
-
-Bug: 1374150
-Change-Id: I3afff1c45f47e7c7141bd4bdcdf1811ea0906349
+Bug: N/A
+Change-Id: Idfe932f495dd717954b596ef5c49981de510e382
 ---
 
 diff --git a/content/browser/utility_process_host.cc b/content/browser/utility_process_host.cc
-index fe0b513..77cdee8 100644
+index d2bd22ce..6e29181 100644
 --- a/content/browser/utility_process_host.cc
 +++ b/content/browser/utility_process_host.cc
-@@ -60,6 +60,11 @@
+@@ -69,6 +69,11 @@
  #include "media/capture/capture_switches.h"
  #endif
  
@@ -26,11 +25,12 @@ index fe0b513..77cdee8 100644
 +
  namespace content {
  
- UtilityMainThreadFactoryFunction g_utility_main_thread_factory = nullptr;
-@@ -355,6 +360,17 @@
-     file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload());
- #endif  // BUILDFLAG(IS_POSIX)
- 
+ namespace {
+@@ -408,6 +413,16 @@
+       file_data_->files_to_preload[kNetworkContextParentDirsDescriptor] =
+           PassNetworkContextParentDirs(std::move(network_context_parent_dirs));
+     }
++#endif
 +#if BUILDFLAG(IS_LINUX)
 +    if (metrics_name_ == video_capture::mojom::VideoCaptureService::Name_) {
 +      if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ -40,16 +40,14 @@ index fe0b513..77cdee8 100644
 +        cmd_line->AppendSwitch(switches::kVideoCaptureUseGpuMemoryBuffer);
 +      }
 +    }
-+#endif
-+
+ #endif  // BUILDFLAG(IS_LINUX)
+ 
      std::unique_ptr<UtilitySandboxedProcessLauncherDelegate> delegate =
-         std::make_unique<UtilitySandboxedProcessLauncherDelegate>(
-             sandbox_type_, env_, *cmd_line);
 diff --git a/media/capture/BUILD.gn b/media/capture/BUILD.gn
-index 3e6bfcb..76c9384 100644
+index b56936b..3d88a96 100644
 --- a/media/capture/BUILD.gn
 +++ b/media/capture/BUILD.gn
-@@ -274,6 +274,17 @@
+@@ -272,6 +272,17 @@
      ]
    }
  
@@ -68,11 +66,11 @@ index 3e6bfcb..76c9384 100644
      sources += [
        "video/chromeos/camera_3a_controller.cc",
 diff --git a/media/capture/video/linux/v4l2_capture_delegate.cc b/media/capture/video/linux/v4l2_capture_delegate.cc
-index c447d607..a72e9e3 100644
+index 864111f..c44cbfd 100644
 --- a/media/capture/video/linux/v4l2_capture_delegate.cc
 +++ b/media/capture/video/linux/v4l2_capture_delegate.cc
-@@ -23,8 +23,10 @@
- #include "media/base/bind_to_current_loop.h"
+@@ -22,8 +22,10 @@
+ #include "build/build_config.h"
  #include "media/base/video_frame.h"
  #include "media/base/video_types.h"
 +#include "media/capture/capture_switches.h"
@@ -82,7 +80,7 @@ index c447d607..a72e9e3 100644
  #include "media/capture/video/linux/video_capture_device_linux.h"
  
  using media::mojom::MeteringMode;
-@@ -248,7 +250,12 @@
+@@ -265,7 +267,12 @@
        device_fd_(v4l2),
        is_capturing_(false),
        timeout_count_(0),
@@ -96,7 +94,7 @@ index c447d607..a72e9e3 100644
  
  void V4L2CaptureDelegate::AllocateAndStart(
      int width,
-@@ -366,7 +373,6 @@
+@@ -383,7 +390,6 @@
                                       video_fmt_.fmt.pix.height);
    capture_format_.frame_rate = frame_rate;
    capture_format_.pixel_format = pixel_format;
@@ -104,7 +102,7 @@ index c447d607..a72e9e3 100644
    if (!StartStream())
      return;
  
-@@ -950,10 +956,17 @@
+@@ -1110,10 +1116,17 @@
        // matrix = v4l2_format->fmt.pix.ycbcr_enc;
        // transfer = v4l2_format->fmt.pix.xfer_func;
        // See http://crbug.com/959919.
@@ -127,10 +125,10 @@ index c447d607..a72e9e3 100644
  
      while (!take_photo_callbacks_.empty()) {
 diff --git a/media/capture/video/linux/v4l2_capture_delegate.h b/media/capture/video/linux/v4l2_capture_delegate.h
-index a237df51..f3cb693 100644
+index c9be3d0..38d54b2 100644
 --- a/media/capture/video/linux/v4l2_capture_delegate.h
 +++ b/media/capture/video/linux/v4l2_capture_delegate.h
-@@ -138,6 +138,12 @@
+@@ -144,6 +144,12 @@
    // Clockwise rotation in degrees. This value should be 0, 90, 180, or 270.
    int rotation_;
  
@@ -805,10 +803,10 @@ index 1756e1d..331336d 100644
        return nullptr;
  #endif
 diff --git a/third_party/blink/renderer/platform/video_capture/video_capture_impl.cc b/third_party/blink/renderer/platform/video_capture/video_capture_impl.cc
-index cb0e699..57b8207 100644
+index 1a826c9..a7832df 100644
 --- a/third_party/blink/renderer/platform/video_capture/video_capture_impl.cc
 +++ b/third_party/blink/renderer/platform/video_capture/video_capture_impl.cc
-@@ -534,6 +534,7 @@
+@@ -539,6 +539,7 @@
    } else {
      planes.push_back(gfx::BufferPlane::DEFAULT);
    }
@@ -816,26 +814,8 @@ index cb0e699..57b8207 100644
    for (size_t plane = 0; plane < planes.size(); ++plane) {
      if (should_recreate_shared_image ||
          buffer_context_->gmb_resources()->mailboxes[plane].IsZero()) {
-@@ -551,8 +552,15 @@
-   }
- 
-   const unsigned texture_target =
--      buffer_context_->gpu_factories()->ImageTextureTarget(
--          gpu_memory_buffer_->GetFormat());
-+#if BUILDFLAG(IS_LINUX)
-+      // Explicitly set GL_TEXTURE_EXTERNAL_OES since ImageTextureTarget() will
-+      // return GL_TEXTURE_2D due to GMB factory not supporting NV12 GMBs.
-+      (frame_info_->pixel_format == media::PIXEL_FORMAT_NV12)
-+          ? GL_TEXTURE_EXTERNAL_OES
-+          :
-+#endif
-+          buffer_context_->gpu_factories()->ImageTextureTarget(
-+              gpu_memory_buffer_->GetFormat());
- 
-   const gpu::SyncToken sync_token = sii->GenVerifiedSyncToken();
- 
 diff --git a/ui/ozone/public/ozone_platform.cc b/ui/ozone/public/ozone_platform.cc
-index 0243f94..50347f0f 100644
+index 6c4ce21..17c100c 100644
 --- a/ui/ozone/public/ozone_platform.cc
 +++ b/ui/ozone/public/ozone_platform.cc
 @@ -91,6 +91,19 @@
@@ -859,10 +839,10 @@ index 0243f94..50347f0f 100644
  OzonePlatform* OzonePlatform::GetInstance() {
    DCHECK(g_instance) << "OzonePlatform is not initialized";
 diff --git a/ui/ozone/public/ozone_platform.h b/ui/ozone/public/ozone_platform.h
-index ecfc348..2035034 100644
+index f61ffe9..4720e7e6 100644
 --- a/ui/ozone/public/ozone_platform.h
 +++ b/ui/ozone/public/ozone_platform.h
-@@ -245,6 +245,12 @@
+@@ -241,6 +241,12 @@
    // provided by |args| as with InitalizeForUI.
    static void InitializeForGPU(const InitParams& args);
  
diff --git a/build/chromium-patches/optimization/topic-intel/bb6aa463:linux-unstable-deb.diff b/build/chromium-patches/optimization/topic-intel/22fe045d:linux-unstable-deb.diff
similarity index 79%
rename from build/chromium-patches/optimization/topic-intel/bb6aa463:linux-unstable-deb.diff
rename to build/chromium-patches/optimization/topic-intel/22fe045d:linux-unstable-deb.diff
index f4f2756..4ae23e0 100644
--- a/build/chromium-patches/optimization/topic-intel/bb6aa463:linux-unstable-deb.diff
+++ b/build/chromium-patches/optimization/topic-intel/22fe045d:linux-unstable-deb.diff
@@ -1,10 +1,10 @@
-From bb6aa4636c23e2e0625a3918ea14995f30aebf01 Mon Sep 17 00:00:00 2001
+From 22fe045deac0551720d7292022f443b22703f336 Mon Sep 17 00:00:00 2001
 From: Yaowei Zhou <[e-mail]>
-Date: Thu, 02 Feb 2023 14:28:54 +0800
-Subject: [PATCH] Enable linux:unstable_deb build target when using the chromium minigbm
+Date: Thu, 20 Apr 2023 14:37:26 +0800
+Subject: [PATCH] Enable "linux:unstable_deb" build target when using the chromium minigbm
 
-Bug:N/A
-Change-Id: Ied6a2d4a8aace6db581d97819e4ce7a346ebd93f
+Bug: N/A
+Change-Id: Ic37059be0f0719895acdba756292aed71820feba
 ---
 
 diff --git a/third_party/minigbm/BUILD.gn b/third_party/minigbm/BUILD.gn
diff --git a/build/chromium-patches/optimization/topic-intel/a45401f:vaapi-flag-ozone-wayland.diff b/build/chromium-patches/optimization/topic-intel/4ed5da1:vaapi-flag-ozone-wayland.diff
similarity index 63%
rename from build/chromium-patches/optimization/topic-intel/a45401f:vaapi-flag-ozone-wayland.diff
rename to build/chromium-patches/optimization/topic-intel/4ed5da1:vaapi-flag-ozone-wayland.diff
index cee3f65..a397b19 100644
--- a/build/chromium-patches/optimization/topic-intel/a45401f:vaapi-flag-ozone-wayland.diff
+++ b/build/chromium-patches/optimization/topic-intel/4ed5da1:vaapi-flag-ozone-wayland.diff
@@ -1,6 +1,6 @@
-From a45401f804db438f5b82425a6fef1061352f0cdd Mon Sep 17 00:00:00 2001
-From: Yaowei Zhou <[e-mail]>
-Date: Thu, 02 Feb 2023 14:18:34 +0800
+From 4ed5da1e7e297cc3872594cec173626e78c570e7 Mon Sep 17 00:00:00 2001
+From: Jianhui Dai <[e-mail]>
+Date: Thu, 14 Jul 2022 13:07:06 +0800
 Subject: [PATCH] Enable VA-API flag on ozone wayland
 
 Bug: POC
@@ -8,12 +8,12 @@ Change-Id: I09f696bfe3be82930161ce005152d1397b93f636
 ---
 
 diff --git a/ui/ozone/platform/wayland/ozone_platform_wayland.cc b/ui/ozone/platform/wayland/ozone_platform_wayland.cc
-index b3190c6b..4a2c3bb 100644
+index b8f90a13..2181192e 100644
 --- a/ui/ozone/platform/wayland/ozone_platform_wayland.cc
 +++ b/ui/ozone/platform/wayland/ozone_platform_wayland.cc
-@@ -309,6 +309,8 @@
-       properties->supports_global_screen_coordinates =
-           features::IsWaylandScreenCoordinatesEnabled();
+@@ -289,6 +289,8 @@
+       // arbitrary position.
+       properties->supports_global_screen_coordinates = false;
  
 +      properties->supports_vaapi = true;
 +
diff --git a/build/chromium-patches/optimization/topic-intel/8c5c7f51:zero-copy.diff b/build/chromium-patches/optimization/topic-intel/7be5b21:zero-copy.diff
similarity index 92%
rename from build/chromium-patches/optimization/topic-intel/8c5c7f51:zero-copy.diff
rename to build/chromium-patches/optimization/topic-intel/7be5b21:zero-copy.diff
index e951643..62764df 100644
--- a/build/chromium-patches/optimization/topic-intel/8c5c7f51:zero-copy.diff
+++ b/build/chromium-patches/optimization/topic-intel/7be5b21:zero-copy.diff
@@ -1,6 +1,6 @@
-From 8c5c7f5180416d5f60929189dd05898bdb6ff32b Mon Sep 17 00:00:00 2001
+From 7be5b21e310c658761cbff3376c2f32f9fd964bb Mon Sep 17 00:00:00 2001
 From: Yaowei Zhou <[e-mail]>
-Date: Fri, 03 Mar 2023 11:56:08 +0800
+Date: Thu, 20 Apr 2023 14:08:51 +0800
 Subject: [PATCH] Add the zero-copy for Linux* video capture
 
 Add the zero-copy supporting for video capture pipeline.
@@ -10,10 +10,10 @@ Change-Id: Ic9bd08a94b79731750529b35a99f700fcc815e6c
 ---
 
 diff --git a/media/capture/BUILD.gn b/media/capture/BUILD.gn
-index 76c9384..752ffac 100644
+index 3d88a96..1765c49 100644
 --- a/media/capture/BUILD.gn
 +++ b/media/capture/BUILD.gn
-@@ -278,6 +278,10 @@
+@@ -276,6 +276,10 @@
      sources += [
        "video/linux/v4l2_capture_delegate_gpu_helper.cc",
        "video/linux/v4l2_capture_delegate_gpu_helper.h",
@@ -25,10 +25,10 @@ index 76c9384..752ffac 100644
        "video/linux/v4l2_gpu_memory_buffer_factory.h",
        "video/linux/v4l2_gpu_memory_buffer_tracker.cc",
 diff --git a/media/capture/video/linux/v4l2_capture_delegate.cc b/media/capture/video/linux/v4l2_capture_delegate.cc
-index a72e9e3..638e9e9 100644
+index c44cbfd..bd47ee3 100644
 --- a/media/capture/video/linux/v4l2_capture_delegate.cc
 +++ b/media/capture/video/linux/v4l2_capture_delegate.cc
-@@ -27,6 +27,7 @@
+@@ -26,6 +26,7 @@
  #include "media/capture/mojom/image_capture_types.h"
  #include "media/capture/video/blob_utils.h"
  #include "media/capture/video/linux/v4l2_capture_delegate_gpu_helper.h"
@@ -36,7 +36,7 @@ index a72e9e3..638e9e9 100644
  #include "media/capture/video/linux/video_capture_device_linux.h"
  
  using media::mojom::MeteringMode;
-@@ -52,7 +53,7 @@
+@@ -51,7 +52,7 @@
  // buffers by v4l2 driver can be higher or lower than this number.
  // kNumVideoBuffers should not be too small, or Chrome may not return enough
  // buffers back to driver in time.
@@ -45,7 +45,7 @@ index a72e9e3..638e9e9 100644
  // Timeout in milliseconds v4l2_thread_ blocks waiting for a frame from the hw.
  // This value has been fine tuned. Before changing or modifying it see
  // https://crbug.com/470717
-@@ -65,6 +66,11 @@
+@@ -64,6 +65,11 @@
  // Typical framerate, in fps
  constexpr int kTypicalFramerate = 30;
  
@@ -57,7 +57,7 @@ index a72e9e3..638e9e9 100644
  // V4L2 color formats supported by V4L2CaptureDelegate derived classes.
  // This list is ordered by precedence of use -- but see caveats for MJPEG.
  struct {
-@@ -186,6 +192,7 @@
+@@ -203,6 +209,7 @@
      DCHECK_LE(payload_size, length_);
      payload_size_ = payload_size;
    }
@@ -65,7 +65,7 @@ index a72e9e3..638e9e9 100644
  
   private:
    friend class base::RefCounted<BufferTracker>;
-@@ -251,7 +258,8 @@
+@@ -268,7 +275,8 @@
        is_capturing_(false),
        timeout_count_(0),
        rotation_(rotation),
@@ -75,7 +75,7 @@ index a72e9e3..638e9e9 100644
    if (use_gpu_buffer_) {
      v4l2_gpu_helper_ = std::make_unique<V4L2CaptureDelegateGpuHelper>(this);
    }
-@@ -297,6 +305,20 @@
+@@ -314,6 +322,20 @@
      return;
    }
  
@@ -96,7 +96,7 @@ index a72e9e3..638e9e9 100644
    // Get supported video formats in preferred order. For large resolutions,
    // favour mjpeg over raw formats.
    const std::vector<uint32_t>& desired_v4l2_formats =
-@@ -315,8 +337,8 @@
+@@ -332,8 +354,8 @@
    }
  
    DVLOG(1) << "Chosen pixel format is " << FourccToString(*best);
@@ -106,7 +106,7 @@ index a72e9e3..638e9e9 100644
    if (DoIoctl(VIDIOC_S_FMT, &video_fmt_) < 0) {
      SetErrorState(VideoCaptureError::kV4L2FailedToSetVideoCaptureFormat,
                    FROM_HERE, "Failed to set video capture format");
-@@ -388,6 +410,11 @@
+@@ -405,6 +427,11 @@
    TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("video_and_image_capture"),
                 "V4L2CaptureDelegate::StopAndDeAllocate");
    StopStream();
@@ -118,7 +118,7 @@ index a72e9e3..638e9e9 100644
    // At this point we can close the device.
    // This is also needed for correctly changing settings later via VIDIOC_S_FMT.
    device_fd_.reset();
-@@ -672,7 +699,11 @@
+@@ -731,7 +758,11 @@
    return weak_factory_.GetWeakPtr();
  }
  
@@ -131,7 +131,7 @@ index a72e9e3..638e9e9 100644
  
  bool V4L2CaptureDelegate::RunIoctl(int request, void* argp) {
    int num_retries = 0;
-@@ -914,7 +945,9 @@
+@@ -1074,7 +1105,9 @@
        return;
      }
  
@@ -142,7 +142,7 @@ index a72e9e3..638e9e9 100644
      const scoped_refptr<BufferTracker>& buffer_tracker =
          buffer_tracker_pool_[buffer.index];
  
-@@ -957,10 +990,9 @@
+@@ -1117,10 +1150,9 @@
        // transfer = v4l2_format->fmt.pix.xfer_func;
        // See http://crbug.com/959919.
        if (use_gpu_buffer_) {
@@ -156,7 +156,7 @@ index a72e9e3..638e9e9 100644
        } else {
          client_->OnIncomingCapturedData(
              buffer_tracker->start(), buffer_tracker->payload_size(),
-@@ -980,11 +1012,12 @@
+@@ -1140,11 +1172,12 @@
        if (blob)
          std::move(cb).Run(std::move(blob));
      }
@@ -174,7 +174,7 @@ index a72e9e3..638e9e9 100644
      }
    }
  
-@@ -1028,14 +1061,52 @@
+@@ -1188,14 +1221,52 @@
    client_->OnError(error, from_here, reason);
  }
  
@@ -231,7 +231,7 @@ index a72e9e3..638e9e9 100644
  }
  
  bool V4L2CaptureDelegate::BufferTracker::Init(int fd,
-@@ -1055,4 +1126,13 @@
+@@ -1215,4 +1286,13 @@
    return true;
  }
  
@@ -246,10 +246,10 @@ index a72e9e3..638e9e9 100644
 +
  }  // namespace media
 diff --git a/media/capture/video/linux/v4l2_capture_delegate.h b/media/capture/video/linux/v4l2_capture_delegate.h
-index f3cb693..a137716 100644
+index 38d54b2..0c4ceab 100644
 --- a/media/capture/video/linux/v4l2_capture_delegate.h
 +++ b/media/capture/video/linux/v4l2_capture_delegate.h
-@@ -114,6 +114,15 @@
+@@ -120,6 +120,15 @@
                       const base::Location& from_here,
                       const std::string& reason);
  
@@ -265,7 +265,7 @@ index f3cb693..a137716 100644
    const raw_ptr<V4L2CaptureDevice> v4l2_;
    const scoped_refptr<base::SingleThreadTaskRunner> v4l2_task_runner_;
    const VideoCaptureDeviceDescriptor device_descriptor_;
-@@ -142,6 +151,7 @@
+@@ -148,6 +157,7 @@
    class V4L2CaptureDelegateGpuHelper;
    friend class V4L2CaptureDelegateGpuHelper;
    bool use_gpu_buffer_;
@@ -382,7 +382,7 @@ index b1e9b95..80c7710b 100644
      const uint8_t* sample,
      size_t sample_size,
 diff --git a/media/capture/video/linux/v4l2_capture_delegate_gpu_helper.h b/media/capture/video/linux/v4l2_capture_delegate_gpu_helper.h
-index a627a85..505ce9e 100644
+index a627a85..b519d42 100644
 --- a/media/capture/video/linux/v4l2_capture_delegate_gpu_helper.h
 +++ b/media/capture/video/linux/v4l2_capture_delegate_gpu_helper.h
 @@ -35,6 +35,16 @@
@@ -402,6 +402,15 @@ index a627a85..505ce9e 100644
   private:
    int CovertCaptureDataToNV12(const uint8_t* sample,
                                size_t sample_size,
+@@ -62,7 +72,7 @@
+   bool IsNV12ConvertSupported(uint32_t fourcc);
+ 
+  private:
+-  V4L2CaptureDelegate* v4l2_delegate_;
++  const raw_ptr<V4L2CaptureDelegate> v4l2_delegate_;
+   gpu::GpuMemoryBufferSupport gmb_support_;
+   std::vector<uint8_t> i420_buffer_;
+ };
 diff --git a/media/capture/video/linux/v4l2_external_buffer_cache.cc b/media/capture/video/linux/v4l2_external_buffer_cache.cc
 new file mode 100644
 index 0000000..34c274c
diff --git a/build/chromium-patches/optimization/topic-intel/b4e98991:enable-vda-video-encoder-on-wayland.diff b/build/chromium-patches/optimization/topic-intel/8cd198e4:enable-vda-video-encoder-on-wayland.diff
similarity index 90%
rename from build/chromium-patches/optimization/topic-intel/b4e98991:enable-vda-video-encoder-on-wayland.diff
rename to build/chromium-patches/optimization/topic-intel/8cd198e4:enable-vda-video-encoder-on-wayland.diff
index d4d85f3..538d1ce 100644
--- a/build/chromium-patches/optimization/topic-intel/b4e98991:enable-vda-video-encoder-on-wayland.diff
+++ b/build/chromium-patches/optimization/topic-intel/8cd198e4:enable-vda-video-encoder-on-wayland.diff
@@ -1,10 +1,10 @@
-From b4e989917b60717230f92546eeff5c090df9dc2c Mon Sep 17 00:00:00 2001
+From 8cd198e4e280faeda02b2cafe9eb876f007d4060 Mon Sep 17 00:00:00 2001
 From: Yaowei Zhou <[e-mail]>
-Date: Mon, 03 Apr 2023 15:37:02 +0800
+Date: Thu, 20 Apr 2023 14:29:16 +0800
 Subject: [PATCH] Enable the VDAVideoDecoder on the wayland
 
 Bug: N/A
-Change-Id: If4044b552e3d802ea48690365e1a1d63d35b1f51
+Change-Id: I3f2629e274cbe26034964e39b4679fe083945131
 ---
 
 diff --git a/media/gpu/vaapi/vaapi_picture_factory.cc b/media/gpu/vaapi/vaapi_picture_factory.cc
diff --git a/build/chromium-patches/optimization/topic-intel/5df4976:dynamic-check-nv12.diff b/build/chromium-patches/optimization/topic-intel/faf232f:dynamic-check-nv12.diff
similarity index 89%
rename from build/chromium-patches/optimization/topic-intel/5df4976:dynamic-check-nv12.diff
rename to build/chromium-patches/optimization/topic-intel/faf232f:dynamic-check-nv12.diff
index 9e5cd7f..109ad56 100644
--- a/build/chromium-patches/optimization/topic-intel/5df4976:dynamic-check-nv12.diff
+++ b/build/chromium-patches/optimization/topic-intel/faf232f:dynamic-check-nv12.diff
@@ -1,17 +1,17 @@
-From 5df4976fd3be9e20d6bad09d23e197ca393b573b Mon Sep 17 00:00:00 2001
+From faf232fb0b19219e5f112f26d50714f6c575b93f Mon Sep 17 00:00:00 2001
 From: Yaowei Zhou <[e-mail]>
-Date: Thu, 02 Feb 2023 14:22:34 +0800
-Subject: [PATCH] Dynamic fallback to system memory when failed to allocate NV12 GPU memory buffer
+Date: Wed, 19 Apr 2023 16:52:32 +0800
+Subject: [PATCH] Dynamic fallback to system memory when failed to allocate NV12 buffer
 
 Bug: N/A
-Change-Id: I8ba75b3981ebb890662d2a3b3981c0578d0f6ec7
+Change-Id: I88b553ff4bdc1ea59aaa3cc47948ca6648c87d0c
 ---
 
 diff --git a/content/browser/gpu/gpu_memory_buffer_manager_singleton.cc b/content/browser/gpu/gpu_memory_buffer_manager_singleton.cc
-index 668fcf8..5aa1fa7c 100644
+index b3e46e9..e175b29 100644
 --- a/content/browser/gpu/gpu_memory_buffer_manager_singleton.cc
 +++ b/content/browser/gpu/gpu_memory_buffer_manager_singleton.cc
-@@ -21,6 +21,10 @@
+@@ -22,6 +22,10 @@
  #include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
  #endif
  
@@ -22,11 +22,12 @@ index 668fcf8..5aa1fa7c 100644
  namespace content {
  namespace {
  
-@@ -52,6 +56,23 @@
- #endif
+@@ -76,8 +80,23 @@
+ 
+   return supported;
  }
+-#endif  // BUILDFLAG(IS_LINUX)
  
-+#if BUILDFLAG(IS_LINUX)
 +// Dynamic check NV12 format support as supported format inconsistent in
 +// system and chromium miniGBM
 +void DynamicUpdateVideoCaptureUseGpuMemoryBuffer(bool support_nv12) {
@@ -46,7 +47,7 @@ index 668fcf8..5aa1fa7c 100644
  }  // namespace
  
  GpuMemoryBufferManagerSingleton::GpuMemoryBufferManagerSingleton(int client_id)
-@@ -79,6 +100,12 @@
+@@ -105,6 +124,12 @@
  }
  
  void GpuMemoryBufferManagerSingleton::OnGpuExtraInfoUpdate() {
@@ -58,7 +59,7 @@ index 668fcf8..5aa1fa7c 100644
 +
  #if defined(USE_OZONE_PLATFORM_X11)
    // X11 fetches buffer formats on gpu and passes them via gpu extra info.
-   if (!ShouldSetBufferFormatsFromGpuExtraInfo())
+   if (ShouldSetBufferFormatsFromGpuExtraInfo()) {
 diff --git a/ui/gfx/gpu_extra_info.h b/ui/gfx/gpu_extra_info.h
 index e8fa594..d1edbfea 100644
 --- a/ui/gfx/gpu_extra_info.h
@@ -75,10 +76,10 @@ index e8fa594..d1edbfea 100644
  
  }  // namespace gfx
 diff --git a/ui/gfx/mojom/BUILD.gn b/ui/gfx/mojom/BUILD.gn
-index 055d205..0fec929 100644
+index b511389..07063be 100644
 --- a/ui/gfx/mojom/BUILD.gn
 +++ b/ui/gfx/mojom/BUILD.gn
-@@ -49,7 +49,9 @@
+@@ -51,7 +51,9 @@
    if (ozone_platform_x11) {
      enabled_features += [ "enable_x11_params" ]
    }
@@ -171,7 +172,7 @@ index b3e92d8..dc982f3 100644
  bool WaylandGLEGLUtility::X11DoesVisualHaveAlphaForTest() const {
    return false;
 diff --git a/ui/ozone/platform/x11/gl_egl_utility_x11.cc b/ui/ozone/platform/x11/gl_egl_utility_x11.cc
-index 58c7fe6..0eb5608 100644
+index 58c7fe6..06b8ad7 100644
 --- a/ui/ozone/platform/x11/gl_egl_utility_x11.cc
 +++ b/ui/ozone/platform/x11/gl_egl_utility_x11.cc
 @@ -12,6 +12,10 @@
@@ -191,7 +192,7 @@ index 58c7fe6..0eb5608 100644
    }
 +#if BUILDFLAG(IS_LINUX)
 +  gpu_extra_info.gpu_memory_buffer_support_NV12 = base::ranges::any_of(
-+      ui::GpuMemoryBufferSupportX11::GetInstance()->supported_configs(),
++      gpu_extra_info.gpu_memory_buffer_support_x11,
 +      [](gfx::BufferUsageAndFormat other) {
 +        return other.format == gfx::BufferFormat::YUV_420_BIPLANAR &&
 +               other.usage == gfx::BufferUsage::GPU_READ_CPU_READ_WRITE;
diff --git a/build/chromium-patches/series b/build/chromium-patches/series
index e9bf227..4cb01b8 100644
--- a/build/chromium-patches/series
+++ b/build/chromium-patches/series
@@ -1,11 +1,11 @@
 optimization/internal:include-libva-config.patch
 optimization/internal:fix-dri-loading.diff
-optimization/topic-intel/5df4976:dynamic-check-nv12.diff
-optimization/topic-intel/a45401f:vaapi-flag-ozone-wayland.diff
-optimization/topic-intel/ad27bcd:one-copy.diff
-optimization/topic-intel/bb6aa463:linux-unstable-deb.diff
-optimization/topic-intel/8c5c7f51:zero-copy.diff
-optimization/topic-intel/b4e98991:enable-vda-video-encoder-on-wayland.diff
+optimization/topic-intel/faf232f:dynamic-check-nv12.diff
+optimization/topic-intel/4ed5da1:vaapi-flag-ozone-wayland.diff
+optimization/topic-intel/1937d60:one-copy.diff
+optimization/topic-intel/22fe045d:linux-unstable-deb.diff
+optimization/topic-intel/7be5b21:zero-copy.diff
+optimization/topic-intel/8cd198e4:enable-vda-video-encoder-on-wayland.diff
 title-bar-default-system.patch-v35
 search-credit.patch
 snap-policies-path.patch
diff --git a/launcher/chromium.launcher b/launcher/chromium.launcher
index 2a47614..ef4cd2a 100755
--- a/launcher/chromium.launcher
+++ b/launcher/chromium.launcher
@@ -140,14 +140,11 @@ if [ $WANT_HEADLESS -eq 0 ] ; then
 fi
 
 # Add necessary flags for VAAPI video en/decoding
-CHROMIUM_VAAPI_FLAGS='--enable-features=VaapiVideoDecoder,VaapiVideoEncoder,VaapiVideoDecodeLinuxGL,UseChromeOSDirectVideoDecoder'
+CHROMIUM_VAAPI_FLAGS='--use-gl=angle --use-angle=gl --enable-features=VaapiVideoDecoder,VaapiVideoEncoder,VaapiVideoDecodeLinuxGL,UseChromeOSDirectVideoDecoder'
 CHROMIUM_ONECOPY_FLAGS="--video-capture-use-gpu-memory-buffer"
-if [ -n "$WAYLAND_DISPLAY" ]; then
-    CHROMIUM_FLAGS="--ozone-platform=wayland $CHROMIUM_FLAGS"
-fi
-CHROMIUM_MPO_FLAGS="--enable-hardware-overlays=\"\""
+CHROMIUM_OZONE_FLAGS="--ozone-platform-hint=auto"
 
-CHROMIUM_FLAGS="$CHROMIUM_VAAPI_FLAGS $CHROMIUM_ONECOPY_FLAGS $CHROMIUM_MPO_FLAGS $CHROMIUM_FLAGS"
+CHROMIUM_FLAGS="$CHROMIUM_OZONE_FLAGS $CHROMIUM_VAAPI_FLAGS $CHROMIUM_ONECOPY_FLAGS $CHROMIUM_FLAGS"
 
 # GlobalVaapiLock : webRTC optimization
 CHROMIUM_FLAGS="--disable-features=TFLiteLanguageDetectionEnabled,GlobalVaapiLock $CHROMIUM_FLAGS"