From a731c7a8db3f7c213b6ff0eca4925167ec215080 Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 30 Oct 2021 12:27:41 -0400 Subject: [PATCH] Revert part of #288 (#306) Fixes picam streaming/hangs --- .../photonvision/vision/pipeline/ColoredShapePipeline.java | 6 ++++-- .../photonvision/vision/pipeline/ReflectivePipeline.java | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/photon-core/src/main/java/org/photonvision/vision/pipeline/ColoredShapePipeline.java b/photon-core/src/main/java/org/photonvision/vision/pipeline/ColoredShapePipeline.java index a4645b68c..8b98b7cd0 100644 --- a/photon-core/src/main/java/org/photonvision/vision/pipeline/ColoredShapePipeline.java +++ b/photon-core/src/main/java/org/photonvision/vision/pipeline/ColoredShapePipeline.java @@ -221,8 +221,10 @@ public class ColoredShapePipeline // If we grabbed it (in color copy mode), make a new Mat of it rawInputMat = new Mat(inputMatPtr); } else { - // Otherwise, use a blank/empty mat as placeholder - rawInputMat = new Mat(); + // // Otherwise, use a blank/empty mat as placeholder + // rawInputMat = new Mat(); + // Otherwise, the input mat is frame we got from the camera + rawInputMat = frame.image.getMat(); } // We can skip a few steps if the image is single channel because we've already done them on diff --git a/photon-core/src/main/java/org/photonvision/vision/pipeline/ReflectivePipeline.java b/photon-core/src/main/java/org/photonvision/vision/pipeline/ReflectivePipeline.java index f44cb69a9..5800c5a42 100644 --- a/photon-core/src/main/java/org/photonvision/vision/pipeline/ReflectivePipeline.java +++ b/photon-core/src/main/java/org/photonvision/vision/pipeline/ReflectivePipeline.java @@ -164,8 +164,10 @@ public class ReflectivePipeline extends CVPipeline