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

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

Issue 2354903003: Don't include the tracing in gpu_memory_buffer.h (Closed)
Patch Set: Fix linux build again Created 4 years, 2 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
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_VT_VIDEO_ENCODE_ACCELERATOR_MAC_H_ 5 #ifndef MEDIA_GPU_VT_VIDEO_ENCODE_ACCELERATOR_MAC_H_
6 #define MEDIA_GPU_VT_VIDEO_ENCODE_ACCELERATOR_MAC_H_ 6 #define MEDIA_GPU_VT_VIDEO_ENCODE_ACCELERATOR_MAC_H_
7 7
8 #include <deque>
8 #include <memory> 9 #include <memory>
9 10
11 #include "base/bind.h"
10 #include "base/mac/scoped_cftyperef.h" 12 #include "base/mac/scoped_cftyperef.h"
13 #include "base/memory/weak_ptr.h"
14 #include "base/single_thread_task_runner.h"
15 #include "base/threading/thread.h"
16 #include "base/threading/thread_checker.h"
11 #include "media/base/mac/videotoolbox_glue.h" 17 #include "media/base/mac/videotoolbox_glue.h"
12 #include "media/base/mac/videotoolbox_helpers.h" 18 #include "media/base/mac/videotoolbox_helpers.h"
13 #include "media/gpu/media_gpu_export.h" 19 #include "media/gpu/media_gpu_export.h"
14 #include "media/video/video_encode_accelerator.h" 20 #include "media/video/video_encode_accelerator.h"
15 #include "third_party/webrtc/common_video/include/bitrate_adjuster.h" 21 #include "third_party/webrtc/common_video/include/bitrate_adjuster.h"
16 22
17 namespace media { 23 namespace media {
18 24
19 // VideoToolbox.framework implementation of the VideoEncodeAccelerator 25 // VideoToolbox.framework implementation of the VideoEncodeAccelerator
20 // interface for MacOSX. VideoToolbox makes no guarantees that it is thread 26 // interface for MacOSX. VideoToolbox makes no guarantees that it is thread
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 // other destructors run. 149 // other destructors run.
144 base::WeakPtr<VTVideoEncodeAccelerator> encoder_weak_ptr_; 150 base::WeakPtr<VTVideoEncodeAccelerator> encoder_weak_ptr_;
145 base::WeakPtrFactory<VTVideoEncodeAccelerator> encoder_task_weak_factory_; 151 base::WeakPtrFactory<VTVideoEncodeAccelerator> encoder_task_weak_factory_;
146 152
147 DISALLOW_COPY_AND_ASSIGN(VTVideoEncodeAccelerator); 153 DISALLOW_COPY_AND_ASSIGN(VTVideoEncodeAccelerator);
148 }; 154 };
149 155
150 } // namespace media 156 } // namespace media
151 157
152 #endif // MEDIA_GPU_VT_VIDEO_ENCODE_ACCELERATOR_MAC_H_ 158 #endif // MEDIA_GPU_VT_VIDEO_ENCODE_ACCELERATOR_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698