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

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

Issue 1973873003: Delete AndroidVideoCapturer::FrameFactory. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Undo unrelated/unneeded changes. 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
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
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 void AsyncCapturerInvoke( 70 void AsyncCapturerInvoke(
71 const char* method_name, 71 const char* method_name,
72 void (webrtc::AndroidVideoCapturer::*method)(Args...), 72 void (webrtc::AndroidVideoCapturer::*method)(Args...),
73 typename Identity<Args>::type... args); 73 typename Identity<Args>::type... args);
74 74
75 const ScopedGlobalRef<jobject> j_video_capturer_; 75 const ScopedGlobalRef<jobject> j_video_capturer_;
76 const ScopedGlobalRef<jclass> j_video_capturer_class_; 76 const ScopedGlobalRef<jclass> j_video_capturer_class_;
77 const ScopedGlobalRef<jclass> j_observer_class_; 77 const ScopedGlobalRef<jclass> j_observer_class_;
78 78
79 // Used on the Java thread running the camera. 79 // Used on the Java thread running the camera.
80 webrtc::I420BufferPool buffer_pool_; 80 webrtc::I420BufferPool pre_scale_pool_;
81 webrtc::I420BufferPool post_scale_pool_;
81 rtc::scoped_refptr<SurfaceTextureHelper> surface_texture_helper_; 82 rtc::scoped_refptr<SurfaceTextureHelper> surface_texture_helper_;
82 rtc::ThreadChecker thread_checker_; 83 rtc::ThreadChecker thread_checker_;
83 84
84 // |capturer| is a guaranteed to be a valid pointer between a call to 85 // |capturer| is a guaranteed to be a valid pointer between a call to
85 // AndroidVideoCapturerDelegate::Start 86 // AndroidVideoCapturerDelegate::Start
86 // until AndroidVideoCapturerDelegate::Stop. 87 // until AndroidVideoCapturerDelegate::Stop.
87 rtc::CriticalSection capturer_lock_; 88 rtc::CriticalSection capturer_lock_;
88 webrtc::AndroidVideoCapturer* capturer_ GUARDED_BY(capturer_lock_); 89 webrtc::AndroidVideoCapturer* capturer_ GUARDED_BY(capturer_lock_);
89 // |invoker_| is used to communicate with |capturer_| on the thread Start() is 90 // |invoker_| is used to communicate with |capturer_| on the thread Start() is
90 // called on. 91 // called on.
91 std::unique_ptr<rtc::GuardedAsyncInvoker> invoker_ GUARDED_BY(capturer_lock_); 92 std::unique_ptr<rtc::GuardedAsyncInvoker> invoker_ GUARDED_BY(capturer_lock_);
92 93
93 static jobject application_context_; 94 static jobject application_context_;
94 95
95 RTC_DISALLOW_COPY_AND_ASSIGN(AndroidVideoCapturerJni); 96 RTC_DISALLOW_COPY_AND_ASSIGN(AndroidVideoCapturerJni);
96 }; 97 };
97 98
98 } // namespace webrtc_jni 99 } // namespace webrtc_jni
99 100
100 #endif // WEBRTC_API_JAVA_JNI_ANDROIDVIDEOCAPTURER_JNI_H_ 101 #endif // WEBRTC_API_JAVA_JNI_ANDROIDVIDEOCAPTURER_JNI_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698