content/renderer/pepper/pepper_video_encoder_host.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/renderer/pepper/pepper_video_encoder_host.cc

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

Patch Set: Rebase. 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/common/gpu/media/video_encode_accelerator_unittest.cc ('K') | « content/renderer/pepper/pepper_media_stream_video_track_host.cc ('k') | media/base/video_frame.cc » ('j') | media/filters/vpx_video_decoder.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/pepper/pepper_video_encoder_host.cc

diff --git a/content/renderer/pepper/pepper_video_encoder_host.cc b/content/renderer/pepper/pepper_video_encoder_host.cc

index d976368d409cd0348508733821435adea22b1192..b78131d527354105fab42b2070ef13ca8ffac620 100644

--- a/content/renderer/pepper/pepper_video_encoder_host.cc

+++ b/content/renderer/pepper/pepper_video_encoder_host.cc

@@ -631,6 +631,10 @@ scoped_refptr<media::VideoFrame> PepperVideoEncoderHost::CreateVideoFrame(

input_coded_size_, static_cast<uint8_t*>(buffer->video.data),

buffer->video.data_size, buffer_manager_.shm()->handle(), shm_offset,

base::TimeDelta());

+ if (!frame) {

+ NotifyPepperError(PP_ERROR_FAILED);

+ return frame;

+ }

frame->AddDestructionObserver(

base::Bind(&PepperVideoEncoderHost::FrameReleased,

weak_ptr_factory_.GetWeakPtr(), reply_context, frame_id));