| Index: media/filters/gpu_video_decoder.cc
|
| diff --git a/media/filters/gpu_video_decoder.cc b/media/filters/gpu_video_decoder.cc
|
| index 16a33eae54c6fc3cdff4f65b09e773af14392a01..68651f858f625b7095c12d463b05f868c5101a21 100644
|
| --- a/media/filters/gpu_video_decoder.cc
|
| +++ b/media/filters/gpu_video_decoder.cc
|
| @@ -422,8 +422,21 @@ void GpuVideoDecoder::PictureReady(const media::Picture& picture) {
|
| }
|
| const PictureBuffer& pb = it->second;
|
|
|
| + // Validate picture size from GPU
|
| + if (picture.size().IsEmpty() ||
|
| + !gfx::Rect(pb.size()).Contains(gfx::Rect(picture.size()))) {
|
| + LOG(ERROR) << "Invalid picture size: " << pb.size().ToString()
|
| + << " from PictureBuffer, but " << picture.size().ToString()
|
| + << " from GPU";
|
| + NotifyError(media::VideoDecodeAccelerator::PLATFORM_FAILURE);
|
| + return;
|
| + }
|
| +
|
| // Update frame's timestamp.
|
| base::TimeDelta timestamp;
|
| + // Some of the VDAs don't support and thus don't provide us with visible
|
| + // size in picture.size, passing coded size instead, so drop it and use
|
| + // config information instead.
|
| gfx::Rect visible_rect;
|
| gfx::Size natural_size;
|
| GetBufferData(picture.bitstream_buffer_id(), ×tamp, &visible_rect,
|
|
|