Added onDetectionListener to VideoDecoder

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

@@ -15,13 +15,17 @@ 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
@@ -47,8 +51,15 @@ 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/VideoDetector.java

@@ -1,4 +1,4 @@
-package com.example.ueberwachungssystem;
+package com.example.ueberwachungssystem.VideoDetection;
 
 import android.content.Context;
 import android.graphics.ImageFormat;
@@ -22,6 +22,7 @@ import com.google.common.util.concurrent.ListenableFuture;
 import java.nio.ByteBuffer;
 import java.util.concurrent.ExecutionException;
 
+
 @ExperimentalGetImage
 public class VideoDetector {
     // Calling Activity
@@ -32,25 +33,37 @@ public class VideoDetector {
     // Preview Camera Image
     private PreviewView previewView = null;
     // 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; }
 
 
+    /** On Detection Listener - runs when a violation is reported */
+    public interface OnDetectionListener {
+        public void onDetection(DetectionReport detectionReport);
+    }
+    public void setOnDetectionListener(OnDetectionListener listener) {
+        this.listener = listener;
+    }
+    public void reportViolation(float amplitude) {
+        DetectionReport detectionReport = new DetectionReport("123", "Video", amplitude);
+        if (listener != null)
+            listener.onDetection(detectionReport);
+    }
+
 
     /** Return State of Video Detector */
-    public Boolean isRunning() { return isDetectionRunning; }
+    public Boolean isRunning() {
-
+        return isDetectionRunning;
-    /** Return the status of Violation */
-    public boolean getViolationStatus()
-    {
-        return isViolated;
     }
 
+
     /** Starts Video Detection */
     public void startDetection() {
         isDetectionRunning = true;
@@ -70,17 +83,20 @@ public class VideoDetector {
         },ContextCompat.getMainExecutor(context));
     }
 
+
     /** Stops Video Detection */
     public void stopDetection() {
         cameraProvider.unbindAll();
         isDetectionRunning = false;
     }
 
+
     /** Set PreviewView to show Image */
     public void setPreviewView(PreviewView previewView) {
         this.previewView = previewView;
     }
 
+
     /** Binds the Luminosity Analyzer (configure and run Analysis) */
     private void bindLuminosityAnalysis(@NonNull ProcessCameraProvider cameraProvider) {
         // Configure and create Image Analysis
@@ -100,9 +116,8 @@ public class VideoDetector {
                     // Analyze frame
                     float luminosity = calculateLuminosity(image);
                     Log.d("Video Detector", String.valueOf(luminosity));
-                    if (luminosity != 0)
+                    checkForViolation(luminosity, previousLuminosity);
-                        checkForViolation(luminosity, lastLuminosity);
+                    previousLuminosity = luminosity;
-                    lastLuminosity = luminosity;
                 }
                 imageProxy.close();
             }
@@ -118,6 +133,7 @@ public class VideoDetector {
         cameraProvider.bindToLifecycle((LifecycleOwner) context, cameraSelector, imageAnalysis, preview);
     }
 
+
     /** Return Luminosity from Image */
     private float calculateLuminosity (Image image) {
         int width = image.getWidth();
@@ -142,11 +158,12 @@ public class VideoDetector {
         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) {
-            isViolated = true;
+            reportViolation(deltaLuminosity);
             Log.d("Violation", "Violation");
         }
         Log.d("Delta", String.valueOf(Math.abs(previousLuminosity - luminosity)));