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

Rename OMX module to Pi because of naming conflict

Browse Source
This commit is contained in:
Iwan Timmer
2015-08-13 11:23:57 +02:00
parent e6c4495ed5
commit d0da5ea29e
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -17,7 +17,7 @@ find_package(ALSA REQUIRED)
find_package(Opus REQUIRED) find_package(Opus REQUIRED)
find_package(Broadcom) find_package(Broadcom)
find_package(Freescale) find_package(Freescale)
find_package(CEC) find_package(CEC 3.0)
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(EVDEV REQUIRED libevdev) pkg_check_modules(EVDEV REQUIRED libevdev)
@@ -27,7 +27,7 @@ pkg_check_modules(AVCODEC libavcodec)
pkg_check_modules(AVUTIL libavutil) pkg_check_modules(AVUTIL libavutil)
pkg_check_modules(SWSCALE libswscale) pkg_check_modules(SWSCALE libswscale)
if(CEC_FOUND) if(CEC_FOUND AND CEC_VERSION_COMPATIBLE)
list(APPEND MOONLIGHT_DEFINITIONS HAVE_LIBCEC) list(APPEND MOONLIGHT_DEFINITIONS HAVE_LIBCEC)
endif() endif()
@@ -40,8 +40,8 @@ endif()
if(BROADCOM_FOUND) if(BROADCOM_FOUND)
aux_source_directory(./third_party/ilclient SRC_LIST) aux_source_directory(./third_party/ilclient SRC_LIST)
list(APPEND SRC_LIST ./src/video/omx.c) list(APPEND SRC_LIST ./src/video/pi.c)
list(APPEND MOONLIGHT_DEFINITIONS HAVE_OMX) list(APPEND MOONLIGHT_DEFINITIONS HAVE_PI)
endif() endif()
if(FREESCALE_FOUND) if(FREESCALE_FOUND)
@@ -66,7 +66,7 @@ add_executable(moonlight ${SRC_LIST})
target_link_libraries(moonlight PUBLIC gamestream) target_link_libraries(moonlight PUBLIC gamestream)
set_property(TARGET moonlight PROPERTY C_STANDARD 11) set_property(TARGET moonlight PROPERTY C_STANDARD 11)
if (CEC_FOUND) if (CEC_FOUND AND CEC_VERSION_COMPATIBLE)
list(APPEND MOONLIGHT_DEFINITIONS HAVE_LIBCEC) list(APPEND MOONLIGHT_DEFINITIONS HAVE_LIBCEC)
target_include_directories(moonlight PRIVATE ./third_party/libcec ${CEC_INCLUDE_DIRS}/libcec) target_include_directories(moonlight PRIVATE ./third_party/libcec ${CEC_INCLUDE_DIRS}/libcec)
target_link_libraries (moonlight PUBLIC ${CEC_LIBRARIES}) target_link_libraries (moonlight PUBLIC ${CEC_LIBRARIES})

12
src/platform.c
View File

@@ -40,10 +40,10 @@ enum platform platform_check(char* name) {
return IMX; return IMX;
} }
#endif #endif
#ifdef HAVE_OMX #ifdef HAVE_PI
if (std || strcmp(name, "omx") == 0) { if (std || strcmp(name, "pi") == 0) {
if (dlsym(RTLD_DEFAULT, "bcm_host_init") != NULL) if (dlsym(RTLD_DEFAULT, "bcm_host_init") != NULL)
return OMX; return PI;
} }
#endif #endif
#ifdef HAVE_FAKE #ifdef HAVE_FAKE
@@ -63,9 +63,9 @@ DECODER_RENDERER_CALLBACKS* platform_get_video(enum platform system) {
case IMX: case IMX:
return &decoder_callbacks_imx; return &decoder_callbacks_imx;
#endif #endif
#ifdef HAVE_OMX #ifdef HAVE_PI
case OMX: case PI:
return &decoder_callbacks_omx; return &decoder_callbacks_pi;
#endif #endif
#ifdef HAVE_FAKE #ifdef HAVE_FAKE
case FAKE: case FAKE:

2
src/platform.h
View File

@@ -25,7 +25,7 @@
#define IS_EMBEDDED(SYSTEM) SYSTEM != SDL #define IS_EMBEDDED(SYSTEM) SYSTEM != SDL
enum platform { NONE, SDL, OMX, IMX, FAKE }; enum platform { NONE, SDL, PI, IMX, FAKE };
enum platform platform_check(char*); enum platform platform_check(char*);
PDECODER_RENDERER_CALLBACKS platform_get_video(enum platform system); PDECODER_RENDERER_CALLBACKS platform_get_video(enum platform system);

4
src/video.h
View File

@@ -23,8 +23,8 @@ extern DECODER_RENDERER_CALLBACKS decoder_callbacks_fake;
#ifdef HAVE_SDL #ifdef HAVE_SDL
extern DECODER_RENDERER_CALLBACKS decoder_callbacks_sdl; extern DECODER_RENDERER_CALLBACKS decoder_callbacks_sdl;
#endif #endif
#ifdef HAVE_OMX #ifdef HAVE_PI
extern DECODER_RENDERER_CALLBACKS decoder_callbacks_omx; extern DECODER_RENDERER_CALLBACKS decoder_callbacks_pi;
#endif #endif
#ifdef HAVE_IMX #ifdef HAVE_IMX
extern DECODER_RENDERER_CALLBACKS decoder_callbacks_imx; extern DECODER_RENDERER_CALLBACKS decoder_callbacks_imx;

4
src/video/omx.c → src/video/pi.c
View File

@@ -207,9 +207,9 @@ static int decoder_renderer_submit_decode_unit(PDECODE_UNIT decodeUnit) {
return DR_OK; return DR_OK;
} }
DECODER_RENDERER_CALLBACKS decoder_callbacks_omx = { DECODER_RENDERER_CALLBACKS decoder_callbacks_pi = {
.setup = decoder_renderer_setup, .setup = decoder_renderer_setup,
.cleanup = decoder_renderer_cleanup, .cleanup = decoder_renderer_cleanup,
.submitDecodeUnit = decoder_renderer_submit_decode_unit, .submitDecodeUnit = decoder_renderer_submit_decode_unit,
.capabilities = CAPABILITY_NEEDS_SPS_CLEANUP | CAPABILITY_NEEDS_SPS_BITSTREAM_FIXUP, .capabilities = GS_SPS_BITSTREAM_FIXUP,
}; };