| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef UI_GFX_COLOR_SPACE_WIN_H_ | 5 #ifndef UI_GFX_COLOR_SPACE_WIN_H_ |
| 6 #define UI_GFX_COLOR_SPACE_WIN_H_ | 6 #define UI_GFX_COLOR_SPACE_WIN_H_ |
| 7 | 7 |
| 8 #include <d3d11.h> | |
| 9 #include <d3d9.h> | 8 #include <d3d9.h> |
| 10 | 9 |
| 11 // Must be included after d3d headers, use #if to avoid lint errors. | |
| 12 #if 1 | |
| 13 #include <DXGIType.h> | |
| 14 #endif | |
| 15 | |
| 16 // Work around bug in this header by disabling the relevant warning for it. | 10 // Work around bug in this header by disabling the relevant warning for it. |
| 17 // https://connect.microsoft.com/VisualStudio/feedback/details/911260/dxva2api-h
-in-win8-sdk-triggers-c4201-with-w4 | 11 // https://connect.microsoft.com/VisualStudio/feedback/details/911260/dxva2api-h
-in-win8-sdk-triggers-c4201-with-w4 |
| 18 #pragma warning(push) | 12 #pragma warning(push) |
| 19 #pragma warning(disable : 4201) | 13 #pragma warning(disable : 4201) |
| 20 #include <dxva2api.h> | 14 #include <dxva2api.h> |
| 21 #pragma warning(pop) | 15 #pragma warning(pop) |
| 22 | 16 |
| 23 #include "ui/gfx/color_space.h" | 17 #include "ui/gfx/color_space.h" |
| 24 | 18 |
| 25 namespace gfx { | 19 namespace gfx { |
| 26 | 20 |
| 27 class GFX_EXPORT ColorSpaceWin { | 21 class GFX_EXPORT ColorSpaceWin { |
| 28 public: | 22 public: |
| 29 static DXVA2_ExtendedFormat GetExtendedFormat(const ColorSpace& color_space); | 23 static DXVA2_ExtendedFormat GetExtendedFormat(const ColorSpace& color_space); |
| 30 static DXGI_COLOR_SPACE_TYPE GetDXGIColorSpace(const ColorSpace& color_space); | |
| 31 static D3D11_VIDEO_PROCESSOR_COLOR_SPACE GetD3D11ColorSpace( | |
| 32 const ColorSpace& color_space); | |
| 33 }; | 24 }; |
| 34 | 25 |
| 35 } // namespace gfx | 26 } // namespace gfx |
| 36 #endif | 27 #endif |
| OLD | NEW |