Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(194)

Unified Diff: content/common/gpu/media/vaapi_h264_dpb.h

Issue 813693006: Add accelerated video decoder interface, VP8 and H.264 implementations and hook up to V4L2SVDA (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/gpu/media/vaapi_h264_decoder.cc ('k') | content/common/gpu/media/vaapi_h264_dpb.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/media/vaapi_h264_dpb.h
diff --git a/content/common/gpu/media/h264_dpb.h b/content/common/gpu/media/vaapi_h264_dpb.h
similarity index 81%
copy from content/common/gpu/media/h264_dpb.h
copy to content/common/gpu/media/vaapi_h264_dpb.h
index 366c47a78cd298166d5cb12d12d1eff6bce6ce90..aaa56d3aeb9c711a57d0a8e6825c53ff94a64baf 100644
--- a/content/common/gpu/media/h264_dpb.h
+++ b/content/common/gpu/media/vaapi_h264_dpb.h
@@ -5,8 +5,8 @@
// 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_
+#ifndef CONTENT_COMMON_GPU_MEDIA_VAAPI_H264_DPB_H_
+#define CONTENT_COMMON_GPU_MEDIA_VAAPI_H264_DPB_H_
#include <vector>
@@ -18,7 +18,7 @@ namespace content {
// 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 H264Picture {
+struct VaapiH264Picture {
enum Field {
FIELD_NONE,
FIELD_TOP,
@@ -59,16 +59,16 @@ struct H264Picture {
media::H264DecRefPicMarking
ref_pic_marking[media::H264SliceHeader::kRefListSize];
- typedef std::vector<H264Picture*> PtrVector;
+ typedef std::vector<VaapiH264Picture*> PtrVector;
};
// DPB - Decoded Picture Buffer.
// Stores decoded pictures that will be used for future display
// and/or reference.
-class H264DPB {
+class VaapiH264DPB {
public:
- H264DPB();
- ~H264DPB();
+ VaapiH264DPB();
+ ~VaapiH264DPB();
void set_max_num_pics(size_t max_num_pics);
size_t max_num_pics() { return max_num_pics_; }
@@ -84,7 +84,7 @@ class H264DPB {
void Clear();
// Store picture in DPB. DPB takes ownership of its resources.
- void StorePic(H264Picture* pic);
+ void StorePic(VaapiH264Picture* pic);
// Return the number of reference pictures in DPB.
int CountRefPics();
@@ -93,28 +93,28 @@ class H264DPB {
void MarkAllUnusedForRef();
// Return a short-term reference picture by its pic_num.
- H264Picture* GetShortRefPicByPicNum(int pic_num);
+ VaapiH264Picture* GetShortRefPicByPicNum(int pic_num);
// Return a long-term reference picture by its long_term_pic_num.
- H264Picture* GetLongRefPicByLongTermPicNum(int pic_num);
+ VaapiH264Picture* GetLongRefPicByLongTermPicNum(int pic_num);
// Return the short reference picture with lowest frame_num. Used for sliding
// window memory management.
- H264Picture* GetLowestFrameNumWrapShortRefPic();
+ VaapiH264Picture* GetLowestFrameNumWrapShortRefPic();
// Append all pictures that have not been outputted yet to the passed |out|
// vector, sorted by lowest pic_order_cnt (in output order).
- void GetNotOutputtedPicsAppending(H264Picture::PtrVector& out);
+ void GetNotOutputtedPicsAppending(VaapiH264Picture::PtrVector& out);
// Append all short term reference pictures to the passed |out| vector.
- void GetShortTermRefPicsAppending(H264Picture::PtrVector& out);
+ void GetShortTermRefPicsAppending(VaapiH264Picture::PtrVector& out);
// Append all long term reference pictures to the passed |out| vector.
- void GetLongTermRefPicsAppending(H264Picture::PtrVector& out);
+ void GetLongTermRefPicsAppending(VaapiH264Picture::PtrVector& out);
// Iterators for direct access to DPB contents.
// Will be invalidated after any of Remove* calls.
- typedef ScopedVector<H264Picture> Pictures;
+ typedef ScopedVector<VaapiH264Picture> Pictures;
Pictures::iterator begin() { return pics_.begin(); }
Pictures::iterator end() { return pics_.end(); }
Pictures::reverse_iterator rbegin() { return pics_.rbegin(); }
@@ -130,9 +130,9 @@ class H264DPB {
Pictures pics_;
size_t max_num_pics_;
- DISALLOW_COPY_AND_ASSIGN(H264DPB);
+ DISALLOW_COPY_AND_ASSIGN(VaapiH264DPB);
};
} // namespace content
-#endif // CONTENT_COMMON_GPU_MEDIA_H264_DPB_H_
+#endif // CONTENT_COMMON_GPU_MEDIA_VAAPI_H264_DPB_H_
« no previous file with comments | « content/common/gpu/media/vaapi_h264_decoder.cc ('k') | content/common/gpu/media/vaapi_h264_dpb.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698