app/src/main/java/com/example/ueberwachungssystem/MainActivity.java

@@ -15,17 +15,13 @@ import androidx.lifecycle.LifecycleOwner;
 import android.Manifest;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.example.ueberwachungssystem.VideoDetection.DetectionReport;
-import com.example.ueberwachungssystem.VideoDetection.VideoDetector;
 import com.google.common.util.concurrent.ListenableFuture;
 
-import java.util.Calendar;
 import java.util.concurrent.ExecutionException;
 
 @ExperimentalGetImage
@@ -51,15 +47,8 @@ public class MainActivity extends AppCompatActivity {
 
         VideoDetector vd = new VideoDetector(this);
         vd.setPreviewView(previewView);
-        vd.setOnDetectionListener(new VideoDetector.OnDetectionListener() {
-            @Override
-            public void onDetection(DetectionReport detectionReport) {
-                Log.d("Listener", detectionReport.detectionType);
-            }
-        });
         vd.startDetection();
 
-
         previewButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

app/src/main/java/com/example/ueberwachungssystem/VideoDetection/DetectionReport.java

@@ -1,19 +0,0 @@
-package com.example.ueberwachungssystem.VideoDetection;
-
-import java.util.Calendar;
-
-/** Detection Report Class */
-
-public class DetectionReport {
-    public String timeStamp;
-    public String detectionType;
-    public float detectedAmplitude;
-    public String detectorID;
-
-    public DetectionReport(String detectorID, String detectionType, float detectedAmplitude) {
-        this.timeStamp = String.valueOf(Calendar.getInstance().getTime());
-        this.detectionType = detectionType;
-        this.detectedAmplitude = detectedAmplitude;
-        this.detectorID = detectorID;
-    }
-}

app/src/main/java/com/example/ueberwachungssystem/VideoDetector.java

@@ -1,171 +1,154 @@
-package com.example.ueberwachungssystem.VideoDetection;
+package com.example.ueberwachungssystem;
-
+
-import android.content.Context;
+import android.content.Context;
-import android.graphics.ImageFormat;
+import android.graphics.ImageFormat;
-import android.media.Image;
+import android.media.Image;
-import android.util.Log;
+import android.util.Log;
-import android.util.Size;
+import android.util.Size;
-
+
-import androidx.annotation.NonNull;
+import androidx.annotation.NonNull;
-import androidx.camera.core.CameraSelector;
+import androidx.camera.core.CameraSelector;
-import androidx.camera.core.ExperimentalGetImage;
+import androidx.camera.core.ExperimentalGetImage;
-import androidx.camera.core.ImageAnalysis;
+import androidx.camera.core.ImageAnalysis;
-import androidx.camera.core.ImageProxy;
+import androidx.camera.core.ImageProxy;
-import androidx.camera.core.Preview;
+import androidx.camera.core.Preview;
-import androidx.camera.lifecycle.ProcessCameraProvider;
+import androidx.camera.lifecycle.ProcessCameraProvider;
-import androidx.camera.view.PreviewView;
+import androidx.camera.view.PreviewView;
-import androidx.core.content.ContextCompat;
+import androidx.core.content.ContextCompat;
-import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LifecycleOwner;
-
+
-import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListenableFuture;
-
+
-import java.nio.ByteBuffer;
+import java.nio.ByteBuffer;
-import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutionException;
-
+
-
+@ExperimentalGetImage
-@ExperimentalGetImage
+public class VideoDetector {
-public class VideoDetector {
+    // Calling Activity
-    // Calling Activity
+    private final Context context;
-    private final Context context;
+    // Camera Provider
-    // Camera Provider
+    private ProcessCameraProvider cameraProvider;
-    private ProcessCameraProvider cameraProvider;
+    private Boolean isDetectionRunning = false;
-    private Boolean isDetectionRunning = false;
+    // Preview Camera Image
-    // Preview Camera Image
+    private PreviewView previewView = null;
-    private PreviewView previewView = null;
+    // Check Violation
-    // Check Violation
+    private final float DELTA_LUMINOSITY_THRESHOLD = 10f;
-    private final float DELTA_LUMINOSITY_THRESHOLD = 0.5f;
+    private float lastLuminosity = 0f;
-    private float previousLuminosity = 0f;
+    private Boolean isViolated = false;
-    // On Detection Listener
+
-    private OnDetectionListener listener;
+
-
+    /** Constructor */
-
+    public VideoDetector(Context context) { this.context = context; }
-
+
-    /** Constructor */
+
-    public VideoDetector(Context context) { this.context = context; }
+
-
+    /** Return State of Video Detector */
-
+    public Boolean isRunning() { return isDetectionRunning; }
-    /** On Detection Listener - runs when a violation is reported */
+
-    public interface OnDetectionListener {
+    /** Return the status of Violation */
-        public void onDetection(DetectionReport detectionReport);
+    public boolean getViolationStatus()
-    }
+    {
-    public void setOnDetectionListener(OnDetectionListener listener) {
+        return isViolated;
-        this.listener = listener;
+    }
-    }
+
-    public void reportViolation(float amplitude) {
+    /** Starts Video Detection */
-        DetectionReport detectionReport = new DetectionReport("123", "Video", amplitude);
+    public void startDetection() {
-        if (listener != null)
+        isDetectionRunning = true;
-            listener.onDetection(detectionReport);
+        // Request Camera Provider
-    }
+        final ListenableFuture<ProcessCameraProvider> cameraProviderFuture = ProcessCameraProvider.getInstance(context);
-
+        //Check for Camera availability
-
+        cameraProviderFuture.addListener(new Runnable() {
-    /** Return State of Video Detector */
+            @Override
-    public Boolean isRunning() {
+            public void run() {
-        return isDetectionRunning;
+                try {
-    }
+                    cameraProvider = cameraProviderFuture.get();
-
+                    bindLuminosityAnalysis(cameraProvider);
-
+                } catch (ExecutionException | InterruptedException e) {
-    /** Starts Video Detection */
+                    // No errors need to be handled for this Future. This should never be reached.
-    public void startDetection() {
+                }
-        isDetectionRunning = true;
+            }
-        // Request Camera Provider
+        },ContextCompat.getMainExecutor(context));
-        final ListenableFuture<ProcessCameraProvider> cameraProviderFuture = ProcessCameraProvider.getInstance(context);
+    }
-        //Check for Camera availability
+
-        cameraProviderFuture.addListener(new Runnable() {
+    /** Stops Video Detection */
-            @Override
+    public void stopDetection() {
-            public void run() {
+        cameraProvider.unbindAll();
-                try {
+        isDetectionRunning = false;
-                    cameraProvider = cameraProviderFuture.get();
+    }
-                    bindLuminosityAnalysis(cameraProvider);
+
-                } catch (ExecutionException | InterruptedException e) {
+    /** Set PreviewView to show Image */
-                    // No errors need to be handled for this Future. This should never be reached.
+    public void setPreviewView(PreviewView previewView) {
-                }
+        this.previewView = previewView;
-            }
+    }
-        },ContextCompat.getMainExecutor(context));
+
-    }
+    /** Binds the Luminosity Analyzer (configure and run Analysis) */
-
+    private void bindLuminosityAnalysis(@NonNull ProcessCameraProvider cameraProvider) {
-
+        // Configure and create Image Analysis
-    /** Stops Video Detection */
+        ImageAnalysis.Builder builder = new ImageAnalysis.Builder();
-    public void stopDetection() {
+        builder.setTargetResolution(new Size(640, 480));
-        cameraProvider.unbindAll();
+        builder.setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST);
-        isDetectionRunning = false;
+        ImageAnalysis imageAnalysis = builder.build();
-    }
+
-
+        // Set Analyzer
-
+        imageAnalysis.setAnalyzer(ContextCompat.getMainExecutor(context), new ImageAnalysis.Analyzer() {
-    /** Set PreviewView to show Image */
+            @Override
-    public void setPreviewView(PreviewView previewView) {
+            public void analyze(@NonNull ImageProxy imageProxy) {
-        this.previewView = previewView;
+                if (imageProxy.getFormat() == ImageFormat.YUV_420_888) {
-    }
+                    Image image = imageProxy.getImage();
-
+                    assert image != null;
-
+
-    /** Binds the Luminosity Analyzer (configure and run Analysis) */
+                    // Analyze frame
-    private void bindLuminosityAnalysis(@NonNull ProcessCameraProvider cameraProvider) {
+                    float luminosity = calculateLuminosity(image);
-        // Configure and create Image Analysis
+                    Log.d("Video Detector", String.valueOf(luminosity));
-        ImageAnalysis.Builder builder = new ImageAnalysis.Builder();
+                    if (luminosity != 0)
-        builder.setTargetResolution(new Size(640, 480));
+                        checkForViolation(luminosity, lastLuminosity);
-        builder.setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST);
+                    lastLuminosity = luminosity;
-        ImageAnalysis imageAnalysis = builder.build();
+                }
-
+                imageProxy.close();
-        // Set Analyzer
+            }
-        imageAnalysis.setAnalyzer(ContextCompat.getMainExecutor(context), new ImageAnalysis.Analyzer() {
+        });
-            @Override
+        // Create Preview
-            public void analyze(@NonNull ImageProxy imageProxy) {
+        Preview preview = new Preview.Builder().build();
-                if (imageProxy.getFormat() == ImageFormat.YUV_420_888) {
+        // Specify which Camera to use
-                    Image image = imageProxy.getImage();
+        CameraSelector cameraSelector = new CameraSelector.Builder().requireLensFacing(CameraSelector.LENS_FACING_BACK).build();
-                    assert image != null;
+        // Update PreviewView if set
-
+        if (previewView != null)
-                    // Analyze frame
+            preview.setSurfaceProvider(previewView.getSurfaceProvider());
-                    float luminosity = calculateLuminosity(image);
+
-                    Log.d("Video Detector", String.valueOf(luminosity));
+        cameraProvider.bindToLifecycle((LifecycleOwner) context, cameraSelector, imageAnalysis, preview);
-                    checkForViolation(luminosity, previousLuminosity);
+    }
-                    previousLuminosity = luminosity;
+
-                }
+    /** Return Luminosity from Image */
-                imageProxy.close();
+    private float calculateLuminosity (Image image) {
-            }
+        int width = image.getWidth();
-        });
+        int height = image.getHeight();
-        // Create Preview
+
-        Preview preview = new Preview.Builder().build();
+        Image.Plane[] planes = image.getPlanes();
-        // Specify which Camera to use
+        ByteBuffer luminosityBuffer = planes[0].getBuffer();
-        CameraSelector cameraSelector = new CameraSelector.Builder().requireLensFacing(CameraSelector.LENS_FACING_BACK).build();
+
-        // Update PreviewView if set
+        int yRowStride = image.getPlanes()[0].getRowStride();
-        if (previewView != null)
+        int yPixelStride = image.getPlanes()[0].getPixelStride();
-            preview.setSurfaceProvider(previewView.getSurfaceProvider());
+
-
+        int luminosity;
-        cameraProvider.bindToLifecycle((LifecycleOwner) context, cameraSelector, imageAnalysis, preview);
+        float sum = 0;
-    }
+
-
+        for (int y = 0; y < height; ++y) {
-
+            for (int x = 0; x < width; x++) {
-    /** Return Luminosity from Image */
+                int index = (y * yRowStride) + (x * yPixelStride);
-    private float calculateLuminosity (Image image) {
+                luminosity = (luminosityBuffer.get(index) & 0xff);
-        int width = image.getWidth();
+                sum += luminosity;
-        int height = image.getHeight();
+            }
-
+        }
-        Image.Plane[] planes = image.getPlanes();
+        return sum / (width * height);
-        ByteBuffer luminosityBuffer = planes[0].getBuffer();
+    }
-
+
-        int yRowStride = image.getPlanes()[0].getRowStride();
+    /** Check if delta Luminosity exceeds threshold */
-        int yPixelStride = image.getPlanes()[0].getPixelStride();
+    private void checkForViolation(float luminosity, float previousLuminosity) {
-
+        float deltaLuminosity = Math.abs(luminosity - previousLuminosity);
-        int luminosity;
+        if (deltaLuminosity > DELTA_LUMINOSITY_THRESHOLD) {
-        float sum = 0;
+            isViolated = true;
-
+            Log.d("Violation", "Violation");
-        for (int y = 0; y < height; ++y) {
+        }
-            for (int x = 0; x < width; x++) {
+        Log.d("Delta", String.valueOf(Math.abs(previousLuminosity - luminosity)));
-                int index = (y * yRowStride) + (x * yPixelStride);
+    }
-                luminosity = (luminosityBuffer.get(index) & 0xff);
+}
-                sum += luminosity;
-            }
-        }
-        return sum / (width * height);
-    }
-
-
-    /** Check if delta Luminosity exceeds threshold */
-    private void checkForViolation(float luminosity, float previousLuminosity) {
-        float deltaLuminosity = Math.abs(luminosity - previousLuminosity);
-        if (deltaLuminosity > DELTA_LUMINOSITY_THRESHOLD) {
-            reportViolation(deltaLuminosity);
-            Log.d("Violation", "Violation");
-        }
-        Log.d("Delta", String.valueOf(Math.abs(previousLuminosity - luminosity)));
-    }
-}