Compare commits
No commits in common. "8cc57ec4d533d6486f4dc9d8e96a3600eb5ead6e" and "e9da712882470dbf09c8fd490c347650fd3b2775" have entirely different histories.
8cc57ec4d5
...
e9da712882
@ -3,10 +3,7 @@
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<uses-feature android:name="android.hardware.camera"/>
|
||||
<uses-permission android:name="android.permission.CAMERA" />
|
||||
<uses-permission android:name="android.permission.RECORD_AUDIO" />
|
||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||
<uses-feature android:name="android.hardware.Camera"/>
|
||||
<uses-permission android:name="android.permission.CAMERA"/>
|
||||
|
||||
<application
|
||||
android:allowBackup="true"
|
||||
|
@ -10,20 +10,17 @@ import androidx.camera.core.ExperimentalGetImage;
|
||||
import android.Manifest;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
import android.widget.ToggleButton;
|
||||
import android.widget.VideoView;
|
||||
|
||||
import com.example.ueberwachungssystem.VideoDetection.VideoDetector;
|
||||
|
||||
@ExperimentalGetImage
|
||||
public class MainActivity extends AppCompatActivity {
|
||||
|
||||
private static final int CAMERA_PERMISSION_REQUEST_CODE = 100;
|
||||
private static final int RECORD_VIDEO_PERMISSION_REQUEST_CODE = 102;
|
||||
private static final int CAMERA_PERMISSION_REQUEST_CODE = 101;
|
||||
|
||||
|
||||
@Override
|
||||
@ -58,7 +55,6 @@ public class MainActivity extends AppCompatActivity {
|
||||
}
|
||||
else {
|
||||
vd.stopDetection();
|
||||
textView.setText("");
|
||||
}
|
||||
}
|
||||
});
|
||||
@ -80,9 +76,9 @@ public class MainActivity extends AppCompatActivity {
|
||||
if (requestCode == CAMERA_PERMISSION_REQUEST_CODE && grantResults.length > 0) {
|
||||
boolean cameraRights = grantResults[0] == PackageManager.PERMISSION_GRANTED;
|
||||
if (cameraRights) {
|
||||
Toast.makeText(this, "permission granted", Toast.LENGTH_LONG).show();
|
||||
Toast.makeText(this, "camera permission granted", Toast.LENGTH_LONG).show();
|
||||
} else {
|
||||
Toast.makeText(this, "permission denied", Toast.LENGTH_LONG).show();
|
||||
Toast.makeText(this, "camera permission denied", Toast.LENGTH_LONG).show();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -32,14 +32,15 @@ public class VideoDetector extends Detector {
|
||||
// Preview Camera Image
|
||||
private PreviewView previewView = null;
|
||||
// Detect Violation
|
||||
private static final float PIXEL_THRESHOLD = 30f; // Luminosity (brightness channel of YUV_420_888)
|
||||
private static final float ALARM_THRESHOLD = 1f; // Percent of pixels changed
|
||||
private static final int PIXEL_THRESHOLD = 60; // Luminosity (brightness channel of YUV_420_888)
|
||||
private static final float ALARM_THRESHOLD = 0.5f; // Percent of pixels changed
|
||||
private ByteBuffer previousBuffer = null;
|
||||
|
||||
|
||||
|
||||
/** Constructor */
|
||||
public VideoDetector(Context context) {
|
||||
|
||||
super();
|
||||
this.context = context;
|
||||
}
|
||||
@ -58,7 +59,6 @@ public class VideoDetector extends Detector {
|
||||
cameraProvider = cameraProviderFuture.get();
|
||||
bindLuminosityAnalysis(cameraProvider);
|
||||
isDetectionRunning = true;
|
||||
previousBuffer = null;
|
||||
} catch (ExecutionException | InterruptedException e) {
|
||||
// No errors need to be handled for this Future. This should never be reached.
|
||||
}
|
||||
@ -117,17 +117,24 @@ public class VideoDetector extends Detector {
|
||||
if (previewView != null)
|
||||
preview.setSurfaceProvider(previewView.getSurfaceProvider());
|
||||
|
||||
cameraProvider.unbindAll();
|
||||
cameraProvider.bindToLifecycle((LifecycleOwner) context, cameraSelector, imageAnalysis, preview);
|
||||
stopDetection();
|
||||
}
|
||||
|
||||
|
||||
|
||||
/** Calculate Amount of Pixels changed */
|
||||
private int getChangedPixelCount(Image image) {
|
||||
int width = image.getWidth();
|
||||
int height = image.getHeight();
|
||||
|
||||
Image.Plane[] planes = image.getPlanes();
|
||||
ByteBuffer buffer = planes[0].getBuffer();
|
||||
|
||||
int yRowStride = image.getPlanes()[0].getRowStride();
|
||||
int yPixelStride = image.getPlanes()[0].getPixelStride();
|
||||
|
||||
int changedPixelCount = 0;
|
||||
|
||||
if (previousBuffer == null) {
|
||||
previousBuffer = ByteBuffer.allocate(buffer.capacity());
|
||||
buffer.rewind();
|
||||
@ -136,15 +143,6 @@ public class VideoDetector extends Detector {
|
||||
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 x = 0; x < width; x++) {
|
||||
int index = (y * yRowStride) + (x * yPixelStride);
|
||||
@ -155,7 +153,6 @@ public class VideoDetector extends Detector {
|
||||
changedPixelCount++;
|
||||
}
|
||||
}
|
||||
|
||||
// Reset and copy Byte Buffer
|
||||
buffer.rewind();
|
||||
previousBuffer.rewind();
|
||||
|
@ -32,8 +32,6 @@
|
||||
android:id="@+id/previewView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:backgroundTint="@android:color/black">
|
||||
|
||||
</androidx.camera.view.PreviewView>
|
||||
android:backgroundTint="@android:color/black"/>
|
||||
|
||||
</LinearLayout>
|
Loading…
x
Reference in New Issue
Block a user