content/browser/renderer_host/media/video_capture_controller.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.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_buffer_pool.cc ('k') | content/browser/renderer_host/media/video_capture_controller_unittest.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.cc

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

index 23ee7074a2d73a365000d5369b39d28e50b2adc8..fd098e7f96f081441aaabb8111c6675ad13448ff 100644

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

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

@@ -298,10 +298,10 @@ void VideoCaptureController::DoIncomingCapturedVideoFrameOnIOThread(

else

copy_of_metadata.reset(metadata->DeepCopy());

- if (frame->format() == VideoFrame::NATIVE_TEXTURE) {

+ if (frame->storage_type() == VideoFrame::STORAGE_TEXTURE) {

DCHECK(frame->coded_size() == frame->visible_rect().size())

<< "Textures are always supposed to be tightly packed.";

- DCHECK_EQ(1u, VideoFrame::NumTextures(frame->texture_format()));

+ DCHECK_EQ(1u, VideoFrame::NumPlanes(frame->format()));

client->event_handler->OnMailboxBufferReady(

client->controller_id, buffer_id, frame->mailbox_holder(0),

frame->coded_size(), timestamp, copy_of_metadata.Pass());