content/browser/renderer_host/media/video_capture_device_client.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_device_client.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_unittest.cc ('k') | content/common/gpu/media/gpu_video_encode_accelerator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index b9885c3e0cc8c1fc49fd24978541a33f5c01c1a9..b739aca1967fb8176190fb2f9b0c7272d542623d 100644

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

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

@@ -247,6 +247,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData(

const gfx::Size dimensions(destination_width, destination_height);

if (!VideoFrame::IsValidConfig(VideoFrame::I420,

+ VideoFrame::STORAGE_UNKNOWN,

dimensions,

gfx::Rect(dimensions),

dimensions)) {

@@ -460,7 +461,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedBuffer(

} else {

DCHECK_EQ(frame_format.pixel_format, media::PIXEL_FORMAT_I420);

scoped_refptr<VideoFrame> video_frame =

- VideoFrame::WrapExternalPackedMemory(

+ VideoFrame::WrapExternalData(

VideoFrame::I420,

frame_format.frame_size,

gfx::Rect(frame_format.frame_size),

@@ -468,8 +469,6 @@ void VideoCaptureDeviceClient::OnIncomingCapturedBuffer(

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

VideoFrame::AllocationSize(VideoFrame::I420,

frame_format.frame_size),

- base::SharedMemory::NULLHandle(),

- 0 /* shared_memory_offset */,

base::TimeDelta());

DCHECK(video_frame.get());

video_frame->metadata()->SetDouble(media::VideoFrameMetadata::FRAME_RATE,