Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(548)

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: mcasas's second round comments REBASE 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
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..76cc9b6bf0fefc4655913b88a4a86d4905372458 100644
--- a/content/browser/renderer_host/media/video_capture_buffer_pool.cc
+++ b/content/browser/renderer_host/media/video_capture_buffer_pool.cc
@@ -260,14 +260,14 @@ bool VideoCaptureBufferPool::GpuMemoryBufferTracker::ShareToProcess2(
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);
-
- if (storage == media::PIXEL_STORAGE_GPUMEMORYBUFFER)
- return make_scoped_ptr(new GpuMemoryBufferTracker());
- else
- return make_scoped_ptr(new SharedMemTracker());
+ switch (storage) {
+ case media::PIXEL_STORAGE_GPUMEMORYBUFFER:
+ return make_scoped_ptr(new GpuMemoryBufferTracker());
+ case media::PIXEL_STORAGE_CPU:
+ return make_scoped_ptr(new SharedMemTracker());
+ }
+ NOTREACHED();
+ return scoped_ptr<VideoCaptureBufferPool::Tracker>();
}
VideoCaptureBufferPool::Tracker::~Tracker() {}

Powered by Google App Engine
This is Rietveld 408576698