| Index: talk/app/webrtc/java/jni/peerconnection_jni.cc
|
| diff --git a/talk/app/webrtc/java/jni/peerconnection_jni.cc b/talk/app/webrtc/java/jni/peerconnection_jni.cc
|
| index 194f9ff98c1b2887b4ae16c921ab35a7088954ec..cc3e3dc2369ee9c414690b5cf3c5ccd0d50ed555 100644
|
| --- a/talk/app/webrtc/java/jni/peerconnection_jni.cc
|
| +++ b/talk/app/webrtc/java/jni/peerconnection_jni.cc
|
| @@ -1851,6 +1851,7 @@ JOW(jobject, VideoCapturer_nativeCreateVideoCapturer)(
|
| // Since we can't create platform specific java implementations in Java, we
|
| // defer the creation to C land.
|
| #if defined(ANDROID)
|
| + // TODO(nisse): This case is intended to be deleted.
|
| jclass j_video_capturer_class(
|
| FindClass(jni, "org/webrtc/VideoCapturerAndroid"));
|
| const int camera_id = jni->CallStaticIntMethod(
|
| @@ -1865,8 +1866,13 @@ JOW(jobject, VideoCapturer_nativeCreateVideoCapturer)(
|
| j_video_capturer_class,
|
| GetMethodID(jni, j_video_capturer_class, "<init>", "(I)V"), camera_id);
|
| CHECK_EXCEPTION(jni) << "error during creation of VideoCapturerAndroid";
|
| + jfieldID helper_fid = GetFieldID(jni, j_video_capturer_class, "surfaceHelper",
|
| + "Lorg/webrtc/SurfaceTextureHelper;");
|
| +
|
| rtc::scoped_refptr<webrtc::AndroidVideoCapturerDelegate> delegate =
|
| - new rtc::RefCountedObject<AndroidVideoCapturerJni>(jni, j_video_capturer);
|
| + new rtc::RefCountedObject<AndroidVideoCapturerJni>(
|
| + jni, j_video_capturer,
|
| + GetObjectField(jni, j_video_capturer, helper_fid));
|
| rtc::scoped_ptr<cricket::VideoCapturer> capturer(
|
| new webrtc::AndroidVideoCapturer(delegate));
|
|
|
|
|