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 fbcf804fac61c07a8a0e0c3143d885d3b9ae44c0..eeea0386af2e9c1cad0e22342c4b290997d48d57 100644 |
--- a/media/gpu/dxva_video_decode_accelerator_win.h |
+++ b/media/gpu/dxva_video_decode_accelerator_win.h |
@@ -71,7 +71,6 @@ class H264ConfigChangeDetector { |
// Detects stream configuration changes. |
// Returns false on failure. |
bool DetectConfig(const uint8_t* stream, unsigned int size); |
- |
bool config_changed() const { return config_changed_; } |
gfx::ColorSpace current_color_space() const; |
@@ -168,6 +167,9 @@ class MEDIA_GPU_EXPORT DXVAVideoDecodeAccelerator |
// passed to the IMFTransform interface implemented by the decoder. |
bool CreateD3DDevManager(); |
+ // TODO(hubbe): COMMENT |
+ bool CreateVideoProcessor(); |
+ |
// Creates and initializes an instance of the DX11 device and the |
// corresponding device manager. The device manager instance is eventually |
// passed to the IMFTransform interface implemented by the decoder. |
@@ -281,7 +283,8 @@ class MEDIA_GPU_EXPORT DXVAVideoDecodeAccelerator |
void CopySurface(IDirect3DSurface9* src_surface, |
IDirect3DSurface9* dest_surface, |
int picture_buffer_id, |
- int input_buffer_id); |
+ int input_buffer_id, |
+ const gfx::ColorSpace& color_space); |
// This is a notification that the source surface |src_surface| was copied to |
// the destination |dest_surface|. Received on the main thread. |
@@ -377,6 +380,11 @@ class MEDIA_GPU_EXPORT DXVAVideoDecodeAccelerator |
base::win::ScopedComPtr<ID3D11DeviceContext> d3d11_device_context_; |
base::win::ScopedComPtr<ID3D11Query> d3d11_query_; |
+ base::win::ScopedComPtr<IDirectXVideoProcessorService> |
+ video_processor_service_; |
+ base::win::ScopedComPtr<IDirectXVideoProcessor> processor_; |
+ DXVA2_ProcAmpValues default_procamp_values_; |
+ |
// Ideally the reset token would be a stack variable which is used while |
// creating the device manager. However it seems that the device manager |
// holds onto the token and attempts to access it if the underlying device |