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

Side by Side Diff: talk/app/webrtc/java/jni/androidvideocapturer_jni.h

Issue 1553033002: Roll chromium_revision d66326c..4df108a (367167:367307) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Added references to bugs. Created 4 years, 11 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 * libjingle 2 * libjingle
3 * Copyright 2015 Google Inc. 3 * Copyright 2015 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 22 matching lines...) Expand all
33 33
34 #include "talk/app/webrtc/androidvideocapturer.h" 34 #include "talk/app/webrtc/androidvideocapturer.h"
35 #include "talk/app/webrtc/java/jni/jni_helpers.h" 35 #include "talk/app/webrtc/java/jni/jni_helpers.h"
36 #include "webrtc/base/asyncinvoker.h" 36 #include "webrtc/base/asyncinvoker.h"
37 #include "webrtc/base/criticalsection.h" 37 #include "webrtc/base/criticalsection.h"
38 #include "webrtc/base/thread_checker.h" 38 #include "webrtc/base/thread_checker.h"
39 #include "webrtc/common_video/include/i420_buffer_pool.h" 39 #include "webrtc/common_video/include/i420_buffer_pool.h"
40 40
41 namespace webrtc_jni { 41 namespace webrtc_jni {
42 42
43 class NativeHandleImpl; 43 struct NativeHandleImpl;
44 class SurfaceTextureHelper; 44 class SurfaceTextureHelper;
45 45
46 // AndroidVideoCapturerJni implements AndroidVideoCapturerDelegate. 46 // AndroidVideoCapturerJni implements AndroidVideoCapturerDelegate.
47 // The purpose of the delegate is to hide the JNI specifics from the C++ only 47 // The purpose of the delegate is to hide the JNI specifics from the C++ only
48 // AndroidVideoCapturer. 48 // AndroidVideoCapturer.
49 class AndroidVideoCapturerJni : public webrtc::AndroidVideoCapturerDelegate { 49 class AndroidVideoCapturerJni : public webrtc::AndroidVideoCapturerDelegate {
50 public: 50 public:
51 static int SetAndroidObjects(JNIEnv* jni, jobject appliction_context); 51 static int SetAndroidObjects(JNIEnv* jni, jobject appliction_context);
52 52
53 AndroidVideoCapturerJni(JNIEnv* jni, 53 AndroidVideoCapturerJni(JNIEnv* jni,
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 rtc::scoped_ptr<rtc::GuardedAsyncInvoker> invoker_ GUARDED_BY(capturer_lock_); 107 rtc::scoped_ptr<rtc::GuardedAsyncInvoker> invoker_ GUARDED_BY(capturer_lock_);
108 108
109 static jobject application_context_; 109 static jobject application_context_;
110 110
111 RTC_DISALLOW_COPY_AND_ASSIGN(AndroidVideoCapturerJni); 111 RTC_DISALLOW_COPY_AND_ASSIGN(AndroidVideoCapturerJni);
112 }; 112 };
113 113
114 } // namespace webrtc_jni 114 } // namespace webrtc_jni
115 115
116 #endif // TALK_APP_WEBRTC_JAVA_JNI_ANDROIDVIDEOCAPTURER_JNI_H_ 116 #endif // TALK_APP_WEBRTC_JAVA_JNI_ANDROIDVIDEOCAPTURER_JNI_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/java/jni/androidmediaencoder_jni.cc ('k') | talk/app/webrtc/objc/avfoundationvideocapturer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698