siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor

Browse Source
This commit is contained in:
Bastian Kohler 2023-05-29 10:43:51 +02:00
parent e9da712882
commit 19d1bfe1e3
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
View File

@ -55,6 +55,7 @@ public class MainActivity extends AppCompatActivity {
} }
else { else {
vd.stopDetection(); vd.stopDetection();
textView.setText("");
} }
} }
}); });

26
app/src/main/java/com/example/ueberwachungssystem/VideoDetection/VideoDetector.java
View File

@ -32,15 +32,14 @@ public class VideoDetector extends Detector {
// Preview Camera Image // Preview Camera Image
private PreviewView previewView = null; private PreviewView previewView = null;
// Detect Violation // Detect Violation
private static final int PIXEL_THRESHOLD = 60; // Luminosity (brightness channel of YUV_420_888) private static final float PIXEL_THRESHOLD = 30f; // Luminosity (brightness channel of YUV_420_888)
private static final float ALARM_THRESHOLD = 0.5f; // Percent of pixels changed private static final float ALARM_THRESHOLD = 1f; // Percent of pixels changed
private ByteBuffer previousBuffer = null; private ByteBuffer previousBuffer = null;
/** Constructor */ /** Constructor */
public VideoDetector(Context context) { public VideoDetector(Context context) {
super(); super();
this.context = context; this.context = context;
} }
@ -59,6 +58,7 @@ public class VideoDetector extends Detector {
cameraProvider = cameraProviderFuture.get(); cameraProvider = cameraProviderFuture.get();
bindLuminosityAnalysis(cameraProvider); bindLuminosityAnalysis(cameraProvider);
isDetectionRunning = true; isDetectionRunning = true;
previousBuffer = null;
} catch (ExecutionException | InterruptedException e) { } catch (ExecutionException | InterruptedException e) {
// No errors need to be handled for this Future. This should never be reached. // No errors need to be handled for this Future. This should never be reached.
} }
@ -118,23 +118,15 @@ public class VideoDetector extends Detector {
preview.setSurfaceProvider(previewView.getSurfaceProvider()); preview.setSurfaceProvider(previewView.getSurfaceProvider());
cameraProvider.bindToLifecycle((LifecycleOwner) context, cameraSelector, imageAnalysis, preview); cameraProvider.bindToLifecycle((LifecycleOwner) context, cameraSelector, imageAnalysis, preview);
stopDetection();
} }
/** Calculate Amount of Pixels changed */ /** Calculate Amount of Pixels changed */
private int getChangedPixelCount(Image image) { private int getChangedPixelCount(Image image) {
int width = image.getWidth();
int height = image.getHeight();
Image.Plane[] planes = image.getPlanes(); Image.Plane[] planes = image.getPlanes();
ByteBuffer buffer = planes[0].getBuffer(); ByteBuffer buffer = planes[0].getBuffer();
int yRowStride = image.getPlanes()[0].getRowStride();
int yPixelStride = image.getPlanes()[0].getPixelStride();
int changedPixelCount = 0;
if (previousBuffer == null) { if (previousBuffer == null) {
previousBuffer = ByteBuffer.allocate(buffer.capacity()); previousBuffer = ByteBuffer.allocate(buffer.capacity());
buffer.rewind(); buffer.rewind();
@ -143,6 +135,15 @@ public class VideoDetector extends Detector {
return 0; return 0;
} }
int width = image.getWidth();
int height = image.getHeight();
int yRowStride = image.getPlanes()[0].getRowStride();
int yPixelStride = image.getPlanes()[0].getPixelStride();
int changedPixelCount = 0;
// Count changed pixels
for (int y = 0; y < height; ++y) { for (int y = 0; y < height; ++y) {
for (int x = 0; x < width; x++) { for (int x = 0; x < width; x++) {
int index = (y * yRowStride) + (x * yPixelStride); int index = (y * yRowStride) + (x * yPixelStride);
@ -153,6 +154,7 @@ public class VideoDetector extends Detector {
changedPixelCount++; changedPixelCount++;
} }
} }
// Reset and copy Byte Buffer // Reset and copy Byte Buffer
buffer.rewind(); buffer.rewind();
previousBuffer.rewind(); previousBuffer.rewind();