content/renderer/media/video_track_adapter.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/media/video_track_adapter.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/common/gpu/media/video_encode_accelerator_unittest.cc ('K') | « content/renderer/media/video_capture_impl.cc ('k') | content/renderer/media/webrtc/media_stream_remote_video_source.cc » ('j') | media/video/gpu_memory_buffer_video_frame_pool_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/video_track_adapter.cc

diff --git a/content/renderer/media/video_track_adapter.cc b/content/renderer/media/video_track_adapter.cc

index 9f4e2abca32a072fe7043a00c9a03d2b1bc242be..7404713a427e299cbe05e06f3a34e5e961e9db36 100644

--- a/content/renderer/media/video_track_adapter.cc

+++ b/content/renderer/media/video_track_adapter.cc

@@ -263,6 +263,8 @@ void VideoTrackAdapter::VideoFrameResolutionAdapter::DeliverFrame(

video_frame =

media::VideoFrame::WrapVideoFrame(frame, region_in_frame, desired_size);

+ if (!video_frame)

+ return;

video_frame->AddDestructionObserver(

base::Bind(&ReleaseOriginalFrame, frame));