Reverting back the first benchmark (now works with less threads); synchronization...

[iot2.git] / benchmarks / Java / SmartLightsController / MotionDetection.java

diff --git a/benchmarks/Java/SmartLightsController/MotionDetection.java b/benchmarks/Java/SmartLightsController/MotionDetection.java
index 4aa0dc8810aeffa23a59016ea0fb90990385202b..3c9567f1e238a6d5e1471be2f971f01066332747 100644 (file)
--- a/benchmarks/Java/SmartLightsController/MotionDetection.java
+++ b/benchmarks/Java/SmartLightsController/MotionDetection.java
@@ -257,16 +257,16 @@ class MotionDetection implements CameraCallback {
         *
         *   @return [void] None.
         */
-       //public void newCameraFrameAvailable(byte[] latestFrame, long timeStamp) {
-       public void newCameraFrameAvailable(CameraSmart _camera) {
+       public void newCameraFrameAvailable(byte[] latestFrame, long timeStamp) {
+       //public void newCameraFrameAvailable(CameraSmart _camera) {
                BufferedImage img = null;
 
-               // Parse the byte array into a Buffered Image
-               byte[] newImg = _camera.getLatestFrame();
+               //byte[] newImg = _camera.getLatestFrame();
                try {
                        //InputStream in = new ByteArrayInputStream(_camera.getLatestFrame());
-                       //InputStream in = new ByteArrayInputStream(latestFrame);
-                       InputStream in = new ByteArrayInputStream(newImg);
+                       //InputStream in = new ByteArrayInputStream(newImg);
+                       // Parse the byte array into a Buffered Image
+                       InputStream in = new ByteArrayInputStream(latestFrame);
                        img = ImageIO.read(in);
 
                } catch (RemoteException e) {
@@ -284,8 +284,8 @@ class MotionDetection implements CameraCallback {
                latestImage = img;              // image into image buffer
 
                // timestamp from camera into timestamp buffer
-               //long dateLong = timeStamp;
-               long dateLong = _camera.getTimestamp();
+               long dateLong = timeStamp;
+               //long dateLong = _camera.getTimestamp();
                //System.out.println("dateLong: " + dateLong + " - newImage size: " + newImg.length);
                possibleDate = new Date(dateLong);
 
@@ -372,9 +372,9 @@ class MotionDetection implements CameraCallback {
 
                // calculate the percentage of the image that was in motion
                double percentMotion = (countMotion / count) * 100.0;
-               System.out.println("countMotion: " + countMotion);
-               System.out.println("count: " + count);
-               System.out.println("Percent motion: " + percentMotion);
+               //System.out.println("countMotion: " + countMotion);
+               //System.out.println("count: " + count);
+               //System.out.println("Percent motion: " + percentMotion);
 
                // Check if a high enough percentage of the image was in motion to say that there was motion in this frame of data
                if (percentMotion > MOTION_DETECTED_THRESHOLD_PERCENTAGE) {