Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-24 01:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore original video mode index order (#1999)

Browse Source
This commit is contained in:
Gold856
2025-07-13 09:23:35 -04:00
committed by GitHub
parent 6610b21b6e
commit 2e97c95be1
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
photon-core/src/main/java/org/photonvision/vision/camera/USBCameras/GenericUSBCameraSettables.java
View File

@@ -25,9 +25,11 @@ import edu.wpi.first.math.MathUtil;
import edu.wpi.first.util.PixelFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import org.photonvision.common.configuration.CameraConfiguration;
import org.photonvision.vision.camera.CameraQuirk;
import org.photonvision.vision.processes.VisionSourceSettables;
@@ -287,11 +289,14 @@ public class GenericUSBCameraSettables extends VisionSourceSettables {
var sortedList =
videoModesList.stream()
.distinct() // remove redundant video mode entries
.sorted(((a, b) -> (a.width + a.height) - (b.width + b.height)))
.toList();
.sorted(((a, b) -> (b.width + b.height) - (a.width + a.height)))
.collect(Collectors.toList());
// The ordering is usually more logical when done like this. It typically puts higher FPSes
// closer to the bottom.
Collections.reverse(sortedList);
for (VideoMode videoMode : sortedList) {
videoModes.put(sortedList.indexOf(videoMode), videoMode);
for (int i = 0; i < sortedList.size(); i++) {
videoModes.put(i, sortedList.get(i));
}
// If after all that we still have no video modes, not much we can do besides