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

Unified Diff: ui/gfx/color_space_win.h

Issue 2696963002: Replace IMFTransform with ID3D11VideoProcessor (Closed)
Patch Set: fixed initialization Created 3 years, 10 months 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 | « media/gpu/dxva_video_decode_accelerator_win.cc ('k') | ui/gfx/color_space_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/color_space_win.h
diff --git a/ui/gfx/color_space_win.h b/ui/gfx/color_space_win.h
index 02d80ff72dc41d5ae0e9831a11084ee482356d0e..af11c6e5bffed5c0a37e4dc82883f72d62a8130a 100644
--- a/ui/gfx/color_space_win.h
+++ b/ui/gfx/color_space_win.h
@@ -5,8 +5,14 @@
#ifndef UI_GFX_COLOR_SPACE_WIN_H_
#define UI_GFX_COLOR_SPACE_WIN_H_
+#include <d3d11.h>
#include <d3d9.h>
+// Must be included after d3d headers, use #if to avoid lint errors.
+#if 1
+#include <DXGIType.h>
+#endif
+
// Work around bug in this header by disabling the relevant warning for it.
// https://connect.microsoft.com/VisualStudio/feedback/details/911260/dxva2api-h-in-win8-sdk-triggers-c4201-with-w4
#pragma warning(push)
@@ -21,6 +27,9 @@ namespace gfx {
class GFX_EXPORT ColorSpaceWin {
public:
static DXVA2_ExtendedFormat GetExtendedFormat(const ColorSpace& color_space);
+ static DXGI_COLOR_SPACE_TYPE GetDXGIColorSpace(const ColorSpace& color_space);
+ static D3D11_VIDEO_PROCESSOR_COLOR_SPACE GetD3D11ColorSpace(
+ const ColorSpace& color_space);
};
} // namespace gfx
« no previous file with comments | « media/gpu/dxva_video_decode_accelerator_win.cc ('k') | ui/gfx/color_space_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698