Add Android native API: CreateJavaVideoSource

Adds Android native API for creating VideoTrackSourceInterface objects
that can be fed frames using VideoCapturer.CapturerObserver.

NativeCapturerObserver is moved out of VideoSource because it will now
be used without a VideoSource. It now takes a pointer to
AndroidVideoTrackSource directly instead of VideoTrackSourceProxy.

VideoSource and NativeCapturerObserver JNI code is moved away from
androidvideotracksource.cc to their own files. This allows using
AndroidVideoTrackSource independently.

Bug: webrtc:8769
Change-Id: Ifb9e1eb27d4c8237597d19d932ca6e863abb4d27
Reviewed-on: https://webrtc-review.googlesource.com/76924
Reviewed-by: Paulina Hensman <phensman@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23269}

sdk/android/src/jni/androidvideotracksource.cc

@@ -14,7 +14,6 @@
 
 #include "api/videosourceproxy.h"
 #include "rtc_base/logging.h"
-#include "sdk/android/generated_video_jni/jni/VideoSource_jni.h"
 
 namespace webrtc {
 namespace jni {
@@ -22,18 +21,6 @@ namespace jni {
 namespace {
 // MediaCodec wants resolution to be divisible by 2.
 const int kRequiredResolutionAlignment = 2;
-
-VideoRotation jintToVideoRotation(jint rotation) {
-  RTC_DCHECK(rotation == 0 || rotation == 90 || rotation == 180 ||
-             rotation == 270);
-  return static_cast<VideoRotation>(rotation);
-}
-
-AndroidVideoTrackSource* AndroidVideoTrackSourceFromJavaProxy(jlong j_proxy) {
-  auto* proxy_source = reinterpret_cast<VideoTrackSourceProxy*>(j_proxy);
-  return reinterpret_cast<AndroidVideoTrackSource*>(proxy_source->internal());
-}
-
 }  // namespace
 
 AndroidVideoTrackSource::AndroidVideoTrackSource(
@@ -125,53 +112,5 @@ void AndroidVideoTrackSource::OnOutputFormatRequest(int width,
   video_adapter()->OnOutputFormatRequest(format);
 }
 
-static void JNI_VideoSource_OnFrameCaptured(
-    JNIEnv* jni,
-    const JavaParamRef<jclass>&,
-    jlong j_source,
-    jint j_width,
-    jint j_height,
-    jint j_rotation,
-    jlong j_timestamp_ns,
-    const JavaParamRef<jobject>& j_video_frame_buffer) {
-  AndroidVideoTrackSource* source =
-      AndroidVideoTrackSourceFromJavaProxy(j_source);
-  source->OnFrameCaptured(jni, j_width, j_height, j_timestamp_ns,
-                          jintToVideoRotation(j_rotation),
-                          j_video_frame_buffer);
-}
-
-static void JNI_VideoSource_CapturerStarted(JNIEnv* jni,
-                                            const JavaParamRef<jclass>&,
-                                            jlong j_source,
-                                            jboolean j_success) {
-  RTC_LOG(LS_INFO) << "AndroidVideoTrackSourceObserve_nativeCapturerStarted";
-  AndroidVideoTrackSource* source =
-      AndroidVideoTrackSourceFromJavaProxy(j_source);
-  source->SetState(j_success ? AndroidVideoTrackSource::SourceState::kLive
-                             : AndroidVideoTrackSource::SourceState::kEnded);
-}
-
-static void JNI_VideoSource_CapturerStopped(JNIEnv* jni,
-                                            const JavaParamRef<jclass>&,
-                                            jlong j_source) {
-  RTC_LOG(LS_INFO) << "AndroidVideoTrackSourceObserve_nativeCapturerStopped";
-  AndroidVideoTrackSource* source =
-      AndroidVideoTrackSourceFromJavaProxy(j_source);
-  source->SetState(AndroidVideoTrackSource::SourceState::kEnded);
-}
-
-static void JNI_VideoSource_AdaptOutputFormat(JNIEnv* jni,
-                                              const JavaParamRef<jclass>&,
-                                              jlong j_source,
-                                              jint j_width,
-                                              jint j_height,
-                                              jint j_fps) {
-  RTC_LOG(LS_INFO) << "VideoSource_nativeAdaptOutputFormat";
-  AndroidVideoTrackSource* source =
-      AndroidVideoTrackSourceFromJavaProxy(j_source);
-  source->OnOutputFormatRequest(j_width, j_height, j_fps);
-}
-
 }  // namespace jni
 }  // namespace webrtc

sdk/android/src/jni/nativecapturerobserver.cc

@@ -0,0 +1,76 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "sdk/android/src/jni/nativecapturerobserver.h"
+
+#include "api/videosourceproxy.h"
+#include "rtc_base/logging.h"
+#include "sdk/android/generated_video_jni/jni/NativeCapturerObserver_jni.h"
+#include "sdk/android/native_api/jni/java_types.h"
+#include "sdk/android/src/jni/androidvideotracksource.h"
+
+namespace webrtc {
+namespace jni {
+
+namespace {
+VideoRotation jintToVideoRotation(jint rotation) {
+  RTC_DCHECK(rotation == 0 || rotation == 90 || rotation == 180 ||
+             rotation == 270);
+  return static_cast<VideoRotation>(rotation);
+}
+}  // namespace
+
+ScopedJavaLocalRef<jobject> CreateJavaNativeCapturerObserver(
+    JNIEnv* env,
+    rtc::scoped_refptr<AndroidVideoTrackSource> native_source) {
+  return Java_NativeCapturerObserver_Constructor(
+      env, NativeToJavaPointer(native_source.release()));
+}
+
+static void JNI_NativeCapturerObserver_OnFrameCaptured(
+    JNIEnv* jni,
+    const JavaParamRef<jclass>&,
+    jlong j_source,
+    jint j_width,
+    jint j_height,
+    jint j_rotation,
+    jlong j_timestamp_ns,
+    const JavaParamRef<jobject>& j_video_frame_buffer) {
+  AndroidVideoTrackSource* source =
+      reinterpret_cast<AndroidVideoTrackSource*>(j_source);
+  source->OnFrameCaptured(jni, j_width, j_height, j_timestamp_ns,
+                          jintToVideoRotation(j_rotation),
+                          j_video_frame_buffer);
+}
+
+static void JNI_NativeCapturerObserver_CapturerStarted(
+    JNIEnv* jni,
+    const JavaParamRef<jclass>&,
+    jlong j_source,
+    jboolean j_success) {
+  RTC_LOG(LS_INFO) << "NativeCapturerObserver_nativeCapturerStarted";
+  AndroidVideoTrackSource* source =
+      reinterpret_cast<AndroidVideoTrackSource*>(j_source);
+  source->SetState(j_success ? AndroidVideoTrackSource::SourceState::kLive
+                             : AndroidVideoTrackSource::SourceState::kEnded);
+}
+
+static void JNI_NativeCapturerObserver_CapturerStopped(
+    JNIEnv* jni,
+    const JavaParamRef<jclass>&,
+    jlong j_source) {
+  RTC_LOG(LS_INFO) << "NativeCapturerObserver_nativeCapturerStopped";
+  AndroidVideoTrackSource* source =
+      reinterpret_cast<AndroidVideoTrackSource*>(j_source);
+  source->SetState(AndroidVideoTrackSource::SourceState::kEnded);
+}
+
+}  // namespace jni
+}  // namespace webrtc

sdk/android/src/jni/nativecapturerobserver.h

@@ -0,0 +1,29 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef SDK_ANDROID_SRC_JNI_NATIVECAPTUREROBSERVER_H_
+#define SDK_ANDROID_SRC_JNI_NATIVECAPTUREROBSERVER_H_
+
+#include <jni.h>
+
+#include "sdk/android/native_api/jni/scoped_java_ref.h"
+#include "sdk/android/src/jni/androidvideotracksource.h"
+
+namespace webrtc {
+namespace jni {
+
+ScopedJavaLocalRef<jobject> CreateJavaNativeCapturerObserver(
+    JNIEnv* env,
+    rtc::scoped_refptr<AndroidVideoTrackSource> native_source);
+
+}  // namespace jni
+}  // namespace webrtc
+
+#endif  // SDK_ANDROID_SRC_JNI_NATIVECAPTUREROBSERVER_H_

sdk/android/src/jni/videosource.cc

@@ -0,0 +1,46 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "api/videosourceproxy.h"
+#include "rtc_base/logging.h"
+#include "sdk/android/generated_video_jni/jni/VideoSource_jni.h"
+#include "sdk/android/native_api/jni/java_types.h"
+#include "sdk/android/src/jni/androidvideotracksource.h"
+
+namespace webrtc {
+namespace jni {
+
+namespace {
+AndroidVideoTrackSource* AndroidVideoTrackSourceFromJavaProxy(jlong j_proxy) {
+  auto* proxy_source = reinterpret_cast<VideoTrackSourceProxy*>(j_proxy);
+  return reinterpret_cast<AndroidVideoTrackSource*>(proxy_source->internal());
+}
+}  // namespace
+
+static jlong JNI_VideoSource_GetInternalSource(JNIEnv* jni,
+                                               const JavaParamRef<jclass>&,
+                                               jlong j_source) {
+  return NativeToJavaPointer(AndroidVideoTrackSourceFromJavaProxy(j_source));
+}
+
+static void JNI_VideoSource_AdaptOutputFormat(JNIEnv* jni,
+                                              const JavaParamRef<jclass>&,
+                                              jlong j_source,
+                                              jint j_width,
+                                              jint j_height,
+                                              jint j_fps) {
+  RTC_LOG(LS_INFO) << "VideoSource_nativeAdaptOutputFormat";
+  AndroidVideoTrackSource* source =
+      AndroidVideoTrackSourceFromJavaProxy(j_source);
+  source->OnOutputFormatRequest(j_width, j_height, j_fps);
+}
+
+}  // namespace jni
+}  // namespace webrtc