Migrate content/common/gpu/media code to media/gpu

media/gpu/vt_video_decode_accelerator_mac.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/mac/scoped_cftyperef.h"
 #include "base/macros.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/gpu_video_decode_accelerator_helpers.h"
-#include "content/common/gpu/media/vt_mac.h"
 #include "media/filters/h264_parser.h"
+#include "media/gpu/gpu_video_decode_accelerator_helpers.h"
+#include "media/gpu/vt_mac.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 {
+namespace media {
 
 // 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 MakeGLContextCurrentCallback& make_context_current_cb,
       const BindGLImageCallback& bind_image_cb);
 
   ~VTVideoDecodeAccelerator() override;
 
   // VideoDecodeAccelerator implementation.
   bool Initialize(const Config& config, 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;
   void Destroy() override;
   bool TryToSetupDecodeOnSeparateThread(
       const base::WeakPtr<Client>& decode_client,
       const scoped_refptr<base::SingleThreadTaskRunner>& decode_task_runner)
       override;
 
   // Called by OutputThunk() when VideoToolbox finishes decoding a frame.
-  void Output(
-      void* source_frame_refcon,
-      OSStatus status,
-      CVImageBufferRef image_buffer);
+  void Output(void* source_frame_refcon,
+              OSStatus status,
+              CVImageBufferRef image_buffer);
 
   static media::VideoDecodeAccelerator::SupportedProfiles
-      GetSupportedProfiles();
+  GetSupportedProfiles();
 
  private:
   // Logged to UMA, so never reuse values. Make sure to update
   // VTVDASessionFailureType in histograms.xml to match.
   enum VTVDASessionFailureType {
     SFT_SUCCESSFULLY_INITIALIZED = 0,
     SFT_PLATFORM_ERROR = 1,
     SFT_INVALID_STREAM = 2,
     SFT_UNSUPPORTED_STREAM_PARAMETERS = 3,
     SFT_DECODE_ERROR = 4,
@@ skipping 68 matching lines @@
    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);
+  bool ComputePicOrderCnt(const media::H264SPS* sps,
+                          const media::H264SliceHeader& slice_hdr,
+                          Frame* frame);
 
   // Set up VideoToolbox using the current SPS and PPS. Returns true or calls
   // NotifyError() before returning false.
   bool ConfigureDecoder();
 
   // Wait for VideoToolbox to output all pending frames. Returns true or calls
   // NotifyError() before returning false.
   bool FinishDelayedFrames();
 
   // |frame| is owned by |pending_frames_|.
   void DecodeTask(const media::BitstreamBuffer&, Frame* frame);
   void DecodeDone(Frame* frame);
 
   //
   // Methods for interacting with |client_|. Run on |gpu_task_runner_|.
   //
-  void NotifyError(
-      Error vda_error_type,
-      VTVDASessionFailureType session_failure_type);
+  void NotifyError(Error vda_error_type,
+                   VTVDASessionFailureType session_failure_type);
 
   // |type| is the type of task that the flush will complete, one of TASK_FLUSH,
   // TASK_RESET, or TASK_DESTROY.
   void QueueFlush(TaskType type);
   void FlushTask(TaskType type);
   void FlushDone(TaskType type);
 
   // Try to make progress on tasks in the |task_queue_| or sending frames in the
   // |reorder_queue_|.
   void ProcessWorkQueues();
@@ skipping 15 matching lines @@
 
   // 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_;
 
   // Utility class to define the order of frames in the reorder queue.
   struct FrameOrder {
-    bool operator()(
-        const linked_ptr<Frame>& lhs,
-        const linked_ptr<Frame>& rhs) const;
+    bool operator()(const linked_ptr<Frame>& lhs,
+                    const linked_ptr<Frame>& rhs) const;
   };
 
   // Queue of decoded frames in presentation order.
   std::priority_queue<linked_ptr<Frame>,
                       std::vector<linked_ptr<Frame>>,
-                      FrameOrder> reorder_queue_;
+                      FrameOrder>
+      reorder_queue_;
 
   // Size of assigned picture buffers.
   gfx::Size picture_size_;
 
   // Frames that have not yet been decoded, keyed by bitstream ID; maintains
   // ownership of Frame objects while they flow through VideoToolbox.
   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_;
@@ skipping 36 matching lines @@
   base::WeakPtr<VTVideoDecodeAccelerator> weak_this_;
   base::Thread decoder_thread_;
 
   // 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
+}  // namespace media
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_VT_VIDEO_DECODE_ACCELERATOR_H_