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

Unified Diff: content/browser/renderer_host/media/video_capture_buffer_pool_unittest.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_unittest.cc
diff --git a/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc b/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc
index 856f53222d0f1e66faadfde84ccf99f28771999b..5ebb61082da92b3abf42be201202bd3992e54749 100644
--- a/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc
@@ -16,7 +16,6 @@
#include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
#include "content/browser/renderer_host/media/video_capture_controller.h"
#include "media/base/video_frame.h"
-#include "media/base/video_util.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -30,7 +29,6 @@ struct PixelFormatAndStorage {
static const PixelFormatAndStorage kCapturePixelFormatAndStorages[] = {
{media::PIXEL_FORMAT_I420, media::PIXEL_STORAGE_CPU},
{media::PIXEL_FORMAT_ARGB, media::PIXEL_STORAGE_CPU},
- {media::PIXEL_FORMAT_ARGB, media::PIXEL_STORAGE_TEXTURE},
#if !defined(OS_ANDROID)
{media::PIXEL_FORMAT_I420,
media::PIXEL_STORAGE_GPUMEMORYBUFFER},
@@ -225,12 +223,10 @@ TEST_P(VideoCaptureBufferPoolTest, BufferPool) {
ASSERT_LE(format_lo.ImageAllocationSize(), buffer3->mapped_size());
}
- // Texture backed Frames cannot be manipulated via mapping.
- if (GetParam().pixel_storage != media::PIXEL_STORAGE_TEXTURE) {
- ASSERT_NE(nullptr, buffer1->data());
- ASSERT_NE(nullptr, buffer2->data());
- ASSERT_NE(nullptr, buffer3->data());
- }
+ ASSERT_NE(nullptr, buffer1->data());
+ ASSERT_NE(nullptr, buffer2->data());
+ ASSERT_NE(nullptr, buffer3->data());
+
// Touch the memory.
if (buffer1->data() != nullptr)
memset(buffer1->data(), 0x11, buffer1->mapped_size());

Powered by Google App Engine
This is Rietveld 408576698