content/browser/renderer_host/media/video_capture_controller_unittest.cc - Issue 1154153003: Relanding 1143663007: VideoFrame: Separate Pixel Format from Storage Type.

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/browser/renderer_host/media/video_capture_controller_unittest.cc

Issue 1154153003: Relanding 1143663007: VideoFrame: Separate Pixel Format from Storage Type. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added NV12 support in CrOS Created 5 years, 7 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

« no previous file with comments | « content/browser/renderer_host/media/video_capture_controller.cc ('k') | content/browser/renderer_host/media/video_capture_device_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/video_capture_controller_unittest.cc

diff --git a/content/browser/renderer_host/media/video_capture_controller_unittest.cc b/content/browser/renderer_host/media/video_capture_controller_unittest.cc

index 17feadf40121368b4a2ce6db2f1731b805c17a74..70cef133f393e8ca1e1d51d4589351e2bcf761b0 100644

--- a/content/browser/renderer_host/media/video_capture_controller_unittest.cc

+++ b/content/browser/renderer_host/media/video_capture_controller_unittest.cc

@@ -133,15 +133,13 @@ class VideoCaptureControllerTest : public testing::Test {

scoped_refptr<media::VideoFrame> WrapI420Buffer(gfx::Size dimensions,

uint8* data) {

- return media::VideoFrame::WrapExternalPackedMemory(

+ return media::VideoFrame::WrapExternalData(

media::VideoFrame::I420,

dimensions,

gfx::Rect(dimensions),

dimensions,

data,

media::VideoFrame::AllocationSize(media::VideoFrame::I420, dimensions),

- base::SharedMemory::NULLHandle(),

- 0,

base::TimeDelta());

}