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..c7980bd71527e7fd9d60e0c8afefe7a86e67bc58 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()))) { |
+ NOTREACHED() << "Invalid picture size from VDA: " |
+ << picture.size().ToString() << " should fit in " |
+ << pb.size().ToString(); |
+ 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 |
ddorwin
2014/08/18 18:50:08
from previous PS: okay, just to be clear nit: ...
kcwu
2014/08/19 09:45:49
Done.
|
+ // config information instead. |
gfx::Rect visible_rect; |
gfx::Size natural_size; |
GetBufferData(picture.bitstream_buffer_id(), ×tamp, &visible_rect, |