From 82a779743e943083a3c39871339bb4de1a326f45 Mon Sep 17 00:00:00 2001
From: Matt <matthew.morley.ca@gmail.com>
Date: Wed, 15 Jan 2020 21:45:16 -0800
Subject: [PATCH] Remove unused stream queue in vision process

---
 .../chameleonvision/vision/VisionProcess.java | 38 -------------------
 1 file changed, 38 deletions(-)

diff --git a/chameleon-server/src/main/java/com/chameleonvision/vision/VisionProcess.java b/chameleon-server/src/main/java/com/chameleonvision/vision/VisionProcess.java
index 5535eae1d..e0f13941c 100644
--- a/chameleon-server/src/main/java/com/chameleonvision/vision/VisionProcess.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/vision/VisionProcess.java
@@ -36,7 +36,6 @@ import java.util.stream.Collectors;
 public class VisionProcess {
 
     private final USBCameraCapture cameraCapture;
-    //    private final CameraStreamerRunnable streamRunnable;
     private final VisionProcessRunnable visionRunnable;
     private final CameraConfig fileConfig;
     public final CameraStreamer cameraStreamer;
@@ -44,8 +43,6 @@ public class VisionProcess {
 
     private volatile CVPipelineResult lastPipelineResult;
 
-    private BlockingQueue<Mat> streamFrameQueue = new LinkedBlockingDeque<>(1);
-
     // network table stuff
     private final NetworkTable defaultTable;
     private NetworkTableInstance tableInstance;
@@ -79,7 +76,6 @@ public class VisionProcess {
 
         // Thread to put frames on the dashboard
         this.cameraStreamer = new CameraStreamer(cameraCapture, config.cameraConfig.name, pipelineManager.getCurrentPipeline().settings.streamDivisor);
-//        this.streamRunnable = new CameraStreamerRunnable(30, cameraStreamer);
 
         // Thread to process vision data
         this.visionRunnable = new VisionProcessRunnable();
@@ -278,7 +274,6 @@ public class VisionProcess {
             }
         }
         tableInstance.flush();
-
     }
 
     public void setVideoMode(VideoMode newMode) {
@@ -361,8 +356,6 @@ public class VisionProcess {
                 }
 
                 try {
-//                    streamFrameQueue.clear();
-//                    streamFrameQueue.add(lastPipelineResult.outputMat);
                     var currentTime = System.currentTimeMillis();
                     if ((currentTime - lastStreamTimeMs) / 1000d > 1.0 / 30.0) {
                         cameraStreamer.runStream(lastPipelineResult.outputMat);
@@ -393,35 +386,4 @@ public class VisionProcess {
 
     }
 
-    private class CameraStreamerRunnable extends LoopingRunnable {
-
-        final CameraStreamer streamer;
-        private Mat bufferMat = new Mat();
-
-        private CameraStreamerRunnable(int cameraFPS, CameraStreamer streamer) {
-            // add 2 FPS to allow for a bit of overhead
-            super(1000L / (cameraFPS + 2));
-            this.streamer = streamer;
-        }
-
-        @Override
-        protected void process() {
-            if (!streamFrameQueue.isEmpty()) {
-                try {
-
-                    bufferMat = streamFrameQueue.take();
-
-                    try {
-                        streamer.runStream(bufferMat);
-                        bufferMat.release();
-                    } catch (Exception e) {
-                        // do nothing
-                    }
-
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
 }