mirror of
https://github.com/PhotonVision/photonvision
synced 2026-07-06 03:31:41 +00:00
This reverts commit 013ff5e, which caused crashes with libcamera cameras.
More testing required to root-cause and fix this PR, but rolling back for testing for now.
This commit is contained in:
@@ -1,33 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) Photon Vision.
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package org.photonvision.common.util.vision;
|
|
||||||
|
|
||||||
import edu.wpi.first.cscore.VideoMode;
|
|
||||||
|
|
||||||
public class OpenCvUtils {
|
|
||||||
private OpenCvUtils() {}
|
|
||||||
|
|
||||||
public static boolean videoModeEquals(VideoMode a, VideoMode b) {
|
|
||||||
// WPILib doesn't provide an equals(), so implement our own here
|
|
||||||
if (a.pixelFormat != b.pixelFormat) return false;
|
|
||||||
if (a.width != b.width) return false;
|
|
||||||
if (a.height != b.height) return false;
|
|
||||||
if (a.fps != b.fps) return false;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -261,7 +261,7 @@ public class PipelineManager {
|
|||||||
/**
|
/**
|
||||||
* Sorts the pipeline list by index, and reassigns their indexes to match the new order. <br>
|
* Sorts the pipeline list by index, and reassigns their indexes to match the new order. <br>
|
||||||
* <br>
|
* <br>
|
||||||
* I don't like this but I have no other ideas, and it works so ¯\_(ツ)_/¯
|
* I don't like this but I have no other ideas, and it works so
|
||||||
*/
|
*/
|
||||||
private void reassignIndexes() {
|
private void reassignIndexes() {
|
||||||
userPipelineSettings.sort(PipelineSettingsIndexComparator);
|
userPipelineSettings.sort(PipelineSettingsIndexComparator);
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ import java.util.HashMap;
|
|||||||
import org.photonvision.common.configuration.CameraConfiguration;
|
import org.photonvision.common.configuration.CameraConfiguration;
|
||||||
import org.photonvision.common.logging.LogGroup;
|
import org.photonvision.common.logging.LogGroup;
|
||||||
import org.photonvision.common.logging.Logger;
|
import org.photonvision.common.logging.Logger;
|
||||||
import org.photonvision.common.util.vision.OpenCvUtils;
|
|
||||||
import org.photonvision.vision.calibration.CameraCalibrationCoefficients;
|
import org.photonvision.vision.calibration.CameraCalibrationCoefficients;
|
||||||
import org.photonvision.vision.frame.FrameStaticProperties;
|
import org.photonvision.vision.frame.FrameStaticProperties;
|
||||||
|
|
||||||
@@ -64,11 +63,6 @@ public abstract class VisionSourceSettables {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void setVideoMode(VideoMode mode) {
|
public void setVideoMode(VideoMode mode) {
|
||||||
if (OpenCvUtils.videoModeEquals(mode, getCurrentVideoMode())) {
|
|
||||||
logger.info("Requested video mode is already the current video mode");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.info(
|
logger.info(
|
||||||
"Setting video mode to "
|
"Setting video mode to "
|
||||||
+ "FPS: "
|
+ "FPS: "
|
||||||
|
|||||||
@@ -25,6 +25,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
#include <functional>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|||||||
Reference in New Issue
Block a user