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

Unified Diff: media/gpu/v4l2_slice_video_decode_accelerator.cc

Issue 2462393002: Use texture ids passed from ARC as service ids in ArcGVDA (Closed)
Patch Set: DCHECK and format fixup Created 4 years, 1 month 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
Index: media/gpu/v4l2_slice_video_decode_accelerator.cc
diff --git a/media/gpu/v4l2_slice_video_decode_accelerator.cc b/media/gpu/v4l2_slice_video_decode_accelerator.cc
index 1ff9abee697c1e8d40f68210e837ac4a189b96a7..aa096a8cd1510589a00b4162db3e4772539244a2 100644
--- a/media/gpu/v4l2_slice_video_decode_accelerator.cc
+++ b/media/gpu/v4l2_slice_video_decode_accelerator.cc
@@ -1629,7 +1629,6 @@ void V4L2SliceVideoDecodeAccelerator::AssignPictureBuffersTask(
output_buffer_map_.resize(buffers.size());
for (size_t i = 0; i < output_buffer_map_.size(); ++i) {
DCHECK(buffers[i].size() == coded_size_);
- DCHECK_EQ(1u, buffers[i].service_texture_ids().size());
OutputRecord& output_record = output_buffer_map_[i];
DCHECK(!output_record.at_device);
@@ -1641,7 +1640,16 @@ void V4L2SliceVideoDecodeAccelerator::AssignPictureBuffersTask(
DCHECK_EQ(output_record.cleared, false);
output_record.picture_id = buffers[i].id();
+
+ if (buffers[i].service_texture_ids().empty()) {
+ LOGF(ERROR) << "No texture ids provided";
+ NOTIFY_ERROR(INVALID_ARGUMENT);
+ return;
+ }
+ // We only support one texture per buffer currently.
+ DCHECK_EQ(1u, buffers[i].service_texture_ids().size());
output_record.texture_id = buffers[i].service_texture_ids()[0];
+
// This will remain true until ImportBufferForPicture is called, either by
// the client, or by ourselves, if we are allocating.
output_record.at_client = true;

Powered by Google App Engine
This is Rietveld 408576698