Commit 93ba7a3b authored by Juanmi Huertas's avatar Juanmi Huertas Committed by Commit Bot

Revert "Add tests for D3D11DefaultTextureWrapper"

This reverts commit 9184313f.

Reason for revert: https://bugs.chromium.org/p/chromium/issues/detail?id=1065575

Various Win 7 bots are failing these newly added tests.

Reverting, feel free to reland if this was not the culprit, but to reland, add the failing bots to ensure it works there: Win 7 Tests x64, Win7 Tests

Original change's description:
> Add tests for D3D11DefaultTextureWrapper
> 
> Also fixes binding P010.
> 
> Change-Id: Iba389bf5f883662d1ac2f7aa396992ff662d009d
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2107054
> Auto-Submit: Frank Liberato <liberato@chromium.org>
> Reviewed-by: Ted Meyer <tmathmeyer@chromium.org>
> Commit-Queue: Ted Meyer <tmathmeyer@chromium.org>
> Commit-Queue: Frank Liberato <liberato@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#754168}

TBR=liberato@chromium.org,tmathmeyer@chromium.org

Change-Id: I2ffcd42d6dff66dfae7f2487837d65c02507cc6f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2125469Reviewed-by: default avatarJuanmi Huertas <juanmihd@chromium.org>
Commit-Queue: Juanmi Huertas <juanmihd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#754229}
parent fbebeeb9
...@@ -485,11 +485,9 @@ source_set("unit_tests") { ...@@ -485,11 +485,9 @@ source_set("unit_tests") {
"//base/test:test_support", "//base/test:test_support",
"//media:test_support", "//media:test_support",
"//media/gpu", "//media/gpu",
"//media/gpu:test_support",
"//media/gpu/ipc/service:unit_tests", "//media/gpu/ipc/service:unit_tests",
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",
"//ui/gl:test_support",
] ]
sources = [ "h264_decoder_unittest.cc" ] sources = [ "h264_decoder_unittest.cc" ]
...@@ -514,7 +512,6 @@ source_set("unit_tests") { ...@@ -514,7 +512,6 @@ source_set("unit_tests") {
"windows/d3d11_decoder_configurator_unittest.cc", "windows/d3d11_decoder_configurator_unittest.cc",
"windows/d3d11_decryptor_unittest.cc", "windows/d3d11_decryptor_unittest.cc",
"windows/d3d11_texture_selector_unittest.cc", "windows/d3d11_texture_selector_unittest.cc",
"windows/d3d11_texture_wrapper_unittest.cc",
"windows/d3d11_video_decoder_unittest.cc", "windows/d3d11_video_decoder_unittest.cc",
"windows/d3d11_video_device_format_support_unittest.cc", "windows/d3d11_video_device_format_support_unittest.cc",
"windows/d3d11_video_processor_proxy_unittest.cc", "windows/d3d11_video_processor_proxy_unittest.cc",
......
...@@ -96,7 +96,6 @@ bool DefaultTexture2DWrapper::Init(GetCommandBufferHelperCB get_helper_cb) { ...@@ -96,7 +96,6 @@ bool DefaultTexture2DWrapper::Init(GetCommandBufferHelperCB get_helper_cb) {
int textures_per_picture = 0; int textures_per_picture = 0;
switch (dxgi_format_) { switch (dxgi_format_) {
case DXGI_FORMAT_NV12: case DXGI_FORMAT_NV12:
case DXGI_FORMAT_P010:
textures_per_picture = 2; textures_per_picture = 2;
break; break;
case DXGI_FORMAT_B8G8R8A8_UNORM: case DXGI_FORMAT_B8G8R8A8_UNORM:
......
// Copyright 2020 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "media/gpu/windows/d3d11_texture_wrapper.h"
#include <utility>
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/single_thread_task_runner.h"
#include "base/test/task_environment.h"
#include "media/gpu/test/fake_command_buffer_helper.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gl/gl_egl_api_implementation.h"
#include "ui/gl/gl_image.h"
#include "ui/gl/gl_surface.h"
#include "ui/gl/init/gl_factory.h"
#include "ui/gl/test/gl_image_test_support.h"
using ::testing::_;
using ::testing::Bool;
using ::testing::Combine;
using ::testing::Return;
using ::testing::Values;
namespace media {
class D3D11TextureWrapperUnittest : public ::testing::Test {
public:
void SetUp() override {
task_runner_ = task_environment_.GetMainThreadTaskRunner();
gl::GLImageTestSupport::InitializeGL(gl::kGLImplementationEGLANGLE);
surface_ = gl::init::CreateOffscreenGLSurface(gfx::Size());
context_ = gl::init::CreateGLContext(nullptr, surface_.get(),
gl::GLContextAttribs());
context_->MakeCurrent(surface_.get());
// Create some objects that most tests want.
fake_command_buffer_helper_ =
base::MakeRefCounted<FakeCommandBufferHelper>(task_runner_);
get_helper_cb_ = base::BindRepeating(
[](scoped_refptr<CommandBufferHelper> helper) { return helper; },
fake_command_buffer_helper_);
}
void TearDown() override {
context_->ReleaseCurrent(surface_.get());
context_ = nullptr;
surface_ = nullptr;
gl::GLImageTestSupport::CleanupGL();
}
base::test::TaskEnvironment task_environment_;
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
scoped_refptr<gl::GLSurface> surface_;
scoped_refptr<gl::GLContext> context_;
// Made-up size for the images.
const gfx::Size size_{100, 200};
// CommandBufferHelper, and a callback that returns it. Useful to initialize
// a wrapper.
scoped_refptr<FakeCommandBufferHelper> fake_command_buffer_helper_;
GetCommandBufferHelperCB get_helper_cb_;
};
TEST_F(D3D11TextureWrapperUnittest, NV12InitSuceeds) {
const DXGI_FORMAT dxgi_format = DXGI_FORMAT_NV12;
auto wrapper = std::make_unique<DefaultTexture2DWrapper>(size_, dxgi_format);
const bool init_result = wrapper->Init(get_helper_cb_);
EXPECT_TRUE(init_result);
// TODO: verify that ProcessTexture processes both textures.
}
TEST_F(D3D11TextureWrapperUnittest, BGRA8InitSuceeds) {
const DXGI_FORMAT dxgi_format = DXGI_FORMAT_B8G8R8A8_UNORM;
auto wrapper = std::make_unique<DefaultTexture2DWrapper>(size_, dxgi_format);
const bool init_result = wrapper->Init(get_helper_cb_);
EXPECT_TRUE(init_result);
}
TEST_F(D3D11TextureWrapperUnittest, FP16InitSuceeds) {
const DXGI_FORMAT dxgi_format = DXGI_FORMAT_R16G16B16A16_FLOAT;
auto wrapper = std::make_unique<DefaultTexture2DWrapper>(size_, dxgi_format);
const bool init_result = wrapper->Init(get_helper_cb_);
EXPECT_TRUE(init_result);
}
TEST_F(D3D11TextureWrapperUnittest, P010InitSuceeds) {
const DXGI_FORMAT dxgi_format = DXGI_FORMAT_P010;
auto wrapper = std::make_unique<DefaultTexture2DWrapper>(size_, dxgi_format);
const bool init_result = wrapper->Init(get_helper_cb_);
EXPECT_TRUE(init_result);
}
} // namespace media
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment