Compare commits
9 Commits
3d09106e45
...
loewy/impr
| Author | SHA1 | Date | |
|---|---|---|---|
| b269e9c493 | |||
| 5fe7f35127 | |||
| 61863149c0 | |||
| 09b50938d2 | |||
| a158ed8350 | |||
|
|
e7b295546a | ||
|
|
d87ed8ced2 | ||
| f055119735 | |||
| 35d80b13d6 |
@@ -19,9 +19,7 @@ endif()
|
|||||||
|
|
||||||
|
|
||||||
# Add react-native-vision-camera sources
|
# Add react-native-vision-camera sources
|
||||||
add_library(
|
set(SOURCES
|
||||||
${PACKAGE_NAME}
|
|
||||||
SHARED
|
|
||||||
# Shared C++
|
# Shared C++
|
||||||
../cpp/MutableRawBuffer.cpp
|
../cpp/MutableRawBuffer.cpp
|
||||||
# Java JNI
|
# Java JNI
|
||||||
@@ -31,7 +29,11 @@ add_library(
|
|||||||
src/main/cpp/OpenGLContext.cpp
|
src/main/cpp/OpenGLContext.cpp
|
||||||
src/main/cpp/OpenGLRenderer.cpp
|
src/main/cpp/OpenGLRenderer.cpp
|
||||||
src/main/cpp/MutableJByteBuffer.cpp
|
src/main/cpp/MutableJByteBuffer.cpp
|
||||||
# Frame Processor
|
)
|
||||||
|
|
||||||
|
# Only add Frame Processor sources if enabled
|
||||||
|
if (ENABLE_FRAME_PROCESSORS)
|
||||||
|
list(APPEND SOURCES
|
||||||
src/main/cpp/frameprocessor/FrameHostObject.cpp
|
src/main/cpp/frameprocessor/FrameHostObject.cpp
|
||||||
src/main/cpp/frameprocessor/FrameProcessorPluginHostObject.cpp
|
src/main/cpp/frameprocessor/FrameProcessorPluginHostObject.cpp
|
||||||
src/main/cpp/frameprocessor/JSIJNIConversion.cpp
|
src/main/cpp/frameprocessor/JSIJNIConversion.cpp
|
||||||
@@ -42,6 +44,18 @@ add_library(
|
|||||||
src/main/cpp/frameprocessor/java-bindings/JFrameProcessorPlugin.cpp
|
src/main/cpp/frameprocessor/java-bindings/JFrameProcessorPlugin.cpp
|
||||||
src/main/cpp/frameprocessor/java-bindings/JVisionCameraProxy.cpp
|
src/main/cpp/frameprocessor/java-bindings/JVisionCameraProxy.cpp
|
||||||
src/main/cpp/frameprocessor/java-bindings/JVisionCameraScheduler.cpp
|
src/main/cpp/frameprocessor/java-bindings/JVisionCameraScheduler.cpp
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
add_library(
|
||||||
|
${PACKAGE_NAME}
|
||||||
|
SHARED
|
||||||
|
${SOURCES}
|
||||||
|
)
|
||||||
|
|
||||||
|
# Force 16KB page alignment for Android 15+ compatibility
|
||||||
|
set_target_properties(${PACKAGE_NAME} PROPERTIES
|
||||||
|
LINK_FLAGS "-Wl,-z,max-page-size=16384"
|
||||||
)
|
)
|
||||||
|
|
||||||
# Header Search Paths (includes)
|
# Header Search Paths (includes)
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
@@ -9,11 +9,13 @@
|
|||||||
|
|
||||||
JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
|
JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
|
||||||
return facebook::jni::initialize(vm, [] {
|
return facebook::jni::initialize(vm, [] {
|
||||||
|
// VideoPipeline is needed for video recording even without Frame Processors
|
||||||
|
vision::VideoPipeline::registerNatives();
|
||||||
|
#if VISION_CAMERA_ENABLE_FRAME_PROCESSORS
|
||||||
|
// Frame Processor JNI bindings - only register when Frame Processors are enabled
|
||||||
vision::VisionCameraInstaller::registerNatives();
|
vision::VisionCameraInstaller::registerNatives();
|
||||||
vision::JVisionCameraProxy::registerNatives();
|
vision::JVisionCameraProxy::registerNatives();
|
||||||
vision::JVisionCameraScheduler::registerNatives();
|
vision::JVisionCameraScheduler::registerNatives();
|
||||||
vision::VideoPipeline::registerNatives();
|
|
||||||
#if VISION_CAMERA_ENABLE_FRAME_PROCESSORS
|
|
||||||
vision::JFrameProcessor::registerNatives();
|
vision::JFrameProcessor::registerNatives();
|
||||||
vision::JSharedArray::registerNatives();
|
vision::JSharedArray::registerNatives();
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -29,10 +29,16 @@ class CameraViewModule(reactContext: ReactApplicationContext) : ReactContextBase
|
|||||||
var sharedRequestCode = 10
|
var sharedRequestCode = 10
|
||||||
|
|
||||||
init {
|
init {
|
||||||
// Skip loading native library for React Native 0.79+ compatibility
|
try {
|
||||||
// Frame Processors are disabled (react-native-worklets-core not installed)
|
// Load the native part of VisionCamera.
|
||||||
// The native library has incompatible JNI signatures for RN 0.79+
|
// Includes the OpenGL VideoPipeline (needed for video recording)
|
||||||
Log.i(TAG, "VisionCamera native library not loaded - Frame Processors disabled for RN 0.79+ compatibility")
|
// Frame Processors remain disabled for RN 0.79+ compatibility
|
||||||
|
System.loadLibrary("VisionCamera")
|
||||||
|
Log.i(TAG, "VisionCamera native library loaded successfully")
|
||||||
|
} catch (e: UnsatisfiedLinkError) {
|
||||||
|
Log.e(TAG, "Failed to load VisionCamera C++ library!", e)
|
||||||
|
throw e
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import android.util.Log
|
|||||||
import android.util.Size
|
import android.util.Size
|
||||||
import android.view.Surface
|
import android.view.Surface
|
||||||
import android.view.SurfaceHolder
|
import android.view.SurfaceHolder
|
||||||
|
import android.view.WindowManager
|
||||||
import androidx.core.content.ContextCompat
|
import androidx.core.content.ContextCompat
|
||||||
import com.google.mlkit.vision.barcode.common.Barcode
|
import com.google.mlkit.vision.barcode.common.Barcode
|
||||||
import com.mrousavy.camera.core.capture.RepeatingCaptureRequest
|
import com.mrousavy.camera.core.capture.RepeatingCaptureRequest
|
||||||
@@ -425,6 +426,21 @@ class CameraSession(private val context: Context, private val cameraManager: Cam
|
|||||||
|
|
||||||
val fps = configuration?.fps ?: 30
|
val fps = configuration?.fps ?: 30
|
||||||
|
|
||||||
|
// Get actual device rotation from WindowManager since the React Native orientation hook
|
||||||
|
// doesn't update when rotating between landscape-left and landscape-right on Android.
|
||||||
|
// Map device rotation to the correct orientationHint for video recording:
|
||||||
|
// - Counter-clockwise (ROTATION_90) → 270° hint
|
||||||
|
// - Clockwise (ROTATION_270) → 90° hint
|
||||||
|
val windowManager = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
|
||||||
|
val deviceRotation = windowManager.defaultDisplay.rotation
|
||||||
|
val recordingOrientation = when (deviceRotation) {
|
||||||
|
Surface.ROTATION_0 -> Orientation.PORTRAIT
|
||||||
|
Surface.ROTATION_90 -> Orientation.LANDSCAPE_RIGHT
|
||||||
|
Surface.ROTATION_180 -> Orientation.PORTRAIT_UPSIDE_DOWN
|
||||||
|
Surface.ROTATION_270 -> Orientation.LANDSCAPE_LEFT
|
||||||
|
else -> Orientation.PORTRAIT
|
||||||
|
}
|
||||||
|
|
||||||
val recording = RecordingSession(
|
val recording = RecordingSession(
|
||||||
context,
|
context,
|
||||||
cameraId,
|
cameraId,
|
||||||
|
|||||||
@@ -105,6 +105,12 @@ class ChunkedRecordingManager(private val encoder: MediaCodec, private val outpu
|
|||||||
muxerContext?.finish()
|
muxerContext?.finish()
|
||||||
chunkIndex++
|
chunkIndex++
|
||||||
|
|
||||||
|
val format = this.encodedFormat
|
||||||
|
if (format == null) {
|
||||||
|
Log.e(TAG, "Cannot create muxer: encodedFormat is null (onOutputFormatChanged not called yet)")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
val newFileName = "$chunkIndex.mp4"
|
val newFileName = "$chunkIndex.mp4"
|
||||||
val newOutputFile = File(this.outputDirectory, newFileName)
|
val newOutputFile = File(this.outputDirectory, newFileName)
|
||||||
Log.i(TAG, "Creating new muxer for file: $newFileName")
|
Log.i(TAG, "Creating new muxer for file: $newFileName")
|
||||||
@@ -114,7 +120,7 @@ class ChunkedRecordingManager(private val encoder: MediaCodec, private val outpu
|
|||||||
)
|
)
|
||||||
muxer.setOrientationHint(orientationHint)
|
muxer.setOrientationHint(orientationHint)
|
||||||
muxerContext = MuxerContext(
|
muxerContext = MuxerContext(
|
||||||
muxer, newOutputFile, chunkIndex, bufferInfo.presentationTimeUs, this.encodedFormat!!, this.callbacks
|
muxer, newOutputFile, chunkIndex, bufferInfo.presentationTimeUs, format, this.callbacks
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -123,7 +129,8 @@ class ChunkedRecordingManager(private val encoder: MediaCodec, private val outpu
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun chunkLengthUs(bufferInfo: BufferInfo): Long {
|
private fun chunkLengthUs(bufferInfo: BufferInfo): Long {
|
||||||
return bufferInfo.presentationTimeUs - muxerContext!!.startTimeUs
|
val context = muxerContext ?: return 0L
|
||||||
|
return bufferInfo.presentationTimeUs - context.startTimeUs
|
||||||
}
|
}
|
||||||
|
|
||||||
fun start() {
|
fun start() {
|
||||||
@@ -155,7 +162,13 @@ class ChunkedRecordingManager(private val encoder: MediaCodec, private val outpu
|
|||||||
if (muxerContext == null || (atKeyframe(bufferInfo) && chunkLengthUs(bufferInfo) >= targetDurationUs)) {
|
if (muxerContext == null || (atKeyframe(bufferInfo) && chunkLengthUs(bufferInfo) >= targetDurationUs)) {
|
||||||
this.createNextMuxer(bufferInfo)
|
this.createNextMuxer(bufferInfo)
|
||||||
}
|
}
|
||||||
muxerContext!!.muxer.writeSampleData(muxerContext!!.videoTrack, encodedData, bufferInfo)
|
val context = muxerContext
|
||||||
|
if (context == null) {
|
||||||
|
Log.e(TAG, "Cannot write sample data: muxerContext is null")
|
||||||
|
encoder.releaseOutputBuffer(index, false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
context.muxer.writeSampleData(context.videoTrack, encodedData, bufferInfo)
|
||||||
encoder.releaseOutputBuffer(index, false)
|
encoder.releaseOutputBuffer(index, false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,8 +9,10 @@ import android.os.Looper
|
|||||||
import android.util.Log
|
import android.util.Log
|
||||||
import android.util.Size
|
import android.util.Size
|
||||||
import android.view.PixelCopy
|
import android.view.PixelCopy
|
||||||
|
import android.view.Surface
|
||||||
import android.view.SurfaceHolder
|
import android.view.SurfaceHolder
|
||||||
import android.view.SurfaceView
|
import android.view.SurfaceView
|
||||||
|
import android.view.WindowManager
|
||||||
import com.facebook.react.bridge.UiThreadUtil
|
import com.facebook.react.bridge.UiThreadUtil
|
||||||
import com.mrousavy.camera.extensions.resize
|
import com.mrousavy.camera.extensions.resize
|
||||||
import com.mrousavy.camera.extensions.rotatedBy
|
import com.mrousavy.camera.extensions.rotatedBy
|
||||||
@@ -150,6 +152,8 @@ class PreviewView(context: Context, callback: SurfaceHolder.Callback) :
|
|||||||
val width = frame.width()
|
val width = frame.width()
|
||||||
val height = frame.height()
|
val height = frame.height()
|
||||||
|
|
||||||
|
// Create bitmap matching surface frame dimensions for PixelCopy
|
||||||
|
// The original code swapped dimensions assuming landscape input - keep that for consistency
|
||||||
val bitmap = Bitmap.createBitmap(height, width, Bitmap.Config.ARGB_8888)
|
val bitmap = Bitmap.createBitmap(height, width, Bitmap.Config.ARGB_8888)
|
||||||
|
|
||||||
// Use a coroutine to suspend until the PixelCopy request is complete
|
// Use a coroutine to suspend until the PixelCopy request is complete
|
||||||
@@ -159,7 +163,23 @@ class PreviewView(context: Context, callback: SurfaceHolder.Callback) :
|
|||||||
bitmap,
|
bitmap,
|
||||||
{ copyResult ->
|
{ copyResult ->
|
||||||
if (copyResult == PixelCopy.SUCCESS) {
|
if (copyResult == PixelCopy.SUCCESS) {
|
||||||
continuation.resume(rotateBitmap90CounterClockwise(bitmap))
|
// Get actual device rotation from WindowManager instead of relying on
|
||||||
|
// the orientation prop, which may not update on Android when rotating
|
||||||
|
// between landscape-left and landscape-right.
|
||||||
|
val windowManager = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
|
||||||
|
val deviceRotation = windowManager.defaultDisplay.rotation
|
||||||
|
|
||||||
|
val actualOrientation = when (deviceRotation) {
|
||||||
|
Surface.ROTATION_0 -> Orientation.PORTRAIT
|
||||||
|
Surface.ROTATION_90 -> Orientation.LANDSCAPE_LEFT
|
||||||
|
Surface.ROTATION_180 -> Orientation.PORTRAIT_UPSIDE_DOWN
|
||||||
|
Surface.ROTATION_270 -> Orientation.LANDSCAPE_RIGHT
|
||||||
|
else -> Orientation.PORTRAIT
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.i(TAG, "getBitmap: orientation prop = $orientation, deviceRotation = $deviceRotation, actualOrientation = $actualOrientation")
|
||||||
|
|
||||||
|
continuation.resume(bitmap.transformBitmap(actualOrientation))
|
||||||
} else {
|
} else {
|
||||||
continuation.resumeWithException(
|
continuation.resumeWithException(
|
||||||
RuntimeException("PixelCopy failed with error code $copyResult")
|
RuntimeException("PixelCopy failed with error code $copyResult")
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ import com.facebook.jni.HybridData
|
|||||||
import com.facebook.proguard.annotations.DoNotStrip
|
import com.facebook.proguard.annotations.DoNotStrip
|
||||||
import com.facebook.react.bridge.ReactApplicationContext
|
import com.facebook.react.bridge.ReactApplicationContext
|
||||||
import com.facebook.react.bridge.UiThreadUtil
|
import com.facebook.react.bridge.UiThreadUtil
|
||||||
// import com.facebook.react.turbomodule.core.CallInvokerHolderImpl // Commented out due to RN 0.79+ compatibility
|
|
||||||
import com.facebook.react.uimanager.UIManagerHelper
|
import com.facebook.react.uimanager.UIManagerHelper
|
||||||
import com.mrousavy.camera.CameraView
|
import com.mrousavy.camera.CameraView
|
||||||
import com.mrousavy.camera.core.ViewNotFoundError
|
import com.mrousavy.camera.core.ViewNotFoundError
|
||||||
@@ -78,9 +77,9 @@ class VisionCameraProxy(private val reactContext: ReactApplicationContext) {
|
|||||||
FrameProcessorPluginRegistry.getPlugin(name, this, options)
|
FrameProcessorPluginRegistry.getPlugin(name, this, options)
|
||||||
|
|
||||||
// private C++ funcs
|
// private C++ funcs
|
||||||
// Keep this declared (even though we don't call it) so JNI can register it
|
// Frame Processors are disabled - native registration is skipped via VISION_CAMERA_ENABLE_FRAME_PROCESSORS=OFF
|
||||||
// The native library expects this method signature to exist
|
// This method is never called or registered, kept for reference only
|
||||||
@DoNotStrip
|
// @DoNotStrip
|
||||||
@Keep
|
// @Keep
|
||||||
private external fun initHybrid(jsContext: Long, jsCallInvokerHolder: Any, scheduler: VisionCameraScheduler): HybridData
|
// private external fun initHybrid(jsContext: Long, jsCallInvokerHolder: Any, scheduler: VisionCameraScheduler): HybridData
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,6 +11,6 @@ inline fun withPromise(promise: Promise, closure: () -> Any?) {
|
|||||||
} catch (e: Throwable) {
|
} catch (e: Throwable) {
|
||||||
e.printStackTrace()
|
e.printStackTrace()
|
||||||
val error = if (e is CameraError) e else UnknownCameraError(e)
|
val error = if (e is CameraError) e else UnknownCameraError(e)
|
||||||
promise.reject("${error.domain}/${error.id}", error.message, error.cause)
|
promise.reject("${error.domain}/${error.id}", error.message ?: "Unknown error", error.cause)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -56,14 +56,15 @@ extension ChunkedRecorder: AVAssetWriterDelegate {
|
|||||||
|
|
||||||
private func saveInitSegment(_ data: Data) {
|
private func saveInitSegment(_ data: Data) {
|
||||||
let url = outputURL.appendingPathComponent("init.mp4")
|
let url = outputURL.appendingPathComponent("init.mp4")
|
||||||
save(data: data, url: url)
|
if save(data: data, url: url) {
|
||||||
onChunkReady(url: url, type: .initialization)
|
onChunkReady(url: url, type: .initialization)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private func saveSegment(_ data: Data, report: AVAssetSegmentReport?) {
|
private func saveSegment(_ data: Data, report: AVAssetSegmentReport?) {
|
||||||
let name = "\(chunkIndex).mp4"
|
let name = "\(chunkIndex).mp4"
|
||||||
let url = outputURL.appendingPathComponent(name)
|
let url = outputURL.appendingPathComponent(name)
|
||||||
save(data: data, url: url)
|
if save(data: data, url: url) {
|
||||||
let duration = report?
|
let duration = report?
|
||||||
.trackReports
|
.trackReports
|
||||||
.filter { $0.mediaType == .video }
|
.filter { $0.mediaType == .video }
|
||||||
@@ -72,12 +73,15 @@ extension ChunkedRecorder: AVAssetWriterDelegate {
|
|||||||
onChunkReady(url: url, type: .data(index: chunkIndex, duration: duration))
|
onChunkReady(url: url, type: .data(index: chunkIndex, duration: duration))
|
||||||
chunkIndex += 1
|
chunkIndex += 1
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private func save(data: Data, url: URL) {
|
private func save(data: Data, url: URL) -> Bool {
|
||||||
do {
|
do {
|
||||||
try data.write(to: url)
|
try data.write(to: url)
|
||||||
|
return true
|
||||||
} catch {
|
} catch {
|
||||||
ReactLogger.log(level: .error, message: "Unable to write \(url): \(error.localizedDescription)")
|
ReactLogger.log(level: .error, message: "Unable to write \(url): \(error.localizedDescription)")
|
||||||
|
return false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user