| 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 <d3d9.h> | 8 #include <d3d9.h> |
| 9 // Work around bug in this header by disabling the relevant warning for it. |
| 10 // https://connect.microsoft.com/VisualStudio/feedback/details/911260/dxva2api-h
-in-win8-sdk-triggers-c4201-with-w4 |
| 11 #pragma warning(push) |
| 12 #pragma warning(disable:4201) |
| 9 #include <dxva2api.h> | 13 #include <dxva2api.h> |
| 14 #pragma warning(pop) |
| 10 #include <list> | 15 #include <list> |
| 11 #include <map> | 16 #include <map> |
| 12 #include <mfidl.h> | 17 #include <mfidl.h> |
| 13 #include <vector> | 18 #include <vector> |
| 14 | 19 |
| 15 #include "base/compiler_specific.h" | 20 #include "base/compiler_specific.h" |
| 16 #include "base/memory/linked_ptr.h" | 21 #include "base/memory/linked_ptr.h" |
| 17 #include "base/memory/weak_ptr.h" | 22 #include "base/memory/weak_ptr.h" |
| 18 #include "base/threading/non_thread_safe.h" | 23 #include "base/threading/non_thread_safe.h" |
| 19 #include "base/win/scoped_comptr.h" | 24 #include "base/win/scoped_comptr.h" |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 // Callback to set the correct gl context. | 210 // Callback to set the correct gl context. |
| 206 base::Callback<bool(void)> make_context_current_; | 211 base::Callback<bool(void)> make_context_current_; |
| 207 | 212 |
| 208 // WeakPtrFactory for posting tasks back to |this|. | 213 // WeakPtrFactory for posting tasks back to |this|. |
| 209 base::WeakPtrFactory<DXVAVideoDecodeAccelerator> weak_this_factory_; | 214 base::WeakPtrFactory<DXVAVideoDecodeAccelerator> weak_this_factory_; |
| 210 }; | 215 }; |
| 211 | 216 |
| 212 } // namespace content | 217 } // namespace content |
| 213 | 218 |
| 214 #endif // CONTENT_COMMON_GPU_MEDIA_DXVA_VIDEO_DECODE_ACCELERATOR_H_ | 219 #endif // CONTENT_COMMON_GPU_MEDIA_DXVA_VIDEO_DECODE_ACCELERATOR_H_ |
| OLD | NEW |