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

Side by Side Diff: webrtc/api/java/jni/androidvideocapturer_jni.h

Issue 1917043005: #include "webrtc/base/constructormagic.h" where appropriate (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 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 | « webrtc/api/dtmfsender.h ('k') | webrtc/api/jsepsessiondescription.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_API_JAVA_JNI_ANDROIDVIDEOCAPTURER_JNI_H_ 11 #ifndef WEBRTC_API_JAVA_JNI_ANDROIDVIDEOCAPTURER_JNI_H_
12 #define WEBRTC_API_JAVA_JNI_ANDROIDVIDEOCAPTURER_JNI_H_ 12 #define WEBRTC_API_JAVA_JNI_ANDROIDVIDEOCAPTURER_JNI_H_
13 13
14 #include <string> 14 #include <string>
15 15
16 #include "webrtc/api/androidvideocapturer.h" 16 #include "webrtc/api/androidvideocapturer.h"
17 #include "webrtc/api/java/jni/jni_helpers.h" 17 #include "webrtc/api/java/jni/jni_helpers.h"
18 #include "webrtc/base/asyncinvoker.h" 18 #include "webrtc/base/asyncinvoker.h"
19 #include "webrtc/base/constructormagic.h"
19 #include "webrtc/base/criticalsection.h" 20 #include "webrtc/base/criticalsection.h"
20 #include "webrtc/base/thread_checker.h" 21 #include "webrtc/base/thread_checker.h"
21 #include "webrtc/common_video/include/i420_buffer_pool.h" 22 #include "webrtc/common_video/include/i420_buffer_pool.h"
22 23
23 namespace webrtc_jni { 24 namespace webrtc_jni {
24 25
25 struct NativeHandleImpl; 26 struct NativeHandleImpl;
26 class SurfaceTextureHelper; 27 class SurfaceTextureHelper;
27 28
28 // AndroidVideoCapturerJni implements AndroidVideoCapturerDelegate. 29 // AndroidVideoCapturerJni implements AndroidVideoCapturerDelegate.
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 rtc::scoped_ptr<rtc::GuardedAsyncInvoker> invoker_ GUARDED_BY(capturer_lock_); 90 rtc::scoped_ptr<rtc::GuardedAsyncInvoker> invoker_ GUARDED_BY(capturer_lock_);
90 91
91 static jobject application_context_; 92 static jobject application_context_;
92 93
93 RTC_DISALLOW_COPY_AND_ASSIGN(AndroidVideoCapturerJni); 94 RTC_DISALLOW_COPY_AND_ASSIGN(AndroidVideoCapturerJni);
94 }; 95 };
95 96
96 } // namespace webrtc_jni 97 } // namespace webrtc_jni
97 98
98 #endif // WEBRTC_API_JAVA_JNI_ANDROIDVIDEOCAPTURER_JNI_H_ 99 #endif // WEBRTC_API_JAVA_JNI_ANDROIDVIDEOCAPTURER_JNI_H_
OLDNEW
« no previous file with comments | « webrtc/api/dtmfsender.h ('k') | webrtc/api/jsepsessiondescription.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698