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

Side by Side Diff: content/common/gpu/media/dxva_video_decode_accelerator.h

Issue 1493913003: Ensure that the code in the DXVA DX11 decoder which can potentially access the DX11 device context … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove commented out code Created 5 years 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 unified diff | Download patch
OLDNEW
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 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 media::VideoDecodeAccelerator::Client* client_; 249 media::VideoDecodeAccelerator::Client* client_;
250 250
251 base::win::ScopedComPtr<IMFTransform> decoder_; 251 base::win::ScopedComPtr<IMFTransform> decoder_;
252 base::win::ScopedComPtr<IMFTransform> video_format_converter_mft_; 252 base::win::ScopedComPtr<IMFTransform> video_format_converter_mft_;
253 253
254 base::win::ScopedComPtr<IDirect3D9Ex> d3d9_; 254 base::win::ScopedComPtr<IDirect3D9Ex> d3d9_;
255 base::win::ScopedComPtr<IDirect3DDevice9Ex> d3d9_device_ex_; 255 base::win::ScopedComPtr<IDirect3DDevice9Ex> d3d9_device_ex_;
256 base::win::ScopedComPtr<IDirect3DDeviceManager9> device_manager_; 256 base::win::ScopedComPtr<IDirect3DDeviceManager9> device_manager_;
257 base::win::ScopedComPtr<IDirect3DQuery9> query_; 257 base::win::ScopedComPtr<IDirect3DQuery9> query_;
258 258
259 base::win::ScopedComPtr<ID3D11DeviceContext> d3d11_device_context_;
260 base::win::ScopedComPtr<ID3D11Device > d3d11_device_; 259 base::win::ScopedComPtr<ID3D11Device > d3d11_device_;
261 base::win::ScopedComPtr<IMFDXGIDeviceManager> d3d11_device_manager_; 260 base::win::ScopedComPtr<IMFDXGIDeviceManager> d3d11_device_manager_;
262 base::win::ScopedComPtr<ID3D11Query> d3d11_query_;
263 base::win::ScopedComPtr<ID3D10Multithread> multi_threaded_; 261 base::win::ScopedComPtr<ID3D10Multithread> multi_threaded_;
264 262
265 // Ideally the reset token would be a stack variable which is used while 263 // Ideally the reset token would be a stack variable which is used while
266 // creating the device manager. However it seems that the device manager 264 // creating the device manager. However it seems that the device manager
267 // holds onto the token and attempts to access it if the underlying device 265 // holds onto the token and attempts to access it if the underlying device
268 // changes. 266 // changes.
269 // TODO(ananta): This needs to be verified. 267 // TODO(ananta): This needs to be verified.
270 uint32 dev_manager_reset_token_; 268 uint32 dev_manager_reset_token_;
271 269
272 // Reset token for the DX11 device manager. 270 // Reset token for the DX11 device manager.
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 374
377 // Function pointer for the MFCreateDXGIDeviceManager API. 375 // Function pointer for the MFCreateDXGIDeviceManager API.
378 static CreateDXGIDeviceManager create_dxgi_device_manager_; 376 static CreateDXGIDeviceManager create_dxgi_device_manager_;
379 377
380 DISALLOW_COPY_AND_ASSIGN(DXVAVideoDecodeAccelerator); 378 DISALLOW_COPY_AND_ASSIGN(DXVAVideoDecodeAccelerator);
381 }; 379 };
382 380
383 } // namespace content 381 } // namespace content
384 382
385 #endif // CONTENT_COMMON_GPU_MEDIA_DXVA_VIDEO_DECODE_ACCELERATOR_H_ 383 #endif // CONTENT_COMMON_GPU_MEDIA_DXVA_VIDEO_DECODE_ACCELERATOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698