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

Bug Fixes on VideoDetector

Browse Source
This commit is contained in:
Bastian Kohler 2023-06-21 09:50:14 +02:00
parent 39295f9780
commit 43eac872ed
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/com/example/ueberwachungssystem/Detection/VideoDetector.java
View File

@ -42,8 +42,6 @@ import java.util.concurrent.ExecutionException;
/** /**
* Video Detector inherits some methods from abstract Detector class (more info there) * Video Detector inherits some methods from abstract Detector class (more info there)
* USE FROM MAIN ACTIVITY:
* VideoDetector vd = new VideoDetector(this);
* */ * */
@ -175,7 +173,10 @@ public class VideoDetector extends Detector {
public void stopDetection() { public void stopDetection() {
if (!isDetecting || imageAnalysis == null) if (!isDetecting || imageAnalysis == null)
return; return;
cameraProvider.unbind(imageAnalysis); if (!isRecording)
cameraProvider.unbindAll();
else
cameraProvider.unbind(imageAnalysis);
isDetecting = false; isDetecting = false;
allowReportViolation = false; allowReportViolation = false;
} }
@ -187,7 +188,11 @@ public class VideoDetector extends Detector {
return; return;
videoCapture.stopRecording(); videoCapture.stopRecording();
cameraProvider.unbind(videoCapture);
if (!isDetecting())
cameraProvider.unbindAll();
else
cameraProvider.unbind(videoCapture);
isRecording = false; isRecording = false;
} }
@ -219,12 +224,12 @@ public class VideoDetector extends Detector {
int n = OpenCVHelper.countNonZeroPixels(processed); int n = OpenCVHelper.countNonZeroPixels(processed);
int pixelCount = image.getWidth() * image.getHeight(); int pixelCount = image.getWidth() * image.getHeight();
float percentChanged = (float) n / pixelCount; float percentChanged = (float) (n / pixelCount) * 100;
// Violation Condition // Violation Condition
if (percentChanged * 100 > ALARM_THRESHOLD) { if (percentChanged> ALARM_THRESHOLD) {
if (allowReportViolation) if (allowReportViolation)
reportViolation("Video", percentChanged * 100); reportViolation("Video", percentChanged);
} }
} }
imageProxy.close(); imageProxy.close();
@ -310,7 +315,7 @@ public class VideoDetector extends Detector {
/** Start delay until Violation Report is allowed */ /** Start delay until Violation Report is allowed */
private void startViolationTimer(float setupTime) { private void startViolationTimer(float setupTime) {
new CountDownTimer((long) (START_DELAY), 100) { new CountDownTimer((long) (setupTime), 100) {
@Override @Override
public void onTick(long millisUntilFinished) { public void onTick(long millisUntilFinished) {
} }