content/browser/renderer_host/media/video_capture_device_client.cc - Issue 1134643002: Add distinction between RGB and RGBA native texture video frames and resources

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 1134643002: Add distinction between RGB and RGBA native texture video frames and resources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix unit test breakage from bad merge 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/renderer/media/android/webmediaplayer_android.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 6d365b7bc828dc144deba91255bd5e710c211755..5196ad3b428d97133298affecb6c9d0f56951590 100644

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

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

@@ -566,7 +566,8 @@ VideoCaptureDeviceClient::TextureWrapHelper::OnIncomingCapturedGpuMemoryBuffer(

&VideoCaptureDeviceClient::TextureWrapHelper::ReleaseCallback,

this, image_id, texture_id)),

frame_format.frame_size, gfx::Rect(frame_format.frame_size),

- frame_format.frame_size, base::TimeDelta(), true /* allow_overlay */);

+ frame_format.frame_size, base::TimeDelta(), true /* allow_overlay */,

+ true /* has_alpha */);

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

frame_format.frame_rate);