Index: media/gpu/vaapi_wrapper.h |
diff --git a/media/gpu/vaapi_wrapper.h b/media/gpu/vaapi_wrapper.h |
index 16efa2d644efe3bd0aa9eb89c75171506048bce3..bcadd56b4b7df5ce407897489b9afacea65502a6 100644 |
--- a/media/gpu/vaapi_wrapper.h |
+++ b/media/gpu/vaapi_wrapper.h |
@@ -17,7 +17,6 @@ |
#include <vector> |
#include "base/files/file.h" |
-#include "base/lazy_instance.h" |
#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
#include "base/synchronization/lock.h" |
@@ -257,8 +256,6 @@ class MEDIA_GPU_EXPORT VaapiWrapper |
#endif // USE_OZONE |
private: |
- friend class base::LazyInstance<VADisplayState>; |
- |
// Returns true if the VAAPI version is less than the specified version. |
bool VAAPIVersionLessThan(int major, int minor); |
@@ -355,8 +352,8 @@ class MEDIA_GPU_EXPORT VaapiWrapper |
// VA format of surfaces with va_surface_ids_. |
unsigned int va_surface_format_; |
- // Singleton instance of VADisplayState. |
- static base::LazyInstance<VADisplayState> va_display_state_; |
+ // Points to singleton instance of VADisplayState. |
+ VADisplayState* va_display_state_; |
Mark Mentovai
2017/01/31 21:33:56
I don’t see a reason for this to be a member varia
DaleCurtis
2017/01/31 22:04:33
Agreed, I messed this conversion up anyways, these
|
// VA handles. |
// All valid after successful Initialize() and until Deinitialize(). |
@@ -384,9 +381,9 @@ class MEDIA_GPU_EXPORT VaapiWrapper |
VAContextID va_vpp_context_id_; |
VABufferID va_vpp_buffer_id_; |
- // Singleton variable to store supported profile information for encode and |
- // decode. |
- static base::LazyInstance<LazyProfileInfos> profile_infos_; |
+ // Points to singleton variable to store supported profile information for |
+ // encode and decode. |
+ LazyProfileInfos* profile_infos_; |
Mark Mentovai
2017/01/31 21:33:56
This one too.
DaleCurtis
2017/01/31 22:04:33
Done.
|
DISALLOW_COPY_AND_ASSIGN(VaapiWrapper); |
}; |