Bug 1288618 - Part 10: Add a new layers::Image type for GPUVideo. r=nical

gfx/layers/GPUVideoImage.h

@@ -0,0 +1,57 @@
+/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef GFX_GPU_VIDEO_IMAGE_H
+#define GFX_GPU_VIDEO_IMAGE_H
+
+#include "mozilla/RefPtr.h"
+#include "ImageContainer.h"
+#include "mozilla/layers/GPUVideoTextureClient.h"
+#include "mozilla/layers/CompositableClient.h"
+#include "mozilla/layers/ImageBridgeChild.h"
+
+namespace mozilla {
+namespace layers {
+
+// Image class that refers to a decoded video frame within
+// the GPU process.
+class GPUVideoImage final : public Image {
+public:
+  GPUVideoImage(const SurfaceDescriptorGPUVideo& aSD,
+                const gfx::IntSize& aSize)
+    : Image(nullptr, ImageFormat::GPU_VIDEO)
+    , mSize(aSize)
+  {
+    // Create the TextureClient immediately since the GPUVideoTextureData
+    // is responsible for deallocating the SurfaceDescriptor.
+    mTextureClient =
+      TextureClient::CreateWithData(new GPUVideoTextureData(aSD, aSize),
+                                    TextureFlags::DEFAULT,
+                                    ImageBridgeChild::GetSingleton().get());
+  }
+
+  ~GPUVideoImage() override {}
+
+  gfx::IntSize GetSize() override { return mSize; }
+
+  // TODO: We really want to be able to support this, but it's complex, since we need to readback
+  // in the other process and send it across.
+  virtual already_AddRefed<gfx::SourceSurface> GetAsSourceSurface() override { return nullptr; }
+
+  virtual TextureClient* GetTextureClient(CompositableClient* aClient) override
+  {
+    MOZ_ASSERT(aClient->GetForwarder() == ImageBridgeChild::GetSingleton(), "Must only use GPUVideo on ImageBridge");
+    return mTextureClient;
+  }
+
+private:
+  gfx::IntSize mSize;
+  RefPtr<TextureClient> mTextureClient;
+};
+
+} // namepace layers
+} // namespace mozilla
+
+#endif // GFX_GPU_VIDEO_IMAGE_H

gfx/layers/ImageTypes.h

@@ -97,7 +97,13 @@ enum class ImageFormat {
   /**
    * A wrapper around a drawable TextureClient.
    */
-  TEXTURE_WRAPPER
+  TEXTURE_WRAPPER,
+
+  /**
+   * An opaque handle that refers to an Image stored in the GPU
+   * process.
+   */
+  GPU_VIDEO
 };
 
 enum class StereoMode {

gfx/layers/moz.build

@@ -25,6 +25,7 @@ EXPORTS += [
     'D3D9SurfaceImage.h',
     'FrameMetrics.h',
     'GLImages.h',
+    'GPUVideoImage.h',
     'GrallocImages.h',
     'ImageContainer.h',
     'ImageLayers.h',