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

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

Issue 1016773002: MJPEG acceleration for video capture using VAAPI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 7 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
(Empty)
1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #include "content/common/gpu/media/vaapi_jpeg_decode_accelerator.h"
6
7 #include "base/bind.h"
8 #include "base/logging.h"
9 #include "base/metrics/histogram.h"
wuchengli 2015/05/13 15:04:07 not used?
kcwu 2015/05/25 18:20:35 Done.
10 #include "base/stl_util.h"
11 #include "base/strings/string_util.h"
12 #include "base/trace_event/trace_event.h"
13 #include "content/common/gpu/gpu_channel.h"
14 #include "content/common/gpu/media/vaapi_picture.h"
15 #include "media/base/bind_to_current_loop.h"
wuchengli 2015/05/13 15:04:07 not used?
kcwu 2015/05/25 18:20:35 Done.
16 #include "media/base/video_frame.h"
17 #include "media/filters/jpeg_parser.h"
18 #include "media/video/picture.h"
wuchengli 2015/05/13 15:04:07 not used?
kcwu 2015/05/25 18:20:35 Done.
19
20 static void ReportVaapiError() {
wuchengli 2015/05/13 15:04:06 Add a TODO to add UMA
kcwu 2015/05/25 18:20:35 Done.
21 }
22
23 namespace content {
24
25 VaapiJpegDecodeAccelerator::DecodeRequest::DecodeRequest(
26 const media::BitstreamBuffer& bitstream_buffer,
27 scoped_refptr<media::VideoFrame> video_frame)
28 : bitstream_buffer(bitstream_buffer), video_frame(video_frame) {
29 }
30
31 VaapiJpegDecodeAccelerator::DecodeRequest::~DecodeRequest() {
32 }
33
34 void VaapiJpegDecodeAccelerator::NotifyError(int32_t bitstream_buffer_id,
35 Error error) {
36 if (message_loop_ != base::MessageLoop::current()) {
37 DCHECK(decoder_thread_proxy_->BelongsToCurrentThread());
38 message_loop_->PostTask(FROM_HERE,
39 base::Bind(&VaapiJpegDecodeAccelerator::NotifyError,
40 weak_this_, bitstream_buffer_id, error));
41 return;
42 }
43
44 Cleanup();
wuchengli 2015/05/13 15:04:06 Move this after line 50. Otherwise, Cleanup will r
kcwu 2015/05/25 18:20:35 Done.
45
46 LOG(ERROR) << "Notifying of error " << error;
47 if (client_) {
48 client_->NotifyError(bitstream_buffer_id, error);
49 client_ptr_factory_.reset();
50 }
51 }
52
53 VaapiJpegDecodeAccelerator::VaapiJpegDecodeAccelerator(
54 const scoped_refptr<base::MessageLoopProxy>& io_message_loop)
55 : initialized_(false),
56 message_loop_(base::MessageLoop::current()),
57 io_message_loop_(io_message_loop),
58 decoder_thread_("VaapiJpegDecoderThread"),
59 va_surface_(VA_INVALID_SURFACE),
60 weak_this_factory_(this) {
61 weak_this_ = weak_this_factory_.GetWeakPtr();
62 }
63
64 VaapiJpegDecodeAccelerator::~VaapiJpegDecodeAccelerator() {
65 DCHECK_EQ(message_loop_, base::MessageLoop::current());
66 }
67
68 bool VaapiJpegDecodeAccelerator::Initialize(Client* client) {
69 DCHECK_EQ(message_loop_, base::MessageLoop::current());
70
71 client_ptr_factory_.reset(new base::WeakPtrFactory<Client>(client));
72 client_ = client_ptr_factory_->GetWeakPtr();
73
74 base::AutoLock auto_lock(lock_);
75 DCHECK(!initialized_);
76
77 vaapi_wrapper_ =
78 VaapiWrapper::Create(VaapiWrapper::kDecode, VAProfileJPEGBaseline,
79 base::Bind(&ReportVaapiError));
80
81 if (!vaapi_wrapper_.get()) {
82 DLOG(ERROR) << "Failed initializing VAAPI";
83 return false;
84 }
85
86 if (!decoder_thread_.Start()) {
87 LOG(ERROR) << "Failed to start decoding thread.";
88 return false;
89 }
90 decoder_thread_proxy_ = decoder_thread_.message_loop_proxy();
91
92 initialized_ = true;
93 return true;
94 }
95
96 bool VaapiJpegDecodeAccelerator::OutputPicture(
97 VASurfaceID va_surface_id,
98 int32_t input_buffer_id,
99 const scoped_refptr<media::VideoFrame>& video_frame) {
100 DCHECK(decoder_thread_proxy_->BelongsToCurrentThread());
101
102 TRACE_EVENT1("jpeg", "VaapiJpegDecodeAccelerator::OutputPicture",
103 "input_buffer_id", input_buffer_id);
104
105 DVLOG(3) << "Outputting VASurface " << va_surface_id
106 << " into video_frame associate to input buffer id "
wuchengli 2015/05/13 15:04:06 s/associate to/associated with/
kcwu 2015/05/25 18:20:35 Done.
107 << input_buffer_id;
108
109 VAImage image;
110 VAImageFormat format;
111 const uint32_t kI420Fourcc = VA_FOURCC('I', '4', '2', '0');
112 memset(&image, 0, sizeof(image));
113 memset(&format, 0, sizeof(format));
114 format.fourcc = kI420Fourcc;
115 format.byte_order = VA_LSB_FIRST;
116 format.bits_per_pixel = 12; // 12 for I420
117
118 void* mem;
119 gfx::Size coded_size = video_frame->coded_size();
120 if (!vaapi_wrapper_->GetVaImage(va_surface_id, &format, coded_size, &image,
121 &mem)) {
122 DLOG(ERROR) << "Cannot get VAImage";
123 return false;
124 }
125
126 uint8* frame_mem = video_frame->data(media::VideoFrame::kYPlane);
127 size_t frame_buffer_size =
128 media::VideoFrame::AllocationSize(media::VideoFrame::I420, coded_size);
129 memcpy(frame_mem, mem, frame_buffer_size);
130
131 vaapi_wrapper_->ReturnVaImage(&image);
132
133 if (client_)
wuchengli 2015/05/13 15:04:06 |client_| can only be dereferenced on the child th
kcwu 2015/05/25 18:20:35 Done.
134 client_->VideoFrameReady(input_buffer_id);
135
136 return true;
137 }
138
139 void VaapiJpegDecodeAccelerator::DecodeTask() {
140 DVLOG(3) << __func__;
141 DCHECK(decoder_thread_proxy_->BelongsToCurrentThread());
142 TRACE_EVENT0("jpeg", "DecodeTask");
143 linked_ptr<DecodeRequest> request;
144 {
145 base::AutoLock auto_lock(lock_);
146
147 DCHECK(!decode_requests_.empty());
148 request = decode_requests_.front();
149 decode_requests_.pop();
150 }
151
152 do {
153 DVLOG(4) << "Mapping new input buffer id: "
154 << request->bitstream_buffer.id()
155 << " size: " << (int)request->bitstream_buffer.size();
156
157 scoped_ptr<base::SharedMemory> shm(
158 new base::SharedMemory(request->bitstream_buffer.handle(), true));
159 if (!shm->Map(request->bitstream_buffer.size())) {
160 LOG(ERROR) << "Failed to map input buffer";
161 NotifyError(request->bitstream_buffer.id(), UNREADABLE_INPUT);
162 break;
163 }
164
165 media::JpegParseResult parse_result;
166
167 if (!media::ParseJpegPicture(
168 reinterpret_cast<const uint8_t*>(shm->memory()),
169 request->bitstream_buffer.size(), &parse_result)) {
170 DLOG(ERROR) << "ParseJpegPicture failed";
171 NotifyError(request->bitstream_buffer.id(),
172 media::JpegDecodeAccelerator::PARSE_JPEG_FAILED);
173 break;
174 }
175
176 // Reuse VASurface if size doesn't change.
177 // This is not only optimization, but also to avoid libva resoruce leak.
178 // crosbug.com/p/39584
wuchengli 2015/05/13 15:04:07 Remove the leak comment because it's being fixed.
kcwu 2015/05/25 18:20:35 Done.
179 gfx::Size coded_size(parse_result.frame_header.coded_width,
180 parse_result.frame_header.coded_height);
181 if (coded_size != last_coded_size_ || va_surface_ == VA_INVALID_SURFACE) {
182 vaapi_wrapper_->DestroySurfaces();
183 std::vector<VASurfaceID> va_surfaces;
184 if (!vaapi_wrapper_->CreateSurfaces(coded_size, 1, &va_surfaces))
185 break;
186 va_surface_ = va_surfaces[0];
187 last_coded_size_ = coded_size;
188 }
189
190 if (!VaapiJpegDecoder::Decode(vaapi_wrapper_.get(), parse_result,
191 va_surface_)) {
192 LOG(ERROR) << "Decode failed";
wuchengli 2015/05/13 15:04:07 Decode JPEG failed
kcwu 2015/05/25 18:20:35 Done.
193 NotifyError(request->bitstream_buffer.id(),
194 media::JpegDecodeAccelerator::PLATFORM_FAILURE);
195 break;
196 }
197
198 if (!OutputPicture(va_surface_, request->bitstream_buffer.id(),
199 request->video_frame)) {
200 LOG(ERROR) << "Output failed";
wuchengli 2015/05/13 15:04:06 Output picture failed
kcwu 2015/05/25 18:20:35 Done.
201 NotifyError(request->bitstream_buffer.id(),
202 media::JpegDecodeAccelerator::PLATFORM_FAILURE);
203 break;
204 }
205 } while (0);
wuchengli 2015/05/13 15:04:06 There's no code after while. Remove do/while and r
kcwu 2015/05/25 18:20:35 Done.
206 }
207
208 void VaapiJpegDecodeAccelerator::Decode(
209 const media::BitstreamBuffer& bitstream_buffer,
210 const scoped_refptr<media::VideoFrame>& video_frame) {
211 DVLOG(3) << __func__;
212 DCHECK(io_message_loop_->BelongsToCurrentThread());
213 TRACE_EVENT1("jpeg", "Decode", "input_id", bitstream_buffer.id());
214
215 if (!initialized_)
wuchengli 2015/05/13 15:04:06 Move auto_lock before this.
kcwu 2015/05/25 18:20:35 Done.
216 return;
217
218 // Set up a new decode request and queue it for later.
219 linked_ptr<DecodeRequest> input_buffer(
220 new DecodeRequest(bitstream_buffer, video_frame));
221 base::AutoLock auto_lock(lock_);
222 decode_requests_.push(input_buffer);
223
224 decoder_thread_proxy_->PostTask(
225 FROM_HERE, base::Bind(&VaapiJpegDecodeAccelerator::DecodeTask,
226 base::Unretained(this)));
227 }
228
229 void VaapiJpegDecodeAccelerator::Cleanup() {
230 DCHECK_EQ(message_loop_, base::MessageLoop::current());
231
232 base::AutoLock auto_lock(lock_);
233 if (!initialized_)
234 return;
235
236 DVLOG(1) << "Destroying VaapiJpegDecodeAccelerator";
237
238 client_ptr_factory_.reset();
239 weak_this_factory_.InvalidateWeakPtrs();
240
241 {
242 base::AutoUnlock auto_unlock(lock_);
243 decoder_thread_.Stop();
244 }
245
246 initialized_ = false;
247 }
248
249 void VaapiJpegDecodeAccelerator::Destroy() {
250 DCHECK_EQ(message_loop_, base::MessageLoop::current());
251 Cleanup();
252 delete this;
253 }
254
255 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698