railbird/react-native-vision-camera
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: Restructure codebase a bit (#1742)

Browse Source 
* Move core Camera stuff into `/core/`

* `NativePreviewView` -> `PreviewView`
This commit is contained in:
Marc Rousavy
2023-09-01 13:08:33 +02:00
committed by GitHub
parent 03b57a7d27
commit 01a79d63ef
24 changed files with 88 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/src/main/cpp/VideoPipeline.h
View File

@@ -20,7 +20,7 @@ using namespace facebook;
class VideoPipeline : public jni::HybridClass<VideoPipeline> {
public:
static auto constexpr kJavaDescriptor = "Lcom/mrousavy/camera/utils/VideoPipeline;";
static auto constexpr kJavaDescriptor = "Lcom/mrousavy/camera/core/VideoPipeline;";
static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis, int width,
int height);
static void registerNatives();

1
android/src/main/java/com/mrousavy/camera/CameraQueues.kt
View File

@@ -11,7 +11,6 @@ class CameraQueues {
companion object {
val cameraQueue = CameraQueue("mrousavy/VisionCamera.main")
val videoQueue = CameraQueue("mrousavy/VisionCamera.video")
val previewQueue = CameraQueue("mrousavy/VisionCamera.preview")
}
class CameraQueue(name: String) {

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

@@ -8,7 +8,7 @@ import com.facebook.react.bridge.*
import com.mrousavy.camera.parsers.Torch
import com.mrousavy.camera.parsers.VideoCodec
import com.mrousavy.camera.parsers.VideoFileType
import com.mrousavy.camera.utils.RecordingSession
import com.mrousavy.camera.core.RecordingSession
import com.mrousavy.camera.utils.makeErrorMap
import java.util.*

1
android/src/main/java/com/mrousavy/camera/CameraView+TakePhoto.kt
View File

@@ -11,6 +11,7 @@ import android.util.Log
import com.facebook.react.bridge.Arguments
import com.facebook.react.bridge.ReadableMap
import com.facebook.react.bridge.WritableMap
import com.mrousavy.camera.core.CameraSession
import com.mrousavy.camera.parsers.Flash
import com.mrousavy.camera.parsers.QualityPrioritization
import com.mrousavy.camera.utils.*

10
android/src/main/java/com/mrousavy/camera/CameraView.kt
View File

@@ -14,6 +14,8 @@ import android.view.View
import android.widget.FrameLayout
import androidx.core.content.ContextCompat
import com.facebook.react.bridge.ReadableMap
import com.mrousavy.camera.core.CameraSession
import com.mrousavy.camera.core.PreviewView
import com.mrousavy.camera.extensions.containsAny
import com.mrousavy.camera.extensions.installHierarchyFitter
import com.mrousavy.camera.frameprocessor.FrameProcessor
@@ -21,19 +23,16 @@ import com.mrousavy.camera.parsers.Orientation
import com.mrousavy.camera.parsers.PixelFormat
import com.mrousavy.camera.parsers.Torch
import com.mrousavy.camera.parsers.VideoStabilizationMode
import com.mrousavy.camera.utils.outputs.CameraOutputs
import com.mrousavy.camera.core.outputs.CameraOutputs
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import java.io.Closeable
//
// TODOs for the CameraView which are currently too hard to implement either because of CameraX' limitations, or my brain capacity.
//
// CameraView
// TODO: High-speed video recordings (export in CameraViewModule::getAvailableVideoDevices(), and set in CameraView::configurePreview()) (120FPS+)
// TODO: configureSession() enableDepthData
// TODO: configureSession() enablePortraitEffectsMatteDelivery
// CameraView+RecordVideo
// TODO: Better startRecording()/stopRecording() (promise + callback, wait for TurboModules/JSI)
@@ -41,7 +40,6 @@ import java.io.Closeable
// CameraView+TakePhoto
// TODO: takePhoto() depth data
// TODO: takePhoto() raw capture
// TODO: takePhoto() photoCodec ("hevc" | "jpeg" | "raw")
// TODO: takePhoto() return with jsi::Value Image reference for faster capture
@SuppressLint("ClickableViewAccessibility", "ViewConstructor", "MissingPermission")
@@ -129,7 +127,7 @@ class CameraView(context: Context) : FrameLayout(context) {
this.previewSurface = null
val cameraId = cameraId ?: return
val previewView = NativePreviewView(context, cameraManager, cameraId) { surface ->
val previewView = PreviewView(context, cameraManager, cameraId) { surface ->
previewSurface = surface
configureSession()
}

2
android/src/main/java/com/mrousavy/camera/CameraViewModule.kt
View File

@@ -4,7 +4,6 @@ import android.Manifest
import android.content.Context
import android.content.pm.PackageManager
import android.hardware.camera2.CameraManager
import android.os.Build
import android.util.Log
import androidx.core.content.ContextCompat
import com.facebook.react.bridge.*
@@ -12,6 +11,7 @@ import com.facebook.react.module.annotations.ReactModule
import com.facebook.react.modules.core.PermissionAwareActivity
import com.facebook.react.modules.core.PermissionListener
import com.facebook.react.uimanager.UIManagerHelper
import com.mrousavy.camera.core.CameraDeviceDetails
import com.mrousavy.camera.frameprocessor.VisionCameraInstaller
import com.mrousavy.camera.frameprocessor.VisionCameraProxy
import com.mrousavy.camera.parsers.*

2
android/src/main/java/com/mrousavy/camera/Errors.kt
View File

@@ -1,7 +1,7 @@
package com.mrousavy.camera
import com.mrousavy.camera.parsers.CameraDeviceError
import com.mrousavy.camera.utils.outputs.CameraOutputs
import com.mrousavy.camera.core.outputs.CameraOutputs
abstract class CameraError(
/**

2
android/src/main/java/com/mrousavy/camera/utils/CameraDeviceDetails.kt → android/src/main/java/com/mrousavy/camera/core/CameraDeviceDetails.kt
View File

@@ -1,4 +1,4 @@
package com.mrousavy.camera.utils
package com.mrousavy.camera.core
import android.graphics.ImageFormat
import android.hardware.camera2.CameraCharacteristics

15
android/src/main/java/com/mrousavy/camera/CameraSession.kt → android/src/main/java/com/mrousavy/camera/core/CameraSession.kt
View File

@@ -1,4 +1,4 @@
package com.mrousavy.camera
package com.mrousavy.camera.core
import android.content.Context
import android.graphics.Point
@@ -16,6 +16,15 @@ import android.os.Build
import android.util.Log
import android.util.Range
import android.util.Size
import com.mrousavy.camera.CameraNotReadyError
import com.mrousavy.camera.CameraQueues
import com.mrousavy.camera.CameraView
import com.mrousavy.camera.CaptureAbortedError
import com.mrousavy.camera.NoRecordingInProgressError
import com.mrousavy.camera.PhotoNotEnabledError
import com.mrousavy.camera.RecorderError
import com.mrousavy.camera.RecordingInProgressError
import com.mrousavy.camera.VideoNotEnabledError
import com.mrousavy.camera.extensions.SessionType
import com.mrousavy.camera.extensions.capture
import com.mrousavy.camera.extensions.createCaptureSession
@@ -30,9 +39,7 @@ import com.mrousavy.camera.parsers.QualityPrioritization
import com.mrousavy.camera.parsers.VideoCodec
import com.mrousavy.camera.parsers.VideoFileType
import com.mrousavy.camera.parsers.VideoStabilizationMode
import com.mrousavy.camera.utils.PhotoOutputSynchronizer
import com.mrousavy.camera.utils.RecordingSession
import com.mrousavy.camera.utils.outputs.CameraOutputs
import com.mrousavy.camera.core.outputs.CameraOutputs
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch
import kotlinx.coroutines.sync.Mutex

2
android/src/main/java/com/mrousavy/camera/utils/PhotoOutputSynchronizer.kt → android/src/main/java/com/mrousavy/camera/core/PhotoOutputSynchronizer.kt
View File

@@ -1,4 +1,4 @@
package com.mrousavy.camera.utils;
package com.mrousavy.camera.core;
import android.media.Image
import kotlinx.coroutines.CompletableDeferred

14
android/src/main/java/com/mrousavy/camera/NativePreviewView.kt → android/src/main/java/com/mrousavy/camera/core/PreviewView.kt
View File

@@ -1,4 +1,4 @@
package com.mrousavy.camera
package com.mrousavy.camera.core
import android.annotation.SuppressLint
import android.content.Context
@@ -11,15 +11,11 @@ import android.view.SurfaceView
import com.mrousavy.camera.extensions.getPreviewSize
import kotlin.math.roundToInt
/**
* A [SurfaceView] that can be adjusted to a specified aspect ratio and
* performs center-crop transformation of input frames.
*/
@SuppressLint("ViewConstructor")
class NativePreviewView(context: Context,
cameraManager: CameraManager,
cameraId: String,
private val onSurfaceChanged: (surface: Surface?) -> Unit): SurfaceView(context) {
class PreviewView(context: Context,
cameraManager: CameraManager,
cameraId: String,
private val onSurfaceChanged: (surface: Surface?) -> Unit): SurfaceView(context) {
private val targetSize: Size
private val aspectRatio: Float
get() = targetSize.width.toFloat() / targetSize.height.toFloat()

2
android/src/main/java/com/mrousavy/camera/utils/RecordingSession.kt → android/src/main/java/com/mrousavy/camera/core/RecordingSession.kt
View File

@@ -1,4 +1,4 @@
package com.mrousavy.camera.utils
package com.mrousavy.camera.core
import android.content.Context
import android.media.ImageWriter

2
android/src/main/java/com/mrousavy/camera/utils/VideoPipeline.kt → android/src/main/java/com/mrousavy/camera/core/VideoPipeline.kt
View File

@@ -1,4 +1,4 @@
package com.mrousavy.camera.utils
package com.mrousavy.camera.core
import android.graphics.ImageFormat
import android.graphics.SurfaceTexture

7
android/src/main/java/com/mrousavy/camera/utils/outputs/CameraOutputs.kt → android/src/main/java/com/mrousavy/camera/core/outputs/CameraOutputs.kt
View File

@@ -1,4 +1,4 @@
package com.mrousavy.camera.utils.outputs
package com.mrousavy.camera.core.outputs
import android.graphics.ImageFormat
import android.hardware.camera2.CameraManager
@@ -12,7 +12,7 @@ import com.mrousavy.camera.extensions.closestToOrMax
import com.mrousavy.camera.extensions.getPhotoSizes
import com.mrousavy.camera.extensions.getPreviewSize
import com.mrousavy.camera.extensions.getVideoSizes
import com.mrousavy.camera.utils.VideoPipeline
import com.mrousavy.camera.core.VideoPipeline
import java.io.Closeable
class CameraOutputs(val cameraId: String,
@@ -21,7 +21,8 @@ class CameraOutputs(val cameraId: String,
val photo: PhotoOutput? = null,
val video: VideoOutput? = null,
val enableHdr: Boolean? = false,
val callback: Callback): Closeable {
val callback: Callback
): Closeable {
companion object {
private const val TAG = "CameraOutputs"
const val PHOTO_OUTPUT_BUFFER_SIZE = 3

2
android/src/main/java/com/mrousavy/camera/utils/outputs/ImageReaderOutput.kt → android/src/main/java/com/mrousavy/camera/core/outputs/ImageReaderOutput.kt
View File

@@ -1,4 +1,4 @@
package com.mrousavy.camera.utils.outputs
package com.mrousavy.camera.core.outputs
import android.media.ImageReader
import android.util.Log

2
android/src/main/java/com/mrousavy/camera/utils/outputs/SurfaceOutput.kt → android/src/main/java/com/mrousavy/camera/core/outputs/SurfaceOutput.kt
View File

@@ -1,4 +1,4 @@
package com.mrousavy.camera.utils.outputs
package com.mrousavy.camera.core.outputs
import android.hardware.camera2.CameraCharacteristics
import android.hardware.camera2.CameraMetadata

4
android/src/main/java/com/mrousavy/camera/utils/outputs/VideoPipelineOutput.kt → android/src/main/java/com/mrousavy/camera/core/outputs/VideoPipelineOutput.kt
View File

@@ -1,8 +1,8 @@
package com.mrousavy.camera.utils.outputs
package com.mrousavy.camera.core.outputs
import android.util.Log
import android.util.Size
import com.mrousavy.camera.utils.VideoPipeline
import com.mrousavy.camera.core.VideoPipeline
import java.io.Closeable
/**

2
android/src/main/java/com/mrousavy/camera/extensions/CameraDevice+createCaptureSession.kt
View File

@@ -11,7 +11,7 @@ import android.util.Log
import androidx.annotation.RequiresApi
import com.mrousavy.camera.CameraQueues
import com.mrousavy.camera.CameraSessionCannotBeConfiguredError
import com.mrousavy.camera.utils.outputs.CameraOutputs
import com.mrousavy.camera.core.outputs.CameraOutputs
import kotlinx.coroutines.suspendCancellableCoroutine
import kotlin.coroutines.resume
import kotlin.coroutines.resumeWithException