Merge pull request #2 from baronapp/2022-04-19/upstream-merge

2022 04 19/upstream merge

Author: phoenixiguess

README.md

@@ -1,3 +1,5 @@
 # README
 
+<h1 align="center">Vision Camera</h1>
+
 This is a public copy of the repo we're holding onto just to receive emails when the original repo is changed.

android/CMakeLists.txt

@@ -61,6 +61,7 @@ target_include_directories(
         ${INCLUDE_JSI_CPP} # only on older RN versions
         ${INCLUDE_JSIDYNAMIC_CPP} # only on older RN versions
         # --- Reanimated ---
+        "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/headers/AnimatedSensor"
         "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/headers/Tools"
         "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/headers/SpecTools"
         "${NODE_MODULES_DIR}/react-native-reanimated/Common/cpp/headers/SharedItems"

android/build.gradle

@@ -246,13 +246,13 @@ dependencies {
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.5.2"
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2"
 
-  implementation "androidx.camera:camera-core:1.1.0-alpha12"
-  implementation "androidx.camera:camera-camera2:1.1.0-alpha12"
-  implementation "androidx.camera:camera-lifecycle:1.1.0-alpha12"
-  implementation "androidx.camera:camera-video:1.1.0-alpha12"
+  implementation "androidx.camera:camera-core:1.1.0-beta02"
+  implementation "androidx.camera:camera-camera2:1.1.0-beta02"
+  implementation "androidx.camera:camera-lifecycle:1.1.0-beta02"
+  implementation "androidx.camera:camera-video:1.1.0-beta02"
 
-  implementation "androidx.camera:camera-view:1.0.0-alpha32"
-  implementation "androidx.camera:camera-extensions:1.0.0-alpha32"
+  implementation "androidx.camera:camera-view:1.1.0-beta02"
+  implementation "androidx.camera:camera-extensions:1.1.0-beta02"
 
   implementation "androidx.exifinterface:exifinterface:1.3.3"
 }

android/src/main/java/com/mrousavy/camera/CameraView+Focus.kt

@@ -1,9 +1,9 @@
 package com.mrousavy.camera
 
 import androidx.camera.core.FocusMeteringAction
-import androidx.camera.core.SurfaceOrientedMeteringPointFactory
 import com.facebook.react.bridge.ReadableMap
 import kotlinx.coroutines.guava.await
+import kotlinx.coroutines.withContext
 import java.util.concurrent.TimeUnit
 
 suspend fun CameraView.focus(pointMap: ReadableMap) {
@@ -16,8 +16,11 @@ suspend fun CameraView.focus(pointMap: ReadableMap) {
   val x = pointMap.getDouble("x") * dpi
   val y = pointMap.getDouble("y") * dpi
 
-  val factory = SurfaceOrientedMeteringPointFactory(this.width.toFloat(), this.height.toFloat())
-  val point = factory.createPoint(x.toFloat(), y.toFloat())
+  // Getting the point from the previewView needs to be run on the UI thread
+  val point = withContext(coroutineScope.coroutineContext) {
+    previewView.meteringPointFactory.createPoint(x.toFloat(), y.toFloat());
+  }
+
   val action = FocusMeteringAction.Builder(point, FocusMeteringAction.FLAG_AF or FocusMeteringAction.FLAG_AE)
     .setAutoCancelDuration(5, TimeUnit.SECONDS) // auto-reset after 5 seconds
     .build()

android/src/main/java/com/mrousavy/camera/CameraView+RecordVideo.kt

@@ -82,6 +82,30 @@ fun CameraView.startRecording(options: ReadableMap, onRecordCallback: Callback)
   })
 }
 
+@SuppressLint("RestrictedApi")
+fun CameraView.pauseRecording() {
+  if (videoCapture == null) {
+    throw CameraNotReadyError()
+  }
+  if (activeVideoRecording == null) {
+    throw NoRecordingInProgressError()
+  }
+
+  activeVideoRecording!!.pause()
+}
+
+@SuppressLint("RestrictedApi")
+fun CameraView.resumeRecording() {
+  if (videoCapture == null) {
+    throw CameraNotReadyError()
+  }
+  if (activeVideoRecording == null) {
+    throw NoRecordingInProgressError()
+  }
+
+  activeVideoRecording!!.resume()
+}
+
 @SuppressLint("RestrictedApi")
 fun CameraView.stopRecording() {
   if (videoCapture == null) {

android/src/main/java/com/mrousavy/camera/CameraView+TakeSnapshot.kt

@@ -22,7 +22,9 @@ suspend fun CameraView.takeSnapshot(options: ReadableMap): WritableMap = corouti
       camera.cameraControl.enableTorch(true).await()
     }
 
-    val bitmap = this@takeSnapshot.previewView.bitmap ?: throw CameraNotReadyError()
+    val bitmap = withContext(coroutineScope.coroutineContext) {
+      previewView.bitmap ?: throw CameraNotReadyError()
+    }
 
     val quality = if (options.hasKey("quality")) options.getInt("quality") else 100
 

android/src/main/java/com/mrousavy/camera/CameraView.kt

@@ -121,7 +121,7 @@ class CameraView(context: Context, private val frameProcessorThread: ExecutorSer
   private val cameraExecutor = Executors.newSingleThreadExecutor()
   internal val takePhotoExecutor = Executors.newSingleThreadExecutor()
   internal val recordVideoExecutor = Executors.newSingleThreadExecutor()
-  private var coroutineScope = CoroutineScope(Dispatchers.Main)
+  internal var coroutineScope = CoroutineScope(Dispatchers.Main)
 
   internal var camera: Camera? = null
   internal var imageCapture: ImageCapture? = null

android/src/main/java/com/mrousavy/camera/CameraViewModule.kt

@@ -115,6 +115,24 @@ class CameraViewModule(reactContext: ReactApplicationContext) : ReactContextBase
     }
   }
 
+  @ReactMethod
+  fun pauseRecording(viewTag: Int, promise: Promise) {
+    withPromise(promise) {
+      val view = findCameraView(viewTag)
+      view.pauseRecording()
+      return@withPromise null
+    }
+  }
+
+  @ReactMethod
+  fun resumeRecording(viewTag: Int, promise: Promise) {
+    withPromise(promise) {
+      val view = findCameraView(viewTag)
+      view.resumeRecording()
+      return@withPromise null
+    }
+  }
+
   @ReactMethod
   fun stopRecording(viewTag: Int, promise: Promise) {
     withPromise(promise) {

android/src/main/java/com/mrousavy/camera/frameprocessor/FrameProcessorRuntimeManager.kt

@@ -6,6 +6,7 @@ import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.turbomodule.core.CallInvokerHolderImpl
+import com.facebook.react.uimanager.UIManagerHelper
 import com.mrousavy.camera.CameraView
 import com.mrousavy.camera.ViewNotFoundError
 import java.lang.ref.WeakReference
@@ -60,7 +61,8 @@ class FrameProcessorRuntimeManager(context: ReactApplicationContext, frameProces
   @Keep
   fun findCameraViewById(viewId: Int): CameraView {
     Log.d(TAG, "Finding view $viewId...")
-    val view = mContext?.get()?.currentActivity?.findViewById<CameraView>(viewId)
+    val ctx = mContext?.get()
+    val view = if (ctx != null) UIManagerHelper.getUIManager(ctx, viewId)?.resolveView(viewId) as CameraView? else null
     Log.d(TAG,  if (view != null) "Found view $viewId!" else "Couldn't find view $viewId!")
     return view ?: throw ViewNotFoundError(viewId)
   }

docs/docs/guides/FRAME_PROCESSOR_PLUGIN_LIST.mdx

@@ -25,10 +25,11 @@ You have to restart metro-bundler for changes in the `babel.config.js` file to t
 * [mrousavy/**vision-camera-image-labeler**](https://github.com/mrousavy/vision-camera-image-labeler): A plugin to label images using MLKit Vision Image Labeler.
 * [mrousavy/**vision-camera-resize-plugin**](https://github.com/mrousavy/vision-camera-resize-plugin): A plugin for fast frame resizing to optimize execution speed of expensive AI algorithms.
 * [rodgomesc/**vision-camera-face-detector**](https://github.com/rodgomesc/vision-camera-face-detector): A plugin to detect faces using MLKit Vision Face Detector.
-* [rodgomesc/**vision-camera-ocr**](https://github.com/rodgomesc/vision-camera-ocr): A plugin to recognize text in any Latin-based character set using MLKit Text Recognition.
 * [rodgomesc/**vision-camera-qrcode-scanner**](https://github.com/rodgomesc/vision-camera-qrcode-scanner): A plugin to read barcodes using MLKit Vision QrCode Scanning
 * [mrousavy/**Colorwaver**](https://github.com/mrousavy/Colorwaver): An app (+ plugin) to detect color palettes in the real world.
 * [xulihang/**vision-camera-dynamsoft-barcode-reader**](https://github.com/xulihang/vision-camera-dynamsoft-barcode-reader): A plugin to read barcodes using Dynamsoft Barcode Reader.
+* [aarongrider/**vision-camera-ocr**](https://github.com/aarongrider/vision-camera-ocr): A plugin to detect text in real time using MLKit Text Detector (OCR).
+