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

Side by Side Diff: content/common/gpu/media/vaapi_h264_dpb.cc

Issue 833063003: 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: Addressed all comments. 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <algorithm> 5 #include <algorithm>
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "content/common/gpu/media/h264_dpb.h" 9 #include "content/common/gpu/media/vaapi_h264_dpb.h"
10 10
11 namespace content { 11 namespace content {
12 12
13 H264DPB::H264DPB() : max_num_pics_(0) {} 13 VaapiH264DPB::VaapiH264DPB() : max_num_pics_(0) {}
14 H264DPB::~H264DPB() {} 14 VaapiH264DPB::~VaapiH264DPB() {}
15 15
16 void H264DPB::Clear() { 16 void VaapiH264DPB::Clear() {
17 pics_.clear(); 17 pics_.clear();
18 } 18 }
19 19
20 void H264DPB::set_max_num_pics(size_t max_num_pics) { 20 void VaapiH264DPB::set_max_num_pics(size_t max_num_pics) {
21 DCHECK_LE(max_num_pics, kDPBMaxSize); 21 DCHECK_LE(max_num_pics, kDPBMaxSize);
22 max_num_pics_ = max_num_pics; 22 max_num_pics_ = max_num_pics;
23 if (pics_.size() > max_num_pics_) 23 if (pics_.size() > max_num_pics_)
24 pics_.resize(max_num_pics_); 24 pics_.resize(max_num_pics_);
25 } 25 }
26 26
27 void H264DPB::DeleteByPOC(int poc) { 27 void VaapiH264DPB::DeleteByPOC(int poc) {
28 for (Pictures::iterator it = pics_.begin(); it != pics_.end(); ++it) { 28 for (Pictures::iterator it = pics_.begin(); it != pics_.end(); ++it) {
29 if ((*it)->pic_order_cnt == poc) { 29 if ((*it)->pic_order_cnt == poc) {
30 pics_.erase(it); 30 pics_.erase(it);
31 return; 31 return;
32 } 32 }
33 } 33 }
34 NOTREACHED() << "Missing POC: " << poc; 34 NOTREACHED() << "Missing POC: " << poc;
35 } 35 }
36 36
37 void H264DPB::DeleteUnused() { 37 void VaapiH264DPB::DeleteUnused() {
38 for (Pictures::iterator it = pics_.begin(); it != pics_.end(); ) { 38 for (Pictures::iterator it = pics_.begin(); it != pics_.end(); ) {
39 if ((*it)->outputted && !(*it)->ref) 39 if ((*it)->outputted && !(*it)->ref)
40 it = pics_.erase(it); 40 it = pics_.erase(it);
41 else 41 else
42 ++it; 42 ++it;
43 } 43 }
44 } 44 }
45 45
46 void H264DPB::StorePic(H264Picture* pic) { 46 void VaapiH264DPB::StorePic(VaapiH264Picture* pic) {
47 DCHECK_LT(pics_.size(), max_num_pics_); 47 DCHECK_LT(pics_.size(), max_num_pics_);
48 DVLOG(3) << "Adding PicNum: " << pic->pic_num << " ref: " << (int)pic->ref 48 DVLOG(3) << "Adding PicNum: " << pic->pic_num << " ref: " << (int)pic->ref
49 << " longterm: " << (int)pic->long_term << " to DPB"; 49 << " longterm: " << (int)pic->long_term << " to DPB";
50 pics_.push_back(pic); 50 pics_.push_back(pic);
51 } 51 }
52 52
53 int H264DPB::CountRefPics() { 53 int VaapiH264DPB::CountRefPics() {
54 int ret = 0; 54 int ret = 0;
55 for (size_t i = 0; i < pics_.size(); ++i) { 55 for (size_t i = 0; i < pics_.size(); ++i) {
56 if (pics_[i]->ref) 56 if (pics_[i]->ref)
57 ++ret; 57 ++ret;
58 } 58 }
59 return ret; 59 return ret;
60 } 60 }
61 61
62 void H264DPB::MarkAllUnusedForRef() { 62 void VaapiH264DPB::MarkAllUnusedForRef() {
63 for (size_t i = 0; i < pics_.size(); ++i) 63 for (size_t i = 0; i < pics_.size(); ++i)
64 pics_[i]->ref = false; 64 pics_[i]->ref = false;
65 } 65 }
66 66
67 H264Picture* H264DPB::GetShortRefPicByPicNum(int pic_num) { 67 VaapiH264Picture* VaapiH264DPB::GetShortRefPicByPicNum(int pic_num) {
68 for (size_t i = 0; i < pics_.size(); ++i) { 68 for (size_t i = 0; i < pics_.size(); ++i) {
69 H264Picture* pic = pics_[i]; 69 VaapiH264Picture* pic = pics_[i];
70 if (pic->ref && !pic->long_term && pic->pic_num == pic_num) 70 if (pic->ref && !pic->long_term && pic->pic_num == pic_num)
71 return pic; 71 return pic;
72 } 72 }
73 73
74 DVLOG(1) << "Missing short ref pic num: " << pic_num; 74 DVLOG(1) << "Missing short ref pic num: " << pic_num;
75 return NULL; 75 return NULL;
76 } 76 }
77 77
78 H264Picture* H264DPB::GetLongRefPicByLongTermPicNum(int pic_num) { 78 VaapiH264Picture* VaapiH264DPB::GetLongRefPicByLongTermPicNum(int pic_num) {
79 for (size_t i = 0; i < pics_.size(); ++i) { 79 for (size_t i = 0; i < pics_.size(); ++i) {
80 H264Picture* pic = pics_[i]; 80 VaapiH264Picture* pic = pics_[i];
81 if (pic->ref && pic->long_term && pic->long_term_pic_num == pic_num) 81 if (pic->ref && pic->long_term && pic->long_term_pic_num == pic_num)
82 return pic; 82 return pic;
83 } 83 }
84 84
85 DVLOG(1) << "Missing long term pic num: " << pic_num; 85 DVLOG(1) << "Missing long term pic num: " << pic_num;
86 return NULL; 86 return NULL;
87 } 87 }
88 88
89 H264Picture* H264DPB::GetLowestFrameNumWrapShortRefPic() { 89 VaapiH264Picture* VaapiH264DPB::GetLowestFrameNumWrapShortRefPic() {
90 H264Picture* ret = NULL; 90 VaapiH264Picture* ret = NULL;
91 for (size_t i = 0; i < pics_.size(); ++i) { 91 for (size_t i = 0; i < pics_.size(); ++i) {
92 H264Picture* pic = pics_[i]; 92 VaapiH264Picture* pic = pics_[i];
93 if (pic->ref && !pic->long_term && 93 if (pic->ref && !pic->long_term &&
94 (!ret || pic->frame_num_wrap < ret->frame_num_wrap)) 94 (!ret || pic->frame_num_wrap < ret->frame_num_wrap))
95 ret = pic; 95 ret = pic;
96 } 96 }
97 return ret; 97 return ret;
98 } 98 }
99 99
100 void H264DPB::GetNotOutputtedPicsAppending(H264Picture::PtrVector& out) { 100 void VaapiH264DPB::GetNotOutputtedPicsAppending(
101 VaapiH264Picture::PtrVector& out) {
101 for (size_t i = 0; i < pics_.size(); ++i) { 102 for (size_t i = 0; i < pics_.size(); ++i) {
102 H264Picture* pic = pics_[i]; 103 VaapiH264Picture* pic = pics_[i];
103 if (!pic->outputted) 104 if (!pic->outputted)
104 out.push_back(pic); 105 out.push_back(pic);
105 } 106 }
106 } 107 }
107 108
108 void H264DPB::GetShortTermRefPicsAppending(H264Picture::PtrVector& out) { 109 void VaapiH264DPB::GetShortTermRefPicsAppending(
110 VaapiH264Picture::PtrVector& out) {
109 for (size_t i = 0; i < pics_.size(); ++i) { 111 for (size_t i = 0; i < pics_.size(); ++i) {
110 H264Picture* pic = pics_[i]; 112 VaapiH264Picture* pic = pics_[i];
111 if (pic->ref && !pic->long_term) 113 if (pic->ref && !pic->long_term)
112 out.push_back(pic); 114 out.push_back(pic);
113 } 115 }
114 } 116 }
115 117
116 void H264DPB::GetLongTermRefPicsAppending(H264Picture::PtrVector& out) { 118 void VaapiH264DPB::GetLongTermRefPicsAppending(
119 VaapiH264Picture::PtrVector& out) {
117 for (size_t i = 0; i < pics_.size(); ++i) { 120 for (size_t i = 0; i < pics_.size(); ++i) {
118 H264Picture* pic = pics_[i]; 121 VaapiH264Picture* pic = pics_[i];
119 if (pic->ref && pic->long_term) 122 if (pic->ref && pic->long_term)
120 out.push_back(pic); 123 out.push_back(pic);
121 } 124 }
122 } 125 }
123 126
124 } // namespace content 127 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698