vaapi deco cleanup: extract VaapiDecodeSurface into its own file

This CL extracts VaapiDecodeSurface out of VaapiVideoDecodeAccelerator
into a file on its own, because vaapi_video_decode_accelerator.cc is
quite large at 1902 lines.

It also introduces =default and adds DISALLOW_COPY_AND_ASSIGN to the
extracted class. Otherwise no new code, just moving things around.

There's also a side bonus: VaapiVideoDecodeAccelerator::VaapiDecodeSurface
uses are shortened in vaapi_video_decode_accelerator.

Test: Compile and run in simplechrome on soraka. Ran vp8, vp9
videos of crosvideo.appspot.com, verified GpuVideoDecoder engaged.

Bug: 717265
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: Ibd7c88357b2f993a5d72e45f65dfff5d67c4194a
Reviewed-on: https://chromium-review.googlesource.com/922981
Commit-Queue: Miguel Casas <mcasas@chromium.org>
Reviewed-by: Emircan Uysaler <emircan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537201}

media/gpu/vaapi/BUILD.gn

@@ -53,6 +53,8 @@ source_set("vaapi") {
   sources = [
               "va_surface.cc",
               "va_surface.h",
+              "vaapi_decode_surface.cc",
+              "vaapi_decode_surface.h",
               "vaapi_jpeg_decode_accelerator.cc",
               "vaapi_jpeg_decode_accelerator.h",
               "vaapi_jpeg_decoder.cc",

media/gpu/vaapi/vaapi_decode_surface.cc

+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "media/gpu/vaapi/vaapi_decode_surface.h"
+
+namespace media {
+
+VaapiDecodeSurface::VaapiDecodeSurface(
+    int32_t bitstream_id,
+    const scoped_refptr<VASurface>& va_surface)
+    : bitstream_id_(bitstream_id), va_surface_(va_surface) {}
+
+VaapiDecodeSurface::~VaapiDecodeSurface() = default;
+
+}  // namespace media

media/gpu/vaapi/vaapi_decode_surface.h

+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef MEDIA_GPU_VAAPI_VAAPI_DECODE_SURFACE_H_
+#define MEDIA_GPU_VAAPI_VAAPI_DECODE_SURFACE_H_
+
+#include "base/memory/ref_counted.h"
+#include "media/gpu/media_gpu_export.h"
+#include "media/gpu/vaapi/va_surface.h"
+#include "ui/gfx/geometry/rect.h"
+
+namespace media {
+
+// Wrapper of a VASurface with an id and visible area.
+class MEDIA_GPU_EXPORT VaapiDecodeSurface
+    : public base::RefCountedThreadSafe<VaapiDecodeSurface> {
+ public:
+  VaapiDecodeSurface(int32_t bitstream_id,
+                     const scoped_refptr<VASurface>& va_surface);
+
+  int32_t bitstream_id() const { return bitstream_id_; }
+  scoped_refptr<VASurface> va_surface() { return va_surface_; }
+  gfx::Rect visible_rect() const { return visible_rect_; }
+  void set_visible_rect(const gfx::Rect& visible_rect) {
+    visible_rect_ = visible_rect;
+  }
+
+ private:
+  friend class base::RefCountedThreadSafe<VaapiDecodeSurface>;
+  ~VaapiDecodeSurface();
+
+  const int32_t bitstream_id_;
+  const scoped_refptr<VASurface> va_surface_;
+  gfx::Rect visible_rect_;
+
+  DISALLOW_COPY_AND_ASSIGN(VaapiDecodeSurface);
+};
+
+}  // namespace media
+
+#endif  // MEDIA_GPU_VAAPI_VAAPI_DECODE_SURFACE_H_

media/gpu/vaapi/vaapi_video_decode_accelerator.cc

@@ -79,51 +79,18 @@ static void ReportToUMA(VAVDADecoderFailure failure) {
     }                                                              \
   } while (0)
 
-class VaapiVideoDecodeAccelerator::VaapiDecodeSurface
-    : public base::RefCountedThreadSafe<VaapiDecodeSurface> {
- public:
-  VaapiDecodeSurface(int32_t bitstream_id,
-                     const scoped_refptr<VASurface>& va_surface);
-
-  int32_t bitstream_id() const { return bitstream_id_; }
-  scoped_refptr<VASurface> va_surface() { return va_surface_; }
-  gfx::Rect visible_rect() const { return visible_rect_; }
-
-  void set_visible_rect(const gfx::Rect& visible_rect) {
-    visible_rect_ = visible_rect;
-  }
-
- private:
-  friend class base::RefCountedThreadSafe<VaapiDecodeSurface>;
-  ~VaapiDecodeSurface();
-
-  const int32_t bitstream_id_;
-  const scoped_refptr<VASurface> va_surface_;
-  gfx::Rect visible_rect_;
-};
-
-VaapiVideoDecodeAccelerator::VaapiDecodeSurface::VaapiDecodeSurface(
-    int32_t bitstream_id,
-    const scoped_refptr<VASurface>& va_surface)
-    : bitstream_id_(bitstream_id), va_surface_(va_surface) {}
-
-VaapiVideoDecodeAccelerator::VaapiDecodeSurface::~VaapiDecodeSurface() {}
-
 class VaapiH264Picture : public H264Picture {
  public:
-  explicit VaapiH264Picture(
-      scoped_refptr<VaapiVideoDecodeAccelerator::VaapiDecodeSurface> surface)
+  explicit VaapiH264Picture(scoped_refptr<VaapiDecodeSurface> surface)
       : dec_surface_(surface) {}
 
   VaapiH264Picture* AsVaapiH264Picture() override { return this; }
-  scoped_refptr<VaapiVideoDecodeAccelerator::VaapiDecodeSurface> dec_surface() {
-    return dec_surface_;
-  }
+  scoped_refptr<VaapiDecodeSurface> dec_surface() { return dec_surface_; }
 
  private:
   ~VaapiH264Picture() override {}
 
-  scoped_refptr<VaapiVideoDecodeAccelerator::VaapiDecodeSurface> dec_surface_;
+  scoped_refptr<VaapiDecodeSurface> dec_surface_;
 
   DISALLOW_COPY_AND_ASSIGN(VaapiH264Picture);
 };
@@ -178,19 +145,16 @@ class VaapiVideoDecodeAccelerator::VaapiH264Accelerator
 
 class VaapiVP8Picture : public VP8Picture {
  public:
-  explicit VaapiVP8Picture(
-      scoped_refptr<VaapiVideoDecodeAccelerator::VaapiDecodeSurface> surface)
+  explicit VaapiVP8Picture(scoped_refptr<VaapiDecodeSurface> surface)
       : dec_surface_(surface) {}
 
   VaapiVP8Picture* AsVaapiVP8Picture() override { return this; }
-  scoped_refptr<VaapiVideoDecodeAccelerator::VaapiDecodeSurface> dec_surface() {
-    return dec_surface_;
-  }
+  scoped_refptr<VaapiDecodeSurface> dec_surface() { return dec_surface_; }
 
  private:
   ~VaapiVP8Picture() override {}
 
-  scoped_refptr<VaapiVideoDecodeAccelerator::VaapiDecodeSurface> dec_surface_;
+  scoped_refptr<VaapiDecodeSurface> dec_surface_;
 
   DISALLOW_COPY_AND_ASSIGN(VaapiVP8Picture);
 };
@@ -227,19 +191,16 @@ class VaapiVideoDecodeAccelerator::VaapiVP8Accelerator
 
 class VaapiVP9Picture : public VP9Picture {
  public:
-  explicit VaapiVP9Picture(
-      scoped_refptr<VaapiVideoDecodeAccelerator::VaapiDecodeSurface> surface)
+  explicit VaapiVP9Picture(scoped_refptr<VaapiDecodeSurface> surface)
       : dec_surface_(surface) {}
 
   VaapiVP9Picture* AsVaapiVP9Picture() override { return this; }
-  scoped_refptr<VaapiVideoDecodeAccelerator::VaapiDecodeSurface> dec_surface() {
-    return dec_surface_;
-  }
+  scoped_refptr<VaapiDecodeSurface> dec_surface() { return dec_surface_; }
 
  private:
   ~VaapiVP9Picture() override {}
 
-  scoped_refptr<VaapiVideoDecodeAccelerator::VaapiDecodeSurface> dec_surface_;
+  scoped_refptr<VaapiDecodeSurface> dec_surface_;
 
   DISALLOW_COPY_AND_ASSIGN(VaapiVP9Picture);
 };
@@ -1118,8 +1079,7 @@ void VaapiVideoDecodeAccelerator::SurfaceReady(
   TryOutputSurface();
 }
 
-scoped_refptr<VaapiVideoDecodeAccelerator::VaapiDecodeSurface>
-VaapiVideoDecodeAccelerator::CreateSurface() {
+scoped_refptr<VaapiDecodeSurface> VaapiVideoDecodeAccelerator::CreateSurface() {
   DCHECK(decoder_thread_task_runner_->BelongsToCurrentThread());
   base::AutoLock auto_lock(lock_);
 
@@ -1414,9 +1374,9 @@ void VaapiVideoDecodeAccelerator::VaapiH264Accelerator::Reset() {
   vaapi_wrapper_->DestroyPendingBuffers();
 }
 
-scoped_refptr<VaapiVideoDecodeAccelerator::VaapiDecodeSurface>
-VaapiVideoDecodeAccelerator::VaapiH264Accelerator::
-    H264PictureToVaapiDecodeSurface(const scoped_refptr<H264Picture>& pic) {
+scoped_refptr<VaapiDecodeSurface> VaapiVideoDecodeAccelerator::
+    VaapiH264Accelerator::H264PictureToVaapiDecodeSurface(
+        const scoped_refptr<H264Picture>& pic) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   VaapiH264Picture* vaapi_pic = pic->AsVaapiH264Picture();
   CHECK(vaapi_pic);
@@ -1706,9 +1666,9 @@ bool VaapiVideoDecodeAccelerator::VaapiVP8Accelerator::OutputPicture(
   return true;
 }
 
-scoped_refptr<VaapiVideoDecodeAccelerator::VaapiDecodeSurface>
-VaapiVideoDecodeAccelerator::VaapiVP8Accelerator::
-    VP8PictureToVaapiDecodeSurface(const scoped_refptr<VP8Picture>& pic) {
+scoped_refptr<VaapiDecodeSurface> VaapiVideoDecodeAccelerator::
+    VaapiVP8Accelerator::VP8PictureToVaapiDecodeSurface(
+        const scoped_refptr<VP8Picture>& pic) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   VaapiVP8Picture* vaapi_pic = pic->AsVaapiVP8Picture();
   CHECK(vaapi_pic);
@@ -1884,9 +1844,9 @@ bool VaapiVideoDecodeAccelerator::VaapiVP9Accelerator::GetFrameContext(
   return false;
 }
 
-scoped_refptr<VaapiVideoDecodeAccelerator::VaapiDecodeSurface>
-VaapiVideoDecodeAccelerator::VaapiVP9Accelerator::
-    VP9PictureToVaapiDecodeSurface(const scoped_refptr<VP9Picture>& pic) {
+scoped_refptr<VaapiDecodeSurface> VaapiVideoDecodeAccelerator::
+    VaapiVP9Accelerator::VP9PictureToVaapiDecodeSurface(
+        const scoped_refptr<VP9Picture>& pic) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   VaapiVP9Picture* vaapi_pic = pic->AsVaapiVP9Picture();
   CHECK(vaapi_pic);

media/gpu/vaapi/vaapi_video_decode_accelerator.h

@@ -21,7 +21,6 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/linked_ptr.h"
-#include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/condition_variable.h"
@@ -31,6 +30,7 @@
 #include "media/gpu/gpu_video_decode_accelerator_helpers.h"
 #include "media/gpu/media_gpu_export.h"
 #include "media/gpu/shared_memory_region.h"
+#include "media/gpu/vaapi/vaapi_decode_surface.h"
 #include "media/gpu/vaapi/vaapi_picture_factory.h"
 #include "media/gpu/vaapi/vaapi_wrapper.h"
 #include "media/video/picture.h"
@@ -56,9 +56,6 @@ class VaapiPicture;
 class MEDIA_GPU_EXPORT VaapiVideoDecodeAccelerator
     : public VideoDecodeAccelerator {
  public:
-  // Wrapper of a VASurface with id and visible area.
-  class VaapiDecodeSurface;
-
   VaapiVideoDecodeAccelerator(
       const MakeGLContextCurrentCallback& make_context_current_cb,
       const BindGLImageCallback& bind_image_cb);