media/gpu/linux: Remove UnwrapFrame() in DmabufVideoFramePool interface.

The UnwrapFrame() method is only used between PlatformVideoFramePool
and MailboxVideoFrameConverter implementation. It is not a general
method.

This CL moves the method from DmabufVideoFramePool interface to
PlatformVideoFramePool implementation.

BUG=b:136716638
TEST=run video_decode_accelerator_tests on kevin

Change-Id: Icfd5d99fb2319ec904e0d8c298572cb0af1031b4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1824500
Auto-Submit: Chih-Yu Huang <akahuang@chromium.org>
Reviewed-by: Dan Sanders <sandersd@chromium.org>
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
Commit-Queue: Chih-Yu Huang <akahuang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#700068}

media/gpu/linux/dmabuf_video_frame_pool.h

@@ -60,12 +60,6 @@ class MEDIA_GPU_EXPORT DmabufVideoFramePool {
   // would be dropped immediately.
   virtual void NotifyWhenFrameAvailable(base::OnceClosure cb) = 0;
 
-  // Returns the original frame of a wrapped frame. We need this method to
-  // determine whether the frame returned by GetFrame() is the same one after
-  // recycling, and bind destruction callback at original frames.
-  // TODO(akahuang): Find a way to avoid this method.
-  virtual VideoFrame* UnwrapFrame(const VideoFrame& wrapped_frame) = 0;
-
  protected:
   scoped_refptr<base::SequencedTaskRunner> parent_task_runner_;
 };

media/gpu/linux/platform_video_frame_pool.h

@@ -47,9 +47,13 @@ class MEDIA_GPU_EXPORT PlatformVideoFramePool : public DmabufVideoFramePool {
       const gfx::Size& natural_size) override;
   scoped_refptr<VideoFrame> GetFrame() override;
   bool IsExhausted() override;
-  VideoFrame* UnwrapFrame(const VideoFrame& wrapped_frame) override;
   void NotifyWhenFrameAvailable(base::OnceClosure cb) override;
 
+  // Returns the original frame of a wrapped frame. We need this method to
+  // determine whether the frame returned by GetFrame() is the same one after
+  // recycling, and bind destruction callback at original frames.
+  VideoFrame* UnwrapFrame(const VideoFrame& wrapped_frame);
+
  private:
   friend class PlatformVideoFramePoolTest;
 

media/mojo/services/gpu_mojo_media_client.cc

@@ -240,7 +240,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::CreateVideoDecoder(
 #if BUILDFLAG(USE_V4L2_CODEC) || BUILDFLAG(USE_VAAPI)
         auto frame_pool = std::make_unique<PlatformVideoFramePool>();
         auto frame_converter = MailboxVideoFrameConverter::Create(
-            base::BindRepeating(&DmabufVideoFramePool::UnwrapFrame,
+            base::BindRepeating(&PlatformVideoFramePool::UnwrapFrame,
                                 base::Unretained(frame_pool.get())),
             gpu_task_runner_,
             base::BindRepeating(&GetCommandBufferStub, gpu_task_runner_,