| 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 c2704393779bc6c75002524ae0dcffb110e757bc..9a356d8c62fb16d92bb0ccc36c11da673620aec3 100644
|
| --- a/talk/app/webrtc/java/jni/androidvideocapturer_jni.h
|
| +++ b/talk/app/webrtc/java/jni/androidvideocapturer_jni.h
|
| @@ -46,12 +46,7 @@ class AndroidVideoCapturerJni : public webrtc::AndroidVideoCapturerDelegate {
|
| public:
|
| static int SetAndroidObjects(JNIEnv* jni, jobject appliction_context);
|
|
|
| - // Creates a new instance of AndroidVideoCapturerJni. Returns a nullptr if
|
| - // it can't be created. This happens if |device_name| is invalid.
|
| - static rtc::scoped_refptr<AndroidVideoCapturerJni> Create(
|
| - JNIEnv* jni,
|
| - jobject j_video_capture, // Instance of VideoCapturerAndroid
|
| - jstring device_name); // Name of the camera to use.
|
| + AndroidVideoCapturerJni(JNIEnv* jni, jobject j_video_capturer);
|
|
|
| void Start(int width, int height, int framerate,
|
| webrtc::AndroidVideoCapturer* capturer) override;
|
| @@ -68,12 +63,11 @@ class AndroidVideoCapturerJni : public webrtc::AndroidVideoCapturerDelegate {
|
| int rotation,
|
| int64 time_stamp);
|
| void OnOutputFormatRequest(int width, int height, int fps);
|
| -protected:
|
| - AndroidVideoCapturerJni(JNIEnv* jni, jobject j_video_capturer);
|
| +
|
| + protected:
|
| ~AndroidVideoCapturerJni();
|
|
|
| -private:
|
| - bool Init(jstring device_name);
|
| + private:
|
| void ReturnBuffer(int64 time_stamp);
|
| JNIEnv* jni();
|
|
|
|
|