pass filePath to RecordingSession #3
@ -13,7 +13,7 @@ import com.mrousavy.camera.types.RecordVideoOptions
|
||||
import com.mrousavy.camera.utils.makeErrorMap
|
||||
import java.util.*
|
||||
|
||||
suspend fun CameraView.startRecording(options: RecordVideoOptions, onRecordCallback: Callback) {
|
||||
suspend fun CameraView.startRecording(options: RecordVideoOptions, filePath: String, onRecordCallback: Callback) {
|
||||
// check audio permission
|
||||
if (audio == true) {
|
||||
if (ContextCompat.checkSelfPermission(context, Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
|
||||
@ -33,7 +33,7 @@ suspend fun CameraView.startRecording(options: RecordVideoOptions, onRecordCallb
|
||||
val errorMap = makeErrorMap(error.code, error.message)
|
||||
onRecordCallback(null, errorMap)
|
||||
}
|
||||
cameraSession.startRecording(audio == true, options, callback, onError)
|
||||
cameraSession.startRecording(audio == true, options, filePath, callback, onError)
|
||||
}
|
||||
|
||||
@SuppressLint("RestrictedApi")
|
||||
|
@ -95,12 +95,12 @@ class CameraViewModule(reactContext: ReactApplicationContext) : ReactContextBase
|
||||
|
||||
// TODO: startRecording() cannot be awaited, because I can't have a Promise and a onRecordedCallback in the same function. Hopefully TurboModules allows that
|
||||
@ReactMethod
|
||||
fun startRecording(viewTag: Int, jsOptions: ReadableMap, onRecordCallback: Callback) {
|
||||
fun startRecording(viewTag: Int, jsOptions: ReadableMap, filePath: String, onRecordCallback: Callback) {
|
||||
coroutineScope.launch {
|
||||
val view = findCameraView(viewTag)
|
||||
try {
|
||||
val options = RecordVideoOptions(jsOptions)
|
||||
view.startRecording(options, onRecordCallback)
|
||||
view.startRecording(options, filePath, onRecordCallback)
|
||||
} catch (error: CameraError) {
|
||||
val map = makeErrorMap("${error.domain}/${error.id}", error.message, error)
|
||||
onRecordCallback(null, map)
|
||||
|
@ -621,6 +621,7 @@ class CameraSession(private val context: Context, private val cameraManager: Cam
|
||||
suspend fun startRecording(
|
||||
enableAudio: Boolean,
|
||||
options: RecordVideoOptions,
|
||||
filePath: String,
|
||||
callback: (video: RecordingSession.Video) -> Unit,
|
||||
onError: (error: CameraError) -> Unit
|
||||
) {
|
||||
@ -640,6 +641,7 @@ class CameraSession(private val context: Context, private val cameraManager: Cam
|
||||
videoOutput.enableHdr,
|
||||
orientation,
|
||||
options,
|
||||
filePath,
|
||||
callback,
|
||||
onError,
|
||||
this.callback,
|
||||
|
@ -23,6 +23,7 @@ class RecordingSession(
|
||||
private val hdr: Boolean = false,
|
||||
private val cameraOrientation: Orientation,
|
||||
private val options: RecordVideoOptions,
|
||||
private val filePath: String,
|
||||
private val callback: (video: Video) -> Unit,
|
||||
private val onError: (error: CameraError) -> Unit,
|
||||
private val allCallbacks: CameraSession.Callback,
|
||||
@ -37,12 +38,7 @@ class RecordingSession(
|
||||
|
||||
data class Video(val path: String, val durationMs: Long, val size: Size)
|
||||
|
||||
private val outputPath = run {
|
||||
val videoDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MOVIES)
|
||||
val sdf = SimpleDateFormat("yyyy_MM_dd_HH_mm_ss_SSS", Locale.US)
|
||||
val videoFileName = "VID_${sdf.format(Date())}"
|
||||
File(videoDir!!, videoFileName)
|
||||
}
|
||||
private val outputPath: File = File(filePath)
|
||||
|
||||
private val bitRate = getBitRate()
|
||||
private val recorder = ChunkedRecordingManager.fromParams(
|
||||
|
@ -173,7 +173,7 @@ export class Camera extends React.PureComponent<CameraProps, CameraState> {
|
||||
* }, 5000)
|
||||
* ```
|
||||
*/
|
||||
public startRecording(options: RecordVideoOptions): void {
|
||||
public startRecording(options: RecordVideoOptions, filePath: string): void {
|
||||
|
||||
const { onRecordingError, onRecordingFinished, videoBitRate, ...passThruOptions } = options
|
||||
if (typeof onRecordingError !== 'function' || typeof onRecordingFinished !== 'function')
|
||||
throw new CameraRuntimeError('parameter/invalid-parameter', 'The onRecordingError or onRecordingFinished functions were not set!')
|
||||
@ -207,7 +207,7 @@ export class Camera extends React.PureComponent<CameraProps, CameraState> {
|
||||
}
|
||||
try {
|
||||
// TODO: Use TurboModules to make this awaitable.
|
||||
CameraModule.startRecording(this.handle, nativeOptions, onRecordCallback)
|
||||
CameraModule.startRecording(this.handle, nativeOptions, filePath, onRecordCallback)
|
||||
colonelpanic
commented
hmm this whitespace too hmm this whitespace too
loewy
commented
i think when we first pushed up this repo it was using tab size 4, when i made my changes the prettier config was overriding on save and switching to tab space 2 the weird thing is it didn't show up as a change until i committed the code. i think when we first pushed up this repo it was using tab size 4, when i made my changes the prettier config was overriding on save and switching to tab space 2
the weird thing is it didn't show up as a change until i committed the code.
colonelpanic
commented
alright. i dont care that much in this repo. lets just merge alright. i dont care that much in this repo. lets just merge
|
||||
} catch (e) {
|
||||
throw tryParseNativeCameraError(e)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user
why did this whitespace change?