Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-07-01 02:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert part of #288 (#306)

Browse Source 
Fixes picam streaming/hangs
This commit is contained in:
Matt
2021-10-30 12:27:41 -04:00
committed by GitHub
parent 7e74da5cff
commit a731c7a8db
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
photon-core/src/main/java/org/photonvision/vision/pipeline/ColoredShapePipeline.java
View File

@@ -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

6
photon-core/src/main/java/org/photonvision/vision/pipeline/ReflectivePipeline.java
View File

@@ -164,8 +164,10 @@ public class ReflectivePipeline extends CVPipeline<CVPipelineResult, ReflectiveP
// 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, the input mat is frame we got from the camera
rawInputMat = frame.image.getMat();
// // Otherwise, use a blank/empty mat as placeholder
// rawInputMat = new Mat();
}
// We can skip a few steps if the image is single channel because we've already done them on