Mac Overlays: Enable h264 overlays

content/common/gpu/media/vt_video_decode_accelerator.h

 // Copyright 2014 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 CONTENT_COMMON_GPU_MEDIA_VT_VIDEO_DECODE_ACCELERATOR_H_
 #define CONTENT_COMMON_GPU_MEDIA_VT_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <queue>
 
+#include "base/containers/scoped_ptr_map.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_checker.h"
 #include "content/common/gpu/media/vt.h"
 #include "media/filters/h264_parser.h"
 #include "media/video/h264_poc.h"
 #include "media/video/video_decode_accelerator.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gl/gl_context_cgl.h"
+#include "ui/gl/gl_image_io_surface.h"
 
 namespace content {
 
 // Preload VideoToolbox libraries, needed for sandbox warmup.
 bool InitializeVideoToolbox();
 
 // VideoToolbox.framework implementation of the VideoDecodeAccelerator
 // interface for Mac OS X (currently limited to 10.9+).
 class VTVideoDecodeAccelerator : public media::VideoDecodeAccelerator {
  public:
   explicit VTVideoDecodeAccelerator(
-      const base::Callback<bool(void)>& make_context_current);
+      const base::Callback<bool(void)>& make_context_current,
+      const base::Callback<void(uint32, uint32, scoped_refptr<gfx::GLImage>)>&
+          bind_image);
   ~VTVideoDecodeAccelerator() override;
 
   // VideoDecodeAccelerator implementation.
   bool Initialize(media::VideoCodecProfile profile, Client* client) override;
   void Decode(const media::BitstreamBuffer& bitstream) override;
   void AssignPictureBuffers(
       const std::vector<media::PictureBuffer>& pictures) override;
   void ReusePictureBuffer(int32_t picture_id) override;
   void Flush() override;
   void Reset() override;
@@ skipping 59 matching lines @@
   };
 
   struct Task {
     Task(TaskType type);
     ~Task();
 
     TaskType type;
     linked_ptr<Frame> frame;
   };
 
+  struct PictureInfo {
+    PictureInfo(uint32_t client_texture_id, uint32_t service_texture_id);
+    ~PictureInfo();
+
+    // Image buffer, kept alive while they are bound to pictures.
+    base::ScopedCFTypeRef<CVImageBufferRef> cv_image;
+
+    // The GLImage representation of |cv_image|. This is kept around to ensure
+    // that Destroy is called on it before it hits its destructor (there is a
+    // DCHECK that requires this).
+    scoped_refptr<gfx::GLImageIOSurface> gl_image;
+
+    // Texture IDs for the image buffer.
+    const uint32_t client_texture_id;
+    const uint32_t service_texture_id;
+
+   private:
+    DISALLOW_COPY_AND_ASSIGN(PictureInfo);
+  };
+
   //
   // Methods for interacting with VideoToolbox. Run on |decoder_thread_|.
   //
 
   // Compute the |pic_order_cnt| for a frame. Returns true or calls
   // NotifyError() before returning false.
   bool ComputePicOrderCnt(
       const media::H264SPS* sps,
       const media::H264SliceHeader& slice_hdr,
       Frame* frame);
@@ skipping 30 matching lines @@
   // These methods returns true if a task was completed, false otherwise.
   bool ProcessTaskQueue();
   bool ProcessReorderQueue();
   bool ProcessFrame(const Frame& frame);
   bool SendFrame(const Frame& frame);
 
   //
   // GPU thread state.
   //
   base::Callback<bool(void)> make_context_current_;
+  base::Callback<void(uint32, uint32, scoped_refptr<gfx::GLImage>)> bind_image_;
   media::VideoDecodeAccelerator::Client* client_;
   State state_;
 
   // Queue of pending flush tasks. This is used to drop frames when a reset
   // is pending.
   std::queue<TaskType> pending_flush_tasks_;
 
   // Queue of tasks to complete in the GPU thread.
   std::queue<Task> task_queue_;
 
@@ skipping 17 matching lines @@
   std::map<int32_t, linked_ptr<Frame>> pending_frames_;
 
   // Set of assigned bitstream IDs, so that Destroy() can release them all.
   std::set<int32_t> assigned_bitstream_ids_;
 
   // All picture buffers assigned to us. Used to check if reused picture buffers
   // should be added back to the available list or released. (They are not
   // released immediately because we need the reuse event to free the binding.)
   std::set<int32_t> assigned_picture_ids_;
 
-  // Texture IDs of assigned pictures.
-  std::map<int32_t, uint32_t> texture_ids_;
+  // Texture IDs and image buffers of assigned pictures.
+  base::ScopedPtrMap<int32_t, scoped_ptr<PictureInfo>> picture_info_map_;
 
   // Pictures ready to be rendered to.
   std::vector<int32_t> available_picture_ids_;
 
-  // Image buffers kept alive while they are bound to pictures.
-  std::map<int32_t, base::ScopedCFTypeRef<CVImageBufferRef>> picture_bindings_;
-
   //
   // Decoder thread state.
   //
   VTDecompressionOutputCallbackRecord callback_;
   base::ScopedCFTypeRef<CMFormatDescriptionRef> format_;
   base::ScopedCFTypeRef<VTDecompressionSessionRef> session_;
   media::H264Parser parser_;
   gfx::Size coded_size_;
 
   int last_sps_id_;
@@ skipping 14 matching lines @@
   // Declared last to ensure that all weak pointers are invalidated before
   // other destructors run.
   base::WeakPtrFactory<VTVideoDecodeAccelerator> weak_this_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VTVideoDecodeAccelerator);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_VT_VIDEO_DECODE_ACCELERATOR_H_