Index: media/gpu/dxva_video_decode_accelerator_win.h |
diff --git a/media/gpu/dxva_video_decode_accelerator_win.h b/media/gpu/dxva_video_decode_accelerator_win.h |
index 9706516b2a16cb960a0917fe443768acfdc83f02..01fce99c2c2f2ea91c50e1ae7c191220c2016fa1 100644 |
--- a/media/gpu/dxva_video_decode_accelerator_win.h |
+++ b/media/gpu/dxva_video_decode_accelerator_win.h |
@@ -5,7 +5,7 @@ |
#ifndef MEDIA_GPU_DXVA_VIDEO_DECODE_ACCELERATOR_WIN_H_ |
#define MEDIA_GPU_DXVA_VIDEO_DECODE_ACCELERATOR_WIN_H_ |
-#include <d3d11.h> |
+#include <d3d11_1.h> |
#include <d3d9.h> |
#include <initguid.h> |
#include <stdint.h> |
@@ -317,9 +317,10 @@ class MEDIA_GPU_EXPORT DXVAVideoDecodeAccelerator |
ID3D11Texture2D* dest_texture, |
base::win::ScopedComPtr<IDXGIKeyedMutex> dest_keyed_mutex, |
uint64_t keyed_mutex_value, |
- base::win::ScopedComPtr<IMFSample> video_frame, |
+ base::win::ScopedComPtr<IMFSample> input_sample, |
int picture_buffer_id, |
- int input_buffer_id); |
+ int input_buffer_id, |
+ const gfx::ColorSpace& color_space); |
// Flushes the decoder device to ensure that the decoded surface is copied |
// to the target surface. |iterations| helps to maintain an upper limit on |
@@ -334,13 +335,6 @@ class MEDIA_GPU_EXPORT DXVAVideoDecodeAccelerator |
// before reusing it. |
void WaitForOutputBuffer(int32_t picture_buffer_id, int count); |
- // Initializes the DX11 Video format converter media types. |
- // Returns true on success. |
- bool InitializeDX11VideoFormatConverterMediaType( |
- int width, |
- int height, |
- const gfx::ColorSpace& color_space); |
- |
// Returns the output video frame dimensions (width, height). |
// |sample| :- This is the output sample containing the video frame. |
// |width| :- The width is returned here. |
@@ -377,7 +371,6 @@ class MEDIA_GPU_EXPORT DXVAVideoDecodeAccelerator |
VideoDecodeAccelerator::Client* client_; |
base::win::ScopedComPtr<IMFTransform> decoder_; |
- base::win::ScopedComPtr<IMFTransform> video_format_converter_mft_; |
base::win::ScopedComPtr<IDirect3D9Ex> d3d9_; |
base::win::ScopedComPtr<IDirect3DDevice9Ex> d3d9_device_ex_; |
@@ -391,6 +384,11 @@ class MEDIA_GPU_EXPORT DXVAVideoDecodeAccelerator |
base::win::ScopedComPtr<ID3D11DeviceContext> d3d11_device_context_; |
base::win::ScopedComPtr<ID3D11Query> d3d11_query_; |
+ base::win::ScopedComPtr<ID3D11VideoDevice> video_device_; |
+ base::win::ScopedComPtr<ID3D11VideoContext1> video_context_; |
+ base::win::ScopedComPtr<ID3D11VideoProcessorEnumerator> enumerator_; |
+ base::win::ScopedComPtr<ID3D11VideoProcessor> d3d11_processor_; |
+ |
base::win::ScopedComPtr<IDirectXVideoProcessorService> |
video_processor_service_; |
base::win::ScopedComPtr<IDirectXVideoProcessor> processor_; |