Implement |pic_order_cnt| computation for VTVideoDecode accelerator.

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/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/h264_dpb.h"
+#include "content/common/gpu/media/h264_poc.h"
 #include "content/common/gpu/media/vt.h"
 #include "media/filters/h264_parser.h"
 #include "media/video/video_decode_accelerator.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gl/gl_context_cgl.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }  // namespace base
 
@@ skipping 40 matching lines @@
   };
 
   struct Frame {
     Frame(int32_t bitstream_id);
     ~Frame();
 
     // ID of the bitstream buffer this Frame will be decoded from.
     int32_t bitstream_id;
 
     // Relative presentation order of this frame (see AVC spec).
-    // TODO(sandersd): Reorder window size.
     int32_t pic_order_cnt;
 
+    // Nnumber of frames after this one in decode order that can appear before
+    // before it in presentation order.
+    int32_t reorder_window;
+
     // Size of the decoded frame.
     // TODO(sandersd): visible_rect.
     gfx::Size coded_size;
 
     // VideoToolbox decoded image, if decoding was successful.
     base::ScopedCFTypeRef<CVImageBufferRef> image;
   };
 
   struct Task {
     Task(TaskType type);
     ~Task();
 
     TaskType type;
     linked_ptr<Frame> frame;
   };
 
   //
   // 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);
+
   // 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);
@@ skipping 78 matching lines @@
   base::ScopedCFTypeRef<CMFormatDescriptionRef> format_;
   base::ScopedCFTypeRef<VTDecompressionSessionRef> session_;
   media::H264Parser parser_;
   gfx::Size coded_size_;
 
   int last_sps_id_;
   std::vector<uint8_t> last_sps_;
   std::vector<uint8_t> last_spsext_;
   int last_pps_id_;
   std::vector<uint8_t> last_pps_;
+  H264POC poc_;
 
   //
   // Shared state (set up and torn down on GPU thread).
   //
   scoped_refptr<base::SingleThreadTaskRunner> gpu_task_runner_;
   base::ThreadChecker gpu_thread_checker_;
   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
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_VT_VIDEO_DECODE_ACCELERATOR_H_