moonlight-stream/moonlight-embedded
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-embedded.git synced 2026-04-23 08:36:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:limelight-stream/limelight-pc

Browse Source 
# By Cameron Gutman
# Via Cameron Gutman
* 'master' of github.com:limelight-stream/limelight-pc:
  Add fixed Linux 64-bit libraries
  Fix loading native libraries on OS X
This commit is contained in:
Diego Waxemberg
2014-01-01 21:34:27 -05:00
parent 890b8c8095 3a9788e4a5
commit 887b2ac8f7
2 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/limelight/binding/LibraryHelper.java
View File

@@ -15,26 +15,23 @@ public class LibraryHelper {
private static boolean librariesExtracted = false; private static boolean librariesExtracted = false;
static { static {
// Windows and OS X need this, but we might as well do it for everybody needsDependencyExtraction = System.getProperty("os.name").contains("Windows");
needsDependencyExtraction = true;
libraryExtractionFolder = System.getProperty("java.io.tmpdir", "."); libraryExtractionFolder = System.getProperty("java.io.tmpdir", ".");
// FFMPEG libraries // AVC dependencies
avcDependencies.add("avutil-52");
avcDependencies.add("swresample-0");
avcDependencies.add("swscale-2");
avcDependencies.add("avcodec-55");
avcDependencies.add("avformat-55");
avcDependencies.add("avfilter-3");
// The AVC JNI library itself
avcDependencies.add("nv_avc_dec");
// Additional Windows dependencies
if (System.getProperty("os.name").contains("Windows")) { if (System.getProperty("os.name").contains("Windows")) {
avcDependencies.add("avutil-52");
avcDependencies.add("swresample-0");
avcDependencies.add("swscale-2");
avcDependencies.add("avcodec-55");
avcDependencies.add("avformat-55");
avcDependencies.add("avfilter-3");
avcDependencies.add("postproc-52"); avcDependencies.add("postproc-52");
avcDependencies.add("pthreadVC2"); avcDependencies.add("pthreadVC2");
} }
// The AVC JNI library itself
avcDependencies.add("nv_avc_dec");
} }
public static void loadNativeLibrary(String libraryName) { public static void loadNativeLibrary(String libraryName) {

13
src/com/limelight/nvstream/av/video/cpu/AvcDecoder.java
View File

@@ -4,16 +4,17 @@ import com.limelight.binding.LibraryHelper;
public class AvcDecoder { public class AvcDecoder {
static { static {
LibraryHelper.loadNativeLibrary("avutil-52"); // Windows uses runtime linking for ffmpeg libraries
if (System.getProperty("os.name").contains("Windows")) { if (System.getProperty("os.name").contains("Windows")) {
LibraryHelper.loadNativeLibrary("avutil-52");
LibraryHelper.loadNativeLibrary("postproc-52"); LibraryHelper.loadNativeLibrary("postproc-52");
LibraryHelper.loadNativeLibrary("pthreadVC2"); LibraryHelper.loadNativeLibrary("pthreadVC2");
LibraryHelper.loadNativeLibrary("swresample-0");
LibraryHelper.loadNativeLibrary("swscale-2");
LibraryHelper.loadNativeLibrary("avcodec-55");
LibraryHelper.loadNativeLibrary("avformat-55");
LibraryHelper.loadNativeLibrary("avfilter-3");
} }
LibraryHelper.loadNativeLibrary("swresample-0");
LibraryHelper.loadNativeLibrary("swscale-2");
LibraryHelper.loadNativeLibrary("avcodec-55");
LibraryHelper.loadNativeLibrary("avformat-55");
LibraryHelper.loadNativeLibrary("avfilter-3");
LibraryHelper.loadNativeLibrary("nv_avc_dec"); LibraryHelper.loadNativeLibrary("nv_avc_dec");
} }