content/browser/renderer_host/media/video_capture_buffer_pool.cc - Issue 1439533004: Remove dead code paths around PIXEL_STORAGE_TEXTURE in capture pipeline.

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

Issue 1439533004: Remove dead code paths around PIXEL_STORAGE_TEXTURE in capture pipeline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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

« no previous file with comments | « content/browser/media/capture/desktop_capture_device_aura_unittest.cc ('k') | content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc » ('j') | content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index b358021bfbec005a9ebb8d103a1703ed35604cc2..30ee8ecccdcae76f232e8bfdcf8d8810b73cdbee 100644

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

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

@@ -261,8 +261,7 @@ scoped_ptr<VideoCaptureBufferPool::Tracker>

VideoCaptureBufferPool::Tracker::CreateTracker(

media::VideoPixelStorage storage) {

DCHECK(storage == media::PIXEL_STORAGE_GPUMEMORYBUFFER ||

- storage == media::PIXEL_STORAGE_CPU ||

- storage == media::PIXEL_STORAGE_TEXTURE);

+ storage == media::PIXEL_STORAGE_CPU);

mcasas 2015/11/13 19:13:57 Actually, these are all the cases now, remove this

miu 2015/11/14 03:43:47 Done. Replaced with switch statement to ensure co

if (storage == media::PIXEL_STORAGE_GPUMEMORYBUFFER)

return make_scoped_ptr(new GpuMemoryBufferTracker());