-
Notifications
You must be signed in to change notification settings - Fork 196
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
9 changed files
with
86 additions
and
215 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
210 changes: 0 additions & 210 deletions
210
photon-core/src/main/java/org/photonvision/raspi/LibCameraJNI.java
This file was deleted.
Oops, something went wrong.
75 changes: 75 additions & 0 deletions
75
photon-core/src/main/java/org/photonvision/raspi/LibCameraJNILoader.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| /* | ||
| * 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.raspi; | ||
|
|
||
| import java.io.File; | ||
| import java.io.FileOutputStream; | ||
| import java.io.IOException; | ||
| import org.photonvision.common.logging.LogGroup; | ||
| import org.photonvision.common.logging.Logger; | ||
|
|
||
| public class LibCameraJNILoader { | ||
| private static boolean libraryLoaded = false; | ||
| private static final Logger logger = new Logger(LibCameraJNILoader.class, LogGroup.Camera); | ||
|
|
||
| public static synchronized void forceLoad() throws IOException { | ||
| if (libraryLoaded) return; | ||
|
|
||
| var libraryName = "photonlibcamera"; | ||
|
|
||
| try { | ||
| // We always extract the shared object (we could hash each so, but that's a lot of work) | ||
| var arch_name = "linuxarm64"; | ||
| var nativeLibName = System.mapLibraryName(libraryName); | ||
| var resourcePath = "/nativelibraries/" + arch_name + "/" + nativeLibName; | ||
| var in = LibCameraJNILoader.class.getResourceAsStream(resourcePath); | ||
|
|
||
| if (in == null) { | ||
| logger.error("Failed to find internal native library at path " + resourcePath); | ||
| libraryLoaded = false; | ||
| return; | ||
| } | ||
|
|
||
| // It's important that we don't mangle the names of these files on Windows at least | ||
| File temp = new File(System.getProperty("java.io.tmpdir"), nativeLibName); | ||
| FileOutputStream fos = new FileOutputStream(temp); | ||
|
|
||
| int read = -1; | ||
| byte[] buffer = new byte[1024]; | ||
| while ((read = in.read(buffer)) != -1) { | ||
| fos.write(buffer, 0, read); | ||
| } | ||
| fos.close(); | ||
| in.close(); | ||
|
|
||
| System.load(temp.getAbsolutePath()); | ||
|
|
||
| logger.info("Successfully loaded shared object " + temp.getName()); | ||
|
|
||
| } catch (UnsatisfiedLinkError e) { | ||
| logger.error("Couldn't load shared object " + libraryName, e); | ||
| e.printStackTrace(); | ||
| // logger.error(System.getProperty("java.library.path")); | ||
| } | ||
| libraryLoaded = true; | ||
| } | ||
|
|
||
| public static boolean isSupported() { | ||
| return libraryLoaded && LibCameraJNI.isSupported(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file removed
BIN
-163 KB
photon-server/src/main/resources/nativelibraries/libphotonlibcamera.so
Binary file not shown.
Binary file not shown.