content/common/gpu/media/gpu_video_encode_accelerator.cc - Issue 1476523005: Verify returned frames from media::VideoFrame::Wrap*() methods

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/gpu_video_encode_accelerator.cc

Issue 1476523005: Verify returned frames from media::VideoFrame::Wrap*() methods (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: posciak@ comments. Created 4 years, 11 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

« content/browser/renderer_host/media/video_capture_controller_unittest.cc ('K') | « content/common/gpu/media/gpu_jpeg_decode_accelerator.cc ('k') | content/common/gpu/media/v4l2_image_processor.cc » ('j') | content/common/gpu/media/video_encode_accelerator_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index ff80628bf57b5fc5220db828579e7729f6c2080b..7dd9a082b1d1426b27e2c09520b96505cfebd458 100644

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

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

@@ -276,7 +276,7 @@ void GpuVideoEncodeAccelerator::OnEncode(

if (!shm->MapAt(map_offset.ValueOrDie(), map_size.ValueOrDie())) {

DLOG(ERROR) << "GpuVideoEncodeAccelerator::OnEncode(): "

- "could not map frame_id=" << params.frame_id;

+ << "could not map frame_id=" << params.frame_id;

NotifyError(media::VideoEncodeAccelerator::kPlatformFailureError);

return;

}

@@ -294,7 +294,7 @@ void GpuVideoEncodeAccelerator::OnEncode(

params.buffer_handle,

params.buffer_offset,

params.timestamp);

- if (!frame.get()) {

+ if (!frame) {

DLOG(ERROR) << "GpuVideoEncodeAccelerator::OnEncode(): "

<< "could not create a frame";

NotifyError(media::VideoEncodeAccelerator::kPlatformFailureError);