Index: media/gpu/v4l2_video_decode_accelerator.cc |
diff --git a/media/gpu/v4l2_video_decode_accelerator.cc b/media/gpu/v4l2_video_decode_accelerator.cc |
index 19ea4ad445008bb93445411aca8085a6dcc3aaf8..410cd6ca536ad30038c3f43510b2c9455b852114 100644 |
--- a/media/gpu/v4l2_video_decode_accelerator.cc |
+++ b/media/gpu/v4l2_video_decode_accelerator.cc |
@@ -517,6 +517,10 @@ |
decode_client_ = decode_client_; |
decode_task_runner_ = decode_task_runner; |
return true; |
+} |
+ |
+media::VideoPixelFormat V4L2VideoDecodeAccelerator::GetOutputFormat() const { |
+ return V4L2Device::V4L2PixFmtToVideoPixelFormat(egl_image_format_fourcc_); |
} |
// static |
@@ -2032,15 +2036,10 @@ |
DVLOG(3) << "CreateOutputBuffers(): ProvidePictureBuffers(): " |
<< "buffer_count=" << buffer_count |
<< ", coded_size=" << egl_image_size_.ToString(); |
- |
- DCHECK(egl_image_format_fourcc_); |
- VideoPixelFormat pixel_format = |
- V4L2Device::V4L2PixFmtToVideoPixelFormat(egl_image_format_fourcc_); |
- |
child_task_runner_->PostTask( |
- FROM_HERE, base::Bind(&Client::ProvidePictureBuffers, client_, |
- buffer_count, pixel_format, 1, egl_image_size_, |
- device_->GetTextureTarget())); |
+ FROM_HERE, |
+ base::Bind(&Client::ProvidePictureBuffers, client_, buffer_count, 1, |
+ egl_image_size_, device_->GetTextureTarget())); |
// Wait for the client to call AssignPictureBuffers() on the Child thread. |
// We do this, because if we continue decoding without finishing buffer |