content/common/gpu/media/vaapi_jpeg_decode_accelerator.cc - Issue 1706023003: Moving the validation of bitstream_buffer into VDA implementations.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/common/gpu/media/vaapi_jpeg_decode_accelerator.cc

Issue 1706023003: Moving the validation of bitstream_buffer into VDA implementations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix compiling errors on windows Created 4 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/common/gpu/media/v4l2_video_decode_accelerator.cc ('k') | content/common/gpu/media/vaapi_video_decode_accelerator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/media/vaapi_jpeg_decode_accelerator.cc

diff --git a/content/common/gpu/media/vaapi_jpeg_decode_accelerator.cc b/content/common/gpu/media/vaapi_jpeg_decode_accelerator.cc

index 8efb362180dce6690939cd39fd2e8ee4c50b9664..d294ae591954025cc7fd0ac133cd673a0273e239 100644

--- a/content/common/gpu/media/vaapi_jpeg_decode_accelerator.cc

+++ b/content/common/gpu/media/vaapi_jpeg_decode_accelerator.cc

@@ -289,6 +289,15 @@ void VaapiJpegDecodeAccelerator::Decode(

DVLOG(4) << "Mapping new input buffer id: " << bitstream_buffer.id()

<< " size: " << bitstream_buffer.size();

+ if (bitstream_buffer.id() < 0) {

+ LOG(ERROR) << "Invalid bitstream_buffer, id: " << bitstream_buffer.id();

+ if (base::SharedMemory::IsHandleValid(bitstream_buffer.handle()))

+ base::SharedMemory::CloseHandle(bitstream_buffer.handle());

+ NotifyErrorFromDecoderThread(bitstream_buffer.id(), INVALID_ARGUMENT);

+ return;

+ }

scoped_ptr<base::SharedMemory> shm(

new base::SharedMemory(bitstream_buffer.handle(), true));