VAVDA: Use the new, generic video decoder and accelerator infrastructure.

content/common/gpu/media/h264_dpb.h

 // Copyright (c) 2012 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.
 //
 // This file contains an implementation of an H.264 Decoded Picture Buffer
 // used in H264 decoders.
 
 #ifndef CONTENT_COMMON_GPU_MEDIA_H264_DPB_H_
 #define CONTENT_COMMON_GPU_MEDIA_H264_DPB_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "media/filters/h264_parser.h"
 
 namespace content {
 
 class V4L2H264Picture;
+class VaapiH264Picture;
 
 // A picture (a frame or a field) in the H.264 spec sense.
 // See spec at http://www.itu.int/rec/T-REC-H.264
-struct H264PictureBase {
+struct H264Picture : public base::RefCounted<H264Picture> {

[wuchengli, 2015/03/30 11:02:54]

This is complicated enough to be a class.

[Pawel Osciak, 2015/04/03 07:06:00]

Done.

+  H264Picture();
+
+  virtual V4L2H264Picture* AsV4L2H264Picture();
+  virtual VaapiH264Picture* AsVaapiH264Picture();
+
+  using Vector = std::vector<scoped_refptr<H264Picture>>;
+
   enum Field {
     FIELD_NONE,
     FIELD_TOP,
     FIELD_BOTTOM,
   };
 
-  H264PictureBase();
-
   // Values calculated per H.264 specification or taken from slice header.
   // See spec for more details on each (some names have been converted from
   // CamelCase in spec to Chromium-style names).
   int top_field_order_cnt;
   int bottom_field_order_cnt;
   int pic_order_cnt;
   int pic_order_cnt_msb;
   int pic_order_cnt_lsb;
 
   int pic_num;
@@ skipping 16 matching lines @@
 
   // Values from slice_hdr to be used during reference marking and
   // memory management after finishing this picture.
   bool long_term_reference_flag;
   bool adaptive_ref_pic_marking_mode_flag;
   media::H264DecRefPicMarking
       ref_pic_marking[media::H264SliceHeader::kRefListSize];
 
   // Position in DPB (i.e. index in DPB).
   int dpb_position;
-};
-
-class H264Picture : public H264PictureBase,
-                    public base::RefCounted<H264Picture> {
- public:
-  H264Picture();
-
-  virtual V4L2H264Picture* AsV4L2H264Picture();
-
-  using Vector = std::vector<scoped_refptr<H264Picture>>;
 
  protected:
   friend class base::RefCounted<H264Picture>;
   virtual ~H264Picture();
 
   DISALLOW_COPY_AND_ASSIGN(H264Picture);

[wuchengli, 2015/03/30 11:02:54]

This should be in private section according to base/macros.h.

[Pawel Osciak, 2015/04/03 07:06:00]

Done.

 };
 
 // DPB - Decoded Picture Buffer.
 // Stores decoded pictures that will be used for future display
 // and/or reference.
 class H264DPB {
  public:
   H264DPB();
   ~H264DPB();
 
@@ skipping 38 matching lines @@
 
   // Append all long term reference pictures to the passed |out| vector.
   void GetLongTermRefPicsAppending(H264Picture::Vector* out);
 
   // Iterators for direct access to DPB contents.
   // Will be invalidated after any of Remove* calls.
   H264Picture::Vector::iterator begin() { return pics_.begin(); }
   H264Picture::Vector::iterator end() { return pics_.end(); }
   H264Picture::Vector::const_iterator begin() const { return pics_.begin(); }
   H264Picture::Vector::const_iterator end() const { return pics_.end(); }
-  H264Picture::Vector::reverse_iterator rbegin() { return pics_.rbegin(); }
-  H264Picture::Vector::reverse_iterator rend() { return pics_.rend(); }
+  H264Picture::Vector::const_reverse_iterator rbegin() const {
+    return pics_.rbegin();
+  }
+  H264Picture::Vector::const_reverse_iterator rend() const {
+    return pics_.rend();
+  }
 
   size_t size() const { return pics_.size(); }
   bool IsFull() const { return pics_.size() == max_num_pics_; }
 
   // Per H264 spec, increase to 32 if interlaced video is supported.
   enum { kDPBMaxSize = 16, };
 
  private:
   void UpdatePicPositions();
 
   H264Picture::Vector pics_;
   size_t max_num_pics_;
 
   DISALLOW_COPY_AND_ASSIGN(H264DPB);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_H264_DPB_H_