Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Video capture #69

Closed
wants to merge 18 commits into from
Closed
Show file tree
Hide file tree
Changes from 11 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<framework src="androidx.camera:camera-camera2:1.1.0" />
<framework src="androidx.camera:camera-lifecycle:1.1.0" />
<framework src="androidx.camera:camera-view:1.1.0" />
<framework src="androidx.camera:camera-video:1.1.0" />

<source-file src="src/android/CameraPreviewFragment.java" target-dir="src/com/spoon/simplecamerapreview" />
<source-file src="src/android/SimpleCameraPreview.java" target-dir="src/com/spoon/simplecamerapreview" />
Expand Down
87 changes: 80 additions & 7 deletions src/android/CameraPreviewFragment.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
package com.spoon.simplecamerapreview;

import android.Manifest;
import android.annotation.SuppressLint;
import android.content.ContentValues;
import android.content.Context;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.graphics.Point;
import android.hardware.camera2.CameraCharacteristics;
import android.location.Location;
import android.net.Uri;
import android.os.Bundle;
import android.provider.MediaStore;
import android.os.Handler;
import android.os.Looper;
import android.util.Log;
Expand All @@ -29,8 +33,17 @@
import androidx.camera.core.ImageCaptureException;
import androidx.camera.core.Preview;
import androidx.camera.lifecycle.ProcessCameraProvider;
import androidx.camera.video.FileOutputOptions;
import androidx.camera.video.Quality;
import androidx.camera.video.QualitySelector;
import androidx.camera.video.Recorder;
import androidx.camera.video.Recording;
import androidx.camera.video.VideoCapture;
import androidx.camera.video.VideoRecordEvent;
import androidx.camera.view.PreviewView;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;

import androidx.exifinterface.media.ExifInterface;
import androidx.fragment.app.Fragment;

Expand All @@ -51,6 +64,11 @@ interface CameraCallback {
void onCompleted(Exception err, String nativePath);
}

interface VideoCallback {
void onStart(Boolean recording, String nativePath);
void onStop(Boolean recording, String nativePath);
}

interface CameraStartedCallback {
void onCameraStarted(Exception err);
}
Expand All @@ -76,6 +94,9 @@ public class CameraPreviewFragment extends Fragment {
private PreviewView viewFinder;
private Preview preview;
private ImageCapture imageCapture;
private VideoCapture<Recorder> videoCapture;
Recording recording = null;
ProcessCameraProvider cameraProvider = null;
private Camera camera;
private CameraStartedCallback startCameraCallback;
private Location location;
Expand Down Expand Up @@ -120,13 +141,11 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
viewFinder.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.MATCH_PARENT));
containerView.addView(viewFinder);
startCamera();

return containerView;
}

public void startCamera() {
ListenableFuture<ProcessCameraProvider> cameraProviderFuture = ProcessCameraProvider.getInstance(getActivity());
ProcessCameraProvider cameraProvider = null;

try {
cameraProvider = cameraProviderFuture.get();
Expand All @@ -136,8 +155,8 @@ public void startCamera() {
startCameraCallback.onCameraStarted(new Exception("Unable to start camera"));
return;
}
setUpCamera(captureDevice,cameraProvider);

setUpCamera(captureDevice,cameraProvider);
preview.setSurfaceProvider(viewFinder.getSurfaceProvider());

if (startCameraCallback != null) {
Expand Down Expand Up @@ -258,6 +277,54 @@ public void hasFlash(HasFlashCallback hasFlashCallback) {
hasFlashCallback.onResult(camera.getCameraInfo().hasFlashUnit());
}

public void captureVideo(VideoCallback videoCallback) {
if (recording != null) {
recording.stop();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
recording.stop();
recording.stop();
recording = null;

return;
}
UUID uuid = UUID.randomUUID();

String filename = uuid.toString() + ".mp4";
ContentValues contentValues = new ContentValues();
contentValues.put(MediaStore.Video.Media.DISPLAY_NAME, filename);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
ContentValues contentValues = new ContentValues();
contentValues.put(MediaStore.Video.Media.DISPLAY_NAME, filename);
ContentValues contentValues = new ContentValues();
contentValues.put(MediaStore.Video.Media.DISPLAY_NAME, filename);

not used

if (ActivityCompat.checkSelfPermission(this.getContext(), Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
ActivityCompat.requestPermissions(this.getActivity(), new String[]{Manifest.permission.RECORD_AUDIO}, 200);
}
File videoFile = new File(
getContext().getApplicationContext().getFilesDir(),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
getContext().getApplicationContext().getFilesDir(),
getContext().getFilesDir(),

filename
);

FileOutputOptions outputOptions = new FileOutputOptions.Builder(videoFile).build();

recording = videoCapture.getOutput()
.prepareRecording(this.getContext().getApplicationContext(), outputOptions)
.withAudioEnabled()
.start(ContextCompat.getMainExecutor(this.getContext()), videoRecordEvent -> {
if (videoRecordEvent instanceof VideoRecordEvent.Start) {
videoCallback.onStart(true, null);
} else if (videoRecordEvent instanceof VideoRecordEvent.Finalize) {
VideoRecordEvent.Finalize finalizeEvent = (VideoRecordEvent.Finalize) videoRecordEvent;
if (finalizeEvent.hasError()) {
// Handle the error
int errorCode = finalizeEvent.getError();
Throwable errorCause = finalizeEvent.getCause();
Log.e(TAG, "Video recording error: " + errorCode, errorCause);
} else {
// Handle video saved
videoCallback.onStop(false, Uri.fromFile(videoFile).toString());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better to move this line after the log(line 317)

Uri savedUri = finalizeEvent.getOutputResults().getOutputUri();
Log.i(TAG, "Video saved to: " + savedUri);
recording = null;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

move this on line 325? since we are not setting the recording to null if finalizeEvent.hasError()

}
}
// Other event types can be handled if needed
});

}



public void takePicture(boolean useFlash, CameraCallback takePictureCallback) {
if (torchActivated) {
useFlash = true;
Expand Down Expand Up @@ -398,18 +465,24 @@ public void setUpCamera(String captureDevice, ProcessCameraProvider cameraProvid
targetResolution = CameraPreviewFragment.calculateResolution(getContext(), targetSize);
}

Recorder recorder = new Recorder.Builder()
.setQualitySelector(QualitySelector.from(Quality.LOWEST))
.build();
videoCapture = VideoCapture.withOutput(recorder);


preview = new Preview.Builder().build();
imageCapture = new ImageCapture.Builder()
.setTargetResolution(targetResolution)
.build();

cameraProvider.unbindAll();
try {
camera = cameraProvider.bindToLifecycle(
getActivity(),
cameraSelector,
preview,
imageCapture
imageCapture,
videoCapture
);
} catch (IllegalArgumentException e) {
// Error with result in capturing image with default resolution
Expand All @@ -420,9 +493,9 @@ public void setUpCamera(String captureDevice, ProcessCameraProvider cameraProvid
getActivity(),
cameraSelector,
preview,
imageCapture
imageCapture,
videoCapture
);
}

}
}
46 changes: 46 additions & 0 deletions src/android/SimpleCameraPreview.java
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
case "torchSwitch":
return torchSwitch(args.getBoolean(0), callbackContext);

case "captureVideo":
return captureVideo(callbackContext);

case "deviceHasFlash":
return deviceHasFlash(callbackContext);

Expand Down Expand Up @@ -267,6 +270,49 @@ public void fetchLocation() {
}
}

private boolean captureVideo(CallbackContext callbackContext) {
if (fragment == null) {
callbackContext.error("Camera is closed");
return true;
}

fragment.captureVideo(new VideoCallback() {
public void onStart(Boolean recording, String nativePath) {
JSONObject data = new JSONObject();
if (recording) {
try {
data.put("recording", true);
data.put("nativePath", null);
} catch (JSONException e) {
e.printStackTrace();
callbackContext.error("Cannot send recording data");
return;
}

PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, data);
pluginResult.setKeepCallback(true);
callbackContext.sendPluginResult(pluginResult);
}
}

public void onStop(Boolean recording, String nativePath) {
JSONObject data = new JSONObject();
try {
data.put("recording", false);
data.put("nativePath", nativePath);
} catch (JSONException e) {
e.printStackTrace();
callbackContext.error("Cannot send recording data");
return;
}
PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, data);
pluginResult.setKeepCallback(true);
callbackContext.sendPluginResult(pluginResult);
}
});
return true;
}

private boolean capture(boolean useFlash, CallbackContext callbackContext) {
if (fragment == null) {
callbackContext.error("Camera is closed");
Expand Down
4 changes: 4 additions & 0 deletions www/SimpleCameraPreview.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ SimpleCameraPreview.capture = function (options, onSuccess, onError) {
exec(onSuccess, onError, PLUGIN_NAME, "capture", [options.flash]);
};

SimpleCameraPreview.captureVideo = function (onSuccess, onError) {
exec(onSuccess, onError, PLUGIN_NAME, "captureVideo");
};

SimpleCameraPreview.setSize = function (options, onSuccess, onError) {
exec(onSuccess, onError, PLUGIN_NAME, "setSize", [options]);
};
Expand Down
Loading