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

Side by Side Diff: content/common/gpu/media/dxva_video_decode_accelerator_win.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: Rebased to tip 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
« no previous file with comments | « no previous file | content/common/gpu/media/dxva_video_decode_accelerator_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 media::VideoDecodeAccelerator::Client* client_; 248 media::VideoDecodeAccelerator::Client* client_;
249 249
250 base::win::ScopedComPtr<IMFTransform> decoder_; 250 base::win::ScopedComPtr<IMFTransform> decoder_;
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<ID3D11DeviceContext> d3d11_device_context_;
259 base::win::ScopedComPtr<ID3D11Device > d3d11_device_; 258 base::win::ScopedComPtr<ID3D11Device > d3d11_device_;
260 base::win::ScopedComPtr<IMFDXGIDeviceManager> d3d11_device_manager_; 259 base::win::ScopedComPtr<IMFDXGIDeviceManager> d3d11_device_manager_;
261 base::win::ScopedComPtr<ID3D11Query> d3d11_query_;
262 base::win::ScopedComPtr<ID3D10Multithread> multi_threaded_; 260 base::win::ScopedComPtr<ID3D10Multithread> multi_threaded_;
263 261
264 // Ideally the reset token would be a stack variable which is used while 262 // Ideally the reset token would be a stack variable which is used while
265 // creating the device manager. However it seems that the device manager 263 // creating the device manager. However it seems that the device manager
266 // holds onto the token and attempts to access it if the underlying device 264 // holds onto the token and attempts to access it if the underlying device
267 // changes. 265 // changes.
268 // TODO(ananta): This needs to be verified. 266 // TODO(ananta): This needs to be verified.
269 uint32 dev_manager_reset_token_; 267 uint32 dev_manager_reset_token_;
270 268
271 // Reset token for the DX11 device manager. 269 // Reset token for the DX11 device manager.
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 373
376 // Function pointer for the MFCreateDXGIDeviceManager API. 374 // Function pointer for the MFCreateDXGIDeviceManager API.
377 static CreateDXGIDeviceManager create_dxgi_device_manager_; 375 static CreateDXGIDeviceManager create_dxgi_device_manager_;
378 376
379 DISALLOW_COPY_AND_ASSIGN(DXVAVideoDecodeAccelerator); 377 DISALLOW_COPY_AND_ASSIGN(DXVAVideoDecodeAccelerator);
380 }; 378 };
381 379
382 } // namespace content 380 } // namespace content
383 381
384 #endif // CONTENT_COMMON_GPU_MEDIA_DXVA_VIDEO_DECODE_ACCELERATOR_H_ 382 #endif // CONTENT_COMMON_GPU_MEDIA_DXVA_VIDEO_DECODE_ACCELERATOR_H_
OLDNEW
« no previous file with comments | « no previous file | content/common/gpu/media/dxva_video_decode_accelerator_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698