| 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 CONTENT_COMMON_GPU_MEDIA_DXVA_VIDEO_DECODE_ACCELERATOR_H_ | 5 #ifndef CONTENT_COMMON_GPU_MEDIA_DXVA_VIDEO_DECODE_ACCELERATOR_H_ | 
| 6 #define CONTENT_COMMON_GPU_MEDIA_DXVA_VIDEO_DECODE_ACCELERATOR_H_ | 6 #define CONTENT_COMMON_GPU_MEDIA_DXVA_VIDEO_DECODE_ACCELERATOR_H_ | 
| 7 | 7 | 
| 8 #include <d3d11.h> | 8 #include <d3d11.h> | 
| 9 #include <d3d9.h> | 9 #include <d3d9.h> | 
| 10 // 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. | 
| (...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 251   base::win::ScopedComPtr<IMFTransform> video_format_converter_mft_; | 251   base::win::ScopedComPtr<IMFTransform> video_format_converter_mft_; | 
| 252 | 252 | 
| 253   base::win::ScopedComPtr<IDirect3D9Ex> d3d9_; | 253   base::win::ScopedComPtr<IDirect3D9Ex> d3d9_; | 
| 254   base::win::ScopedComPtr<IDirect3DDevice9Ex> d3d9_device_ex_; | 254   base::win::ScopedComPtr<IDirect3DDevice9Ex> d3d9_device_ex_; | 
| 255   base::win::ScopedComPtr<IDirect3DDeviceManager9> device_manager_; | 255   base::win::ScopedComPtr<IDirect3DDeviceManager9> device_manager_; | 
| 256   base::win::ScopedComPtr<IDirect3DQuery9> query_; | 256   base::win::ScopedComPtr<IDirect3DQuery9> query_; | 
| 257 | 257 | 
| 258   base::win::ScopedComPtr<ID3D11Device > d3d11_device_; | 258   base::win::ScopedComPtr<ID3D11Device > d3d11_device_; | 
| 259   base::win::ScopedComPtr<IMFDXGIDeviceManager> d3d11_device_manager_; | 259   base::win::ScopedComPtr<IMFDXGIDeviceManager> d3d11_device_manager_; | 
| 260   base::win::ScopedComPtr<ID3D10Multithread> multi_threaded_; | 260   base::win::ScopedComPtr<ID3D10Multithread> multi_threaded_; | 
|  | 261   base::win::ScopedComPtr<ID3D11DeviceContext> d3d11_device_context_; | 
|  | 262   base::win::ScopedComPtr<ID3D11Query> d3d11_query_; | 
| 261 | 263 | 
| 262   // Ideally the reset token would be a stack variable which is used while | 264   // Ideally the reset token would be a stack variable which is used while | 
| 263   // creating the device manager. However it seems that the device manager | 265   // creating the device manager. However it seems that the device manager | 
| 264   // holds onto the token and attempts to access it if the underlying device | 266   // holds onto the token and attempts to access it if the underlying device | 
| 265   // changes. | 267   // changes. | 
| 266   // TODO(ananta): This needs to be verified. | 268   // TODO(ananta): This needs to be verified. | 
| 267   uint32 dev_manager_reset_token_; | 269   uint32 dev_manager_reset_token_; | 
| 268 | 270 | 
| 269   // Reset token for the DX11 device manager. | 271   // Reset token for the DX11 device manager. | 
| 270   uint32 dx11_dev_manager_reset_token_; | 272   uint32 dx11_dev_manager_reset_token_; | 
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 373 | 375 | 
| 374   // Function pointer for the MFCreateDXGIDeviceManager API. | 376   // Function pointer for the MFCreateDXGIDeviceManager API. | 
| 375   static CreateDXGIDeviceManager create_dxgi_device_manager_; | 377   static CreateDXGIDeviceManager create_dxgi_device_manager_; | 
| 376 | 378 | 
| 377   DISALLOW_COPY_AND_ASSIGN(DXVAVideoDecodeAccelerator); | 379   DISALLOW_COPY_AND_ASSIGN(DXVAVideoDecodeAccelerator); | 
| 378 }; | 380 }; | 
| 379 | 381 | 
| 380 }  // namespace content | 382 }  // namespace content | 
| 381 | 383 | 
| 382 #endif  // CONTENT_COMMON_GPU_MEDIA_DXVA_VIDEO_DECODE_ACCELERATOR_H_ | 384 #endif  // CONTENT_COMMON_GPU_MEDIA_DXVA_VIDEO_DECODE_ACCELERATOR_H_ | 
| OLD | NEW | 
|---|