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/native_unittests/org/webrtc/JavaVideoSourceTestHelper.java

@@ -0,0 +1,35 @@
+/*
+ *  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.
+ */
+
+package org.webrtc;
+
+import org.webrtc.VideoCapturer;
+
+public class JavaVideoSourceTestHelper {
+  @CalledByNative
+  public static void startCapture(VideoCapturer.CapturerObserver observer, boolean success) {
+    observer.onCapturerStarted(success);
+  }
+
+  @CalledByNative
+  public static void stopCapture(VideoCapturer.CapturerObserver observer) {
+    observer.onCapturerStopped();
+  }
+
+  @CalledByNative
+  public static void deliverFrame(VideoCapturer.CapturerObserver observer) {
+    final int FRAME_WIDTH = 2;
+    final int FRAME_HEIGHT = 3;
+    final int FRAME_ROTATION = 180;
+
+    observer.onFrameCaptured(new VideoFrame(
+        JavaI420Buffer.allocate(FRAME_WIDTH, FRAME_HEIGHT), FRAME_ROTATION, 0 /* timestampNs */));
+  }
+}

sdk/android/native_unittests/video/videosource_unittest.cc

@@ -0,0 +1,136 @@
+/*
+ *  Copyright 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 <vector>
+
+#include "api/video/video_sink_interface.h"
+#include "sdk/android/generated_native_unittests_jni/jni/JavaVideoSourceTestHelper_jni.h"
+#include "sdk/android/native_api/video/videosource.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace test {
+
+namespace {
+class TestVideoSink : public rtc::VideoSinkInterface<VideoFrame> {
+ public:
+  void OnFrame(const VideoFrame& frame) { frames_.push_back(frame); }
+
+  std::vector<VideoFrame> GetFrames() {
+    std::vector<VideoFrame> temp = frames_;
+    frames_.clear();
+    return temp;
+  }
+
+ private:
+  std::vector<VideoFrame> frames_;
+};
+}  // namespace
+
+TEST(JavaVideoSourceTest, CreateJavaVideoSource) {
+  JNIEnv* env = AttachCurrentThreadIfNeeded();
+  // Wrap test thread so it can be used as the signaling thread.
+  rtc::ThreadManager::Instance()->WrapCurrentThread();
+
+  rtc::scoped_refptr<JavaVideoTrackSourceInterface> video_track_source =
+      CreateJavaVideoSource(env,
+                            rtc::ThreadManager::Instance()->CurrentThread(),
+                            false /* is_screencast */);
+
+  ASSERT_NE(nullptr, video_track_source);
+  EXPECT_NE(nullptr,
+            video_track_source->GetJavaVideoCapturerObserver(env).obj());
+}
+
+TEST(JavaVideoSourceTest, OnFrameCapturedFrameIsDeliveredToSink) {
+  TestVideoSink test_video_sink;
+
+  JNIEnv* env = AttachCurrentThreadIfNeeded();
+  // Wrap test thread so it can be used as the signaling thread.
+  rtc::ThreadManager::Instance()->WrapCurrentThread();
+
+  rtc::scoped_refptr<JavaVideoTrackSourceInterface> video_track_source =
+      CreateJavaVideoSource(env,
+                            rtc::ThreadManager::Instance()->CurrentThread(),
+                            false /* is_screencast */);
+  video_track_source->AddOrUpdateSink(&test_video_sink, rtc::VideoSinkWants());
+
+  Java_JavaVideoSourceTestHelper_startCapture(
+      env, video_track_source->GetJavaVideoCapturerObserver(env),
+      true /* success */);
+  Java_JavaVideoSourceTestHelper_deliverFrame(
+      env, video_track_source->GetJavaVideoCapturerObserver(env));
+
+  std::vector<VideoFrame> frames = test_video_sink.GetFrames();
+  ASSERT_EQ(1u, frames.size());
+  webrtc::VideoFrame frame = frames[0];
+  EXPECT_EQ(2, frame.width());
+  EXPECT_EQ(3, frame.height());
+  EXPECT_EQ(180, frame.rotation());
+}
+
+TEST(JavaVideoSourceTest, CapturerStartedSuccessStateBecomesLive) {
+  JNIEnv* env = AttachCurrentThreadIfNeeded();
+  // Wrap test thread so it can be used as the signaling thread.
+  rtc::ThreadManager::Instance()->WrapCurrentThread();
+
+  rtc::scoped_refptr<JavaVideoTrackSourceInterface> video_track_source =
+      CreateJavaVideoSource(env,
+                            rtc::ThreadManager::Instance()->CurrentThread(),
+                            false /* is_screencast */);
+
+  Java_JavaVideoSourceTestHelper_startCapture(
+      env, video_track_source->GetJavaVideoCapturerObserver(env),
+      true /* success */);
+
+  EXPECT_EQ(VideoTrackSourceInterface::SourceState::kLive,
+            video_track_source->state());
+}
+
+TEST(JavaVideoSourceTest, CapturerStartedFailureStateBecomesEnded) {
+  JNIEnv* env = AttachCurrentThreadIfNeeded();
+  // Wrap test thread so it can be used as the signaling thread.
+  rtc::ThreadManager::Instance()->WrapCurrentThread();
+
+  rtc::scoped_refptr<JavaVideoTrackSourceInterface> video_track_source =
+      CreateJavaVideoSource(env,
+                            rtc::ThreadManager::Instance()->CurrentThread(),
+                            false /* is_screencast */);
+
+  Java_JavaVideoSourceTestHelper_startCapture(
+      env, video_track_source->GetJavaVideoCapturerObserver(env),
+      false /* success */);
+
+  EXPECT_EQ(VideoTrackSourceInterface::SourceState::kEnded,
+            video_track_source->state());
+}
+
+TEST(JavaVideoSourceTest, CapturerStoppedStateBecomesEnded) {
+  JNIEnv* env = AttachCurrentThreadIfNeeded();
+  // Wrap test thread so it can be used as the signaling thread.
+  rtc::ThreadManager::Instance()->WrapCurrentThread();
+
+  rtc::scoped_refptr<JavaVideoTrackSourceInterface> video_track_source =
+      CreateJavaVideoSource(env,
+                            rtc::ThreadManager::Instance()->CurrentThread(),
+                            false /* is_screencast */);
+
+  Java_JavaVideoSourceTestHelper_startCapture(
+      env, video_track_source->GetJavaVideoCapturerObserver(env),
+      true /* success */);
+  Java_JavaVideoSourceTestHelper_stopCapture(
+      env, video_track_source->GetJavaVideoCapturerObserver(env));
+
+  EXPECT_EQ(VideoTrackSourceInterface::SourceState::kEnded,
+            video_track_source->state());
+}
+
+}  // namespace test
+}  // namespace webrtc