content/renderer/media/video_capture_impl.cc - Issue 48113011: Remove media::VideoFrame from media::VideoCaptureDevice::Client interface

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_capture_impl.cc

Issue 48113011: Remove media::VideoFrame from media::VideoCaptureDevice::Client interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@git-svn

Patch Set: ffdbaeb83 Trybot failures. Created 7 years, 1 month 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

Index: content/renderer/media/video_capture_impl.cc

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

index b9bff03eeee6cd5fe15919b0b2c7aeedf9aec9c5..8fd24f86b39fa08a7d6d23573af1607e3a6bb226 100644

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

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

@@ -258,9 +258,11 @@ void VideoCaptureImpl::DoBufferReceivedOnCaptureThread(

DCHECK(iter != client_buffers_.end());

scoped_refptr<ClientBuffer> buffer = iter->second;

scoped_refptr<media::VideoFrame> frame =

- media::VideoFrame::WrapExternalSharedMemory(

+ media::VideoFrame::WrapExternalPackedMemory(

media::VideoFrame::I420,

- size, gfx::Rect(size), size,

+ size,

+ gfx::Rect(size),

+ size,

reinterpret_cast<uint8*>(buffer->buffer->memory()),

buffer->buffer_size,

buffer->buffer->handle(),

« no previous file with comments | « content/renderer/media/rtc_video_encoder.cc ('k') | media/base/video_frame.h » ('j') | no next file with comments »