moonlight-stream/moonlight-embedded
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-embedded.git synced 2025-07-02 07:45:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

lazy load libamcodec, only require libamcodec.so

Browse Source
This commit is contained in:
TheChoconut 2022-11-18 00:44:57 +01:00 committed by Cameron Gutman
parent e7c611bb1e
commit 5c23f0494d
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmake/FindAmlogic.cmake
View File

@ -4,18 +4,6 @@ find_path(AMLOGIC_INCLUDE_DIR
PATHS /usr/local/include/amcodec /usr/osmc/include/amcodec /usr/include/amcodec /usr/include/) PATHS /usr/local/include/amcodec /usr/osmc/include/amcodec /usr/include/amcodec /usr/include/)
mark_as_advanced(AMLOGIC_INCLUDE_DIR) mark_as_advanced(AMLOGIC_INCLUDE_DIR)
find_library(AMAVUTILS_LIBRARY
NAMES libamavutils.so
DOC "Path to Amlogic Audio Video Utils Library"
PATHS /usr/lib/aml_libs /usr/osmc/lib /usr/local/lib /usr/lib)
mark_as_advanced(AMAVUTILS_LIBRARY)
find_library(AMADEC_LIBRARY
NAMES libamadec.so
DOC "Path to Amlogic Audio Decoder Library"
PATHS /usr/lib/aml_libs /usr/osmc/lib /usr/local/lib /usr/lib)
mark_as_advanced(AMADEC_LIBRARY)
find_library(AMCODEC_LIBRARY find_library(AMCODEC_LIBRARY
NAMES libamcodec.so NAMES libamcodec.so
DOC "Path to Amlogic Video Codec Library" DOC "Path to Amlogic Video Codec Library"
@ -23,7 +11,7 @@ find_library(AMCODEC_LIBRARY
mark_as_advanced(AMCODEC_LIBRARY) mark_as_advanced(AMCODEC_LIBRARY)
include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Amlogic DEFAULT_MSG AMLOGIC_INCLUDE_DIR AMCODEC_LIBRARY AMADEC_LIBRARY AMAVUTILS_LIBRARY) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Amlogic DEFAULT_MSG AMLOGIC_INCLUDE_DIR AMCODEC_LIBRARY)
set(AMLOGIC_LIBRARIES ${AMCODEC_LIBRARY} ${AMADEC_LIBRARY} ${AMAVUTILS_LIBRARY}) set(AMLOGIC_LIBRARIES ${AMCODEC_LIBRARY})
set(AMLOGIC_INCLUDE_DIRS ${AMLOGIC_INCLUDE_DIR}) set(AMLOGIC_INCLUDE_DIRS ${AMLOGIC_INCLUDE_DIR})

2
src/platform.c
View File

@ -61,7 +61,7 @@ enum platform platform_check(char* name) {
#endif #endif
#ifdef HAVE_AML #ifdef HAVE_AML
if (std || strcmp(name, "aml") == 0) { if (std || strcmp(name, "aml") == 0) {
void *handle = dlopen("libmoonlight-aml.so", RTLD_NOW | RTLD_GLOBAL); void *handle = dlopen("libmoonlight-aml.so", RTLD_LAZY | RTLD_GLOBAL);
if (handle != NULL && access("/dev/amvideo", F_OK) != -1) if (handle != NULL && access("/dev/amvideo", F_OK) != -1)
return AML; return AML;
} }