| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 MEDIA_GPU_AVDA_CODEC_ALLOCATOR_H_ | 5 #ifndef MEDIA_GPU_AVDA_CODEC_ALLOCATOR_H_ |
| 6 #define MEDIA_GPU_AVDA_CODEC_ALLOCATOR_H_ | 6 #define MEDIA_GPU_AVDA_CODEC_ALLOCATOR_H_ |
| 7 | 7 |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| 11 | 11 |
| 12 #include "base/android/build_info.h" | 12 #include "base/android/build_info.h" |
| 13 #include "base/bind.h" | 13 #include "base/bind.h" |
| 14 #include "base/lazy_instance.h" | 14 #include "base/lazy_instance.h" |
| 15 #include "base/logging.h" | 15 #include "base/logging.h" |
| 16 #include "base/optional.h" | 16 #include "base/optional.h" |
| 17 #include "base/synchronization/waitable_event.h" | 17 #include "base/synchronization/waitable_event.h" |
| 18 #include "base/sys_info.h" | 18 #include "base/sys_info.h" |
| 19 #include "base/threading/thread.h" | 19 #include "base/threading/thread.h" |
| 20 #include "base/threading/thread_checker.h" | 20 #include "base/threading/thread_checker.h" |
| 21 #include "base/time/tick_clock.h" | 21 #include "base/time/tick_clock.h" |
| 22 #include "base/trace_event/trace_event.h" | 22 #include "base/trace_event/trace_event.h" |
| 23 #include "media/base/android/media_codec_bridge.h" |
| 23 #include "media/base/android/media_drm_bridge_cdm_context.h" | 24 #include "media/base/android/media_drm_bridge_cdm_context.h" |
| 24 #include "media/base/android/sdk_media_codec_bridge.h" | |
| 25 #include "media/base/media.h" | 25 #include "media/base/media.h" |
| 26 #include "media/base/surface_manager.h" | 26 #include "media/base/surface_manager.h" |
| 27 #include "media/base/video_codecs.h" | 27 #include "media/base/video_codecs.h" |
| 28 #include "media/gpu/media_gpu_export.h" | 28 #include "media/gpu/media_gpu_export.h" |
| 29 #include "ui/gfx/geometry/size.h" | 29 #include "ui/gfx/geometry/size.h" |
| 30 #include "ui/gl/android/scoped_java_surface.h" | 30 #include "ui/gl/android/scoped_java_surface.h" |
| 31 | 31 |
| 32 namespace media { | 32 namespace media { |
| 33 | 33 |
| 34 // For TaskRunnerFor. These are used as vector indices, so please update | 34 // For TaskRunnerFor. These are used as vector indices, so please update |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 236 | 236 |
| 237 // For canceling pending StopThreadTask()s. | 237 // For canceling pending StopThreadTask()s. |
| 238 base::WeakPtrFactory<AVDACodecAllocator> weak_this_factory_; | 238 base::WeakPtrFactory<AVDACodecAllocator> weak_this_factory_; |
| 239 | 239 |
| 240 DISALLOW_COPY_AND_ASSIGN(AVDACodecAllocator); | 240 DISALLOW_COPY_AND_ASSIGN(AVDACodecAllocator); |
| 241 }; | 241 }; |
| 242 | 242 |
| 243 } // namespace media | 243 } // namespace media |
| 244 | 244 |
| 245 #endif // MEDIA_GPU_AVDA_CODEC_ALLOCATOR_H_ | 245 #endif // MEDIA_GPU_AVDA_CODEC_ALLOCATOR_H_ |
| OLD | NEW |