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

Side by Side Diff: media/gpu/avda_codec_allocator.h

Issue 2672313006: media: Remove the unused NdkMediaCodecBridge (Closed)
Patch Set: rebase past conflict Created 3 years, 10 months 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 | « media/gpu/android_video_encode_accelerator.h ('k') | media/gpu/avda_codec_allocator.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 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/logging.h" 14 #include "base/logging.h"
15 #include "base/optional.h" 15 #include "base/optional.h"
16 #include "base/synchronization/waitable_event.h" 16 #include "base/synchronization/waitable_event.h"
17 #include "base/sys_info.h" 17 #include "base/sys_info.h"
18 #include "base/threading/thread.h" 18 #include "base/threading/thread.h"
19 #include "base/threading/thread_checker.h" 19 #include "base/threading/thread_checker.h"
20 #include "base/time/tick_clock.h" 20 #include "base/time/tick_clock.h"
21 #include "base/trace_event/trace_event.h" 21 #include "base/trace_event/trace_event.h"
22 #include "media/base/android/media_codec_bridge_impl.h"
22 #include "media/base/android/media_drm_bridge_cdm_context.h" 23 #include "media/base/android/media_drm_bridge_cdm_context.h"
23 #include "media/base/android/sdk_media_codec_bridge.h"
24 #include "media/base/media.h" 24 #include "media/base/media.h"
25 #include "media/base/surface_manager.h" 25 #include "media/base/surface_manager.h"
26 #include "media/base/video_codecs.h" 26 #include "media/base/video_codecs.h"
27 #include "media/gpu/media_gpu_export.h" 27 #include "media/gpu/media_gpu_export.h"
28 #include "ui/gfx/geometry/size.h" 28 #include "ui/gfx/geometry/size.h"
29 #include "ui/gl/android/scoped_java_surface.h" 29 #include "ui/gl/android/scoped_java_surface.h"
30 30
31 namespace media { 31 namespace media {
32 32
33 // For TaskRunnerFor. These are used as vector indices, so please update 33 // For TaskRunnerFor. These are used as vector indices, so please update
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 234
235 // For canceling pending StopThreadTask()s. 235 // For canceling pending StopThreadTask()s.
236 base::WeakPtrFactory<AVDACodecAllocator> weak_this_factory_; 236 base::WeakPtrFactory<AVDACodecAllocator> weak_this_factory_;
237 237
238 DISALLOW_COPY_AND_ASSIGN(AVDACodecAllocator); 238 DISALLOW_COPY_AND_ASSIGN(AVDACodecAllocator);
239 }; 239 };
240 240
241 } // namespace media 241 } // namespace media
242 242
243 #endif // MEDIA_GPU_AVDA_CODEC_ALLOCATOR_H_ 243 #endif // MEDIA_GPU_AVDA_CODEC_ALLOCATOR_H_
OLDNEW
« no previous file with comments | « media/gpu/android_video_encode_accelerator.h ('k') | media/gpu/avda_codec_allocator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698