media/filters/vpx_video_decoder.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: media/filters/vpx_video_decoder.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') | « media/cast/test/fake_media_source.cc ('k') | media/video/gpu_memory_buffer_video_frame_pool.cc » ('j') | media/video/gpu_memory_buffer_video_frame_pool_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/filters/vpx_video_decoder.cc

diff --git a/media/filters/vpx_video_decoder.cc b/media/filters/vpx_video_decoder.cc

index 40814bb273ad5a3f5cc18e96ea9172f9fd4e929b..7d327cc229c8d622db245e723d1151e05b5af4fa 100644

--- a/media/filters/vpx_video_decoder.cc

+++ b/media/filters/vpx_video_decoder.cc

@@ -592,8 +592,9 @@ bool VpxVideoDecoder::CopyVpxImageToVideoFrame(

vpx_image->planes[VPX_PLANE_U],

vpx_image->planes[VPX_PLANE_V],

kNoTimestamp());

- video_frame->get()->AddDestructionObserver(

- memory_pool_->CreateFrameCallback(vpx_image->fb_priv));

+ if (video_frame->get())

+ video_frame->get()->AddDestructionObserver(

+ memory_pool_->CreateFrameCallback(vpx_image->fb_priv));

mcasas 2016/01/12 17:46:16 Needs {} You can test if (video_frame) directly.

emircan 2016/01/14 23:07:40 Done.

UMA_HISTOGRAM_COUNTS("Media.Vpx.VideoDecoderBuffersInUseByDecoder",

memory_pool_->NumberOfFrameBuffersInUseByDecoder());

@@ -610,6 +611,8 @@ bool VpxVideoDecoder::CopyVpxImageToVideoFrame(

*video_frame = frame_pool_.CreateFrame(

codec_format, visible_size, gfx::Rect(visible_size),

config_.natural_size(), kNoTimestamp());

+ if (!(*video_frame))

mcasas 2016/01/12 17:46:16 if (!video_frame) ?

emircan 2016/01/14 23:07:40 Done.

+ return false;

libyuv::I420Copy(

vpx_image->planes[VPX_PLANE_Y], vpx_image->stride[VPX_PLANE_Y],