Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors
more improvements to video recording
n8fr8b9374797dc10
diff --git a/src/main/java/org/havenapp/main/sensors/motion/CameraViewHolder.java b/src/main/java/org/havenapp/main/sensors/motion/CameraViewHolder.javaindex 16f0b9e..8b47bc4 100644--- a/src/main/java/org/havenapp/main/sensors/motion/CameraViewHolder.java+++ b/src/main/java/org/havenapp/main/sensors/motion/CameraViewHolder.java@@ -15,6 +15,7 @@ import android.content.Context;import android.content.Intent;import android.content.ServiceConnection;import android.graphics.Bitmap;+import android.graphics.Matrix;import android.hardware.Camera;import android.os.Environment;import android.os.Handler;@@ -260,36 +261,48 @@ public class CameraViewHolder {mEncodeVideoWorkQueue);+ private Matrix mtxVideoRotate;+private void recordNewFrame (byte[] data, int width, int height, int rotationDegrees){Bitmap bitmap = Nv21Image.nv21ToBitmap(renderScript, data, width, height);++ bitmap = Bitmap.createBitmap(bitmap,0,0,width,height,mtxVideoRotate,true);+try {- encoder.encodeImage(bitmap);+ if (encoder != null)+ encoder.encodeImage(bitmap);+bitmap.recycle();} catch (Exception e) {e.printStackTrace();}- if (mEncodeVideoWorkQueue.isEmpty() && (!doingVideoProcessing)) {- try {- encoder.finish();- if (serviceMessenger != null) {- Message message = new Message();- message.what = EventTrigger.CAMERA_VIDEO;- message.getData().putString(MonitorService.KEY_PATH, videoFile);- try {- serviceMessenger.send(message);- } catch (RemoteException e) {- e.printStackTrace();- }++ }++ private void finishVideoEncoding ()+ {+ try {+ encoder.finish();++ if (serviceMessenger != null) {+ Message message = new Message();+ message.what = EventTrigger.CAMERA_VIDEO;+ message.getData().putString(MonitorService.KEY_PATH, videoFile);+ try {+ serviceMessenger.send(message);+ } catch (RemoteException e) {+ e.printStackTrace();}- } catch (IOException e) {- e.printStackTrace();}+ } catch (IOException e) {+ e.printStackTrace();}+}private synchronized void processNewFrame (byte[] data, int width, int height, int rotationDegrees)@@ -311,7 +324,6 @@ public class CameraViewHolder {if (doingVideoProcessing)return false;-String ts1 = String.valueOf(new Date().getTime());videoFile = Environment.getExternalStorageDirectory() + File.separator + prefs.getImagePath() + File.separator + ts1 + ".mp4";try {@@ -321,12 +333,26 @@ public class CameraViewHolder {e.printStackTrace();}- int seconds = prefs.getMonitoringTime() * 1000;+ mtxVideoRotate = new Matrix();++ if (cameraView.getFacing() == CameraView.FACING_FRONT) {+ mtxVideoRotate.postRotate(-cameraView.getDefaultOrientation());+ mtxVideoRotate.postScale(-1, 1, cameraView.getWidth() / 2, cameraView.getHeight() / 2);+ }+ else+ mtxVideoRotate.postRotate(cameraView.getDefaultOrientation());+doingVideoProcessing = true;++ int seconds = prefs.getMonitoringTime() * 1000;updateHandler.postDelayed(() -> {doingVideoProcessing = false;+ finishVideoEncoding();}, seconds);+ for (MotionDetector.MotionListener listener : listeners)+ listener.onProcess(null, null, null, false);+return true;}@@ -386,4 +412,9 @@ public class CameraViewHolder {return result;}+ public boolean doingVideoProcessing ()+ {+ return doingVideoProcessing;+ }+}diff --git a/src/main/java/org/havenapp/main/ui/CameraFragment.java b/src/main/java/org/havenapp/main/ui/CameraFragment.javaindex 61b5715..ef70ac4 100644--- a/src/main/java/org/havenapp/main/ui/CameraFragment.java+++ b/src/main/java/org/havenapp/main/ui/CameraFragment.java@@ -16,6 +16,7 @@ import android.view.LayoutInflater;import android.view.View;import android.view.ViewGroup;import android.widget.ImageView;+import android.widget.TextView;import com.google.android.cameraview.CameraView;@@ -28,12 +29,18 @@ public final class CameraFragment extends Fragment {private CameraViewHolder cameraViewHolder;private ImageView newImage;private PreferenceManager prefs;+ private TextView txtCameraStatus;@Overridepublic View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) {- return inflater.inflate(R.layout.camera_fragment, container, false);+ View view = inflater.inflate(R.layout.camera_fragment, container, false);++ newImage = view.findViewById(R.id.new_image);+ txtCameraStatus = view.findViewById(R.id.camera_status_display);++ return view;}@@ -80,7 +87,6 @@ public final class CameraFragment extends Fragment {private void initCamera (){- newImage = getActivity().findViewById(R.id.new_image);PreferenceManager prefs = new PreferenceManager(getActivity());@@ -97,6 +103,15 @@ public final class CameraFragment extends Fragment {newImage.setImageBitmap(newBitmap);elsenewImage.setImageResource(R.drawable.blankimage);++ if (txtCameraStatus != null) {+ if (cameraViewHolder.doingVideoProcessing()) {+ txtCameraStatus.setText("Recording...");+ } else {+ txtCameraStatus.setText("");+ }+ }+});}diff --git a/src/main/res/layout/camera_fragment.xml b/src/main/res/layout/camera_fragment.xmlindex 1a53c11..083abd9 100644--- a/src/main/res/layout/camera_fragment.xml+++ b/src/main/res/layout/camera_fragment.xml@@ -28,4 +28,17 @@android:background="@color/transparent"android:scaleType="fitXY"/>++ <TextView+ android:id="@+id/camera_status_display"+ android:layout_width="wrap_content"+ android:layout_height="wrap_content"+ android:gravity="center"+ android:text=""+ android:textColor="@color/DarkRed"+ android:textSize="28sp"+ android:textStyle="bold"+ android:layout_gravity="center_horizontal|center_vertical"++ /></FrameLayout>