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

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

Issue 885273002: Fix compile error in V4L2SliceVDA. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 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 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 <fcntl.h> 5 #include <fcntl.h>
6 #include <linux/videodev2.h> 6 #include <linux/videodev2.h>
7 #include <poll.h> 7 #include <poll.h>
8 #include <sys/eventfd.h> 8 #include <sys/eventfd.h>
9 #include <sys/ioctl.h> 9 #include <sys/ioctl.h>
10 #include <sys/mman.h> 10 #include <sys/mman.h>
(...skipping 2356 matching lines...) Expand 10 before | Expand all | Expand 10 after
2367 dec_surface)).second; 2367 dec_surface)).second;
2368 DCHECK(inserted); 2368 DCHECK(inserted);
2369 2369
2370 DCHECK(!output_record.at_client); 2370 DCHECK(!output_record.at_client);
2371 DCHECK(!output_record.at_device); 2371 DCHECK(!output_record.at_device);
2372 DCHECK_NE(output_record.egl_image, EGL_NO_IMAGE_KHR); 2372 DCHECK_NE(output_record.egl_image, EGL_NO_IMAGE_KHR);
2373 DCHECK_NE(output_record.picture_id, -1); 2373 DCHECK_NE(output_record.picture_id, -1);
2374 output_record.at_client = true; 2374 output_record.at_client = true;
2375 2375
2376 media::Picture picture(output_record.picture_id, dec_surface->bitstream_id(), 2376 media::Picture picture(output_record.picture_id, dec_surface->bitstream_id(),
2377 gfx::Rect(visible_size_)); 2377 gfx::Rect(visible_size_), false);
2378 DVLOGF(3) << dec_surface->ToString() 2378 DVLOGF(3) << dec_surface->ToString()
2379 << ", bitstream_id: " << picture.bitstream_buffer_id() 2379 << ", bitstream_id: " << picture.bitstream_buffer_id()
2380 << ", picture_id: " << picture.picture_buffer_id(); 2380 << ", picture_id: " << picture.picture_buffer_id();
2381 pending_picture_ready_.push(PictureRecord(output_record.cleared, picture)); 2381 pending_picture_ready_.push(PictureRecord(output_record.cleared, picture));
2382 SendPictureReady(); 2382 SendPictureReady();
2383 output_record.cleared = true; 2383 output_record.cleared = true;
2384 } 2384 }
2385 2385
2386 scoped_refptr<V4L2SliceVideoDecodeAccelerator::V4L2DecodeSurface> 2386 scoped_refptr<V4L2SliceVideoDecodeAccelerator::V4L2DecodeSurface>
2387 V4L2SliceVideoDecodeAccelerator::CreateSurface() { 2387 V4L2SliceVideoDecodeAccelerator::CreateSurface() {
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
2460 DCHECK_GT(picture_clearing_count_, 0); 2460 DCHECK_GT(picture_clearing_count_, 0);
2461 picture_clearing_count_--; 2461 picture_clearing_count_--;
2462 SendPictureReady(); 2462 SendPictureReady();
2463 } 2463 }
2464 2464
2465 bool V4L2SliceVideoDecodeAccelerator::CanDecodeOnIOThread() { 2465 bool V4L2SliceVideoDecodeAccelerator::CanDecodeOnIOThread() {
2466 return true; 2466 return true;
2467 } 2467 }
2468 2468
2469 } // namespace content 2469 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698