| Index: talk/app/webrtc/java/jni/androidvideocapturer_jni.h
|
| diff --git a/talk/app/webrtc/java/jni/androidvideocapturer_jni.h b/talk/app/webrtc/java/jni/androidvideocapturer_jni.h
|
| index 96def5eae34e3b72cff636cc912bccca9b0eab4f..fffd7f567e738b999f0b983150557fc6d23dae41 100644
|
| --- a/talk/app/webrtc/java/jni/androidvideocapturer_jni.h
|
| +++ b/talk/app/webrtc/java/jni/androidvideocapturer_jni.h
|
| @@ -48,7 +48,9 @@ class AndroidVideoCapturerJni : public webrtc::AndroidVideoCapturerDelegate {
|
| public:
|
| static int SetAndroidObjects(JNIEnv* jni, jobject appliction_context);
|
|
|
| - AndroidVideoCapturerJni(JNIEnv* jni, jobject j_video_capturer);
|
| + AndroidVideoCapturerJni(JNIEnv* jni,
|
| + jobject j_video_capturer,
|
| + jobject j_surface_texture_helper);
|
|
|
| void Start(int width, int height, int framerate,
|
| webrtc::AndroidVideoCapturer* capturer) override;
|
| @@ -64,6 +66,7 @@ class AndroidVideoCapturerJni : public webrtc::AndroidVideoCapturerDelegate {
|
| const NativeHandleImpl& handle);
|
| void OnOutputFormatRequest(int width, int height, int fps);
|
|
|
| + jobject GetSurfaceHelper() { return *j_surface_texture_helper_; }
|
| protected:
|
| ~AndroidVideoCapturerJni();
|
|
|
| @@ -85,7 +88,8 @@ class AndroidVideoCapturerJni : public webrtc::AndroidVideoCapturerDelegate {
|
| void (webrtc::AndroidVideoCapturer::*method)(Args...),
|
| typename Identity<Args>::type... args);
|
|
|
| - const ScopedGlobalRef<jobject> j_capturer_global_;
|
| + const ScopedGlobalRef<jobject> j_video_capturer_;
|
| + const ScopedGlobalRef<jobject> j_surface_texture_helper_;
|
| const ScopedGlobalRef<jclass> j_video_capturer_class_;
|
| const ScopedGlobalRef<jclass> j_observer_class_;
|
|
|
|
|