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

Update moonlight-common-c for GFE 2.11

Browse Source
This commit is contained in:
Iwan Timmer 2016-03-08 14:51:08 +01:00
parent 46c8c89baf
commit 3943ba8cd8
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libgamestream/CMakeLists.txt
View File

@ -5,6 +5,7 @@ find_package(OpenSSL REQUIRED)
find_package(EXPAT REQUIRED) find_package(EXPAT REQUIRED)
pkg_check_modules(AVAHI REQUIRED avahi-client) pkg_check_modules(AVAHI REQUIRED avahi-client)
pkg_check_modules(ENET REQUIRED libenet)
aux_source_directory(./ GAMESTREAM_SRC_LIST) aux_source_directory(./ GAMESTREAM_SRC_LIST)
aux_source_directory(../third_party/h264bitstream GAMESTREAM_SRC_LIST) aux_source_directory(../third_party/h264bitstream GAMESTREAM_SRC_LIST)
@ -21,8 +22,8 @@ target_link_libraries(gamestream moonlight-common)
set_target_properties(gamestream PROPERTIES SOVERSION 0 VERSION ${MOONLIGHT_VERSION}) set_target_properties(gamestream PROPERTIES SOVERSION 0 VERSION ${MOONLIGHT_VERSION})
set_target_properties(moonlight-common PROPERTIES SOVERSION 0 VERSION ${MOONLIGHT_VERSION}) set_target_properties(moonlight-common PROPERTIES SOVERSION 0 VERSION ${MOONLIGHT_VERSION})
target_include_directories(gamestream PRIVATE ../third_party/moonlight-common-c ../third_party/h264bitstream ${AVAHI_INCLUDE_DIRS} ${LIBUUID_INCLUDE_DIRS}) target_include_directories(gamestream PRIVATE ../third_party/moonlight-common-c ../third_party/h264bitstream ${AVAHI_INCLUDE_DIRS} ${LIBUUID_INCLUDE_DIRS} ${ENET_INCLUDE_DIRS})
target_link_libraries(gamestream ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES} ${EXPAT_LIBRARIES} ${AVAHI_LIBRARIES} ${LIBUUID_LIBRARIES}) target_link_libraries(gamestream ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES} ${EXPAT_LIBRARIES} ${AVAHI_LIBRARIES} ${LIBUUID_LIBRARIES} ${ENET_LIBRARIES})
target_link_libraries(gamestream ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS}) target_link_libraries(gamestream ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})

2
src/video/fake.c
View File

@ -24,7 +24,7 @@
static FILE* fd; static FILE* fd;
static const char* fileName = "fake.h264"; static const char* fileName = "fake.h264";
void decoder_renderer_setup(int width, int height, int redrawRate, void* context, int drFlags) { void decoder_renderer_setup(int videoFormat, int width, int height, int redrawRate, void* context, int drFlags) {
fd = fopen(fileName, "w"); fd = fopen(fileName, "w");
} }

2
src/video/imx.c
View File

@ -83,7 +83,7 @@ bool video_imx_init() {
return vpu_Init(NULL) == RETCODE_SUCCESS; return vpu_Init(NULL) == RETCODE_SUCCESS;
} }
static void decoder_renderer_setup(int width, int height, int redrawRate, void* context, int drFlags) { static void decoder_renderer_setup(int videoFormat, int width, int height, int redrawRate, void* context, int drFlags) {
struct mxcfb_gbl_alpha alpha; struct mxcfb_gbl_alpha alpha;
dbuf.type = V4L2_BUF_TYPE_VIDEO_OUTPUT; dbuf.type = V4L2_BUF_TYPE_VIDEO_OUTPUT;

2
src/video/pi.c
View File

@ -53,7 +53,7 @@ static unsigned char *dest;
static int port_settings_changed; static int port_settings_changed;
static int first_packet; static int first_packet;
static void decoder_renderer_setup(int width, int height, int redrawRate, void* context, int drFlags) { static void decoder_renderer_setup(int videoFormat, int width, int height, int redrawRate, void* context, int drFlags) {
bcm_host_init(); bcm_host_init();
gs_sps_init(width, height); gs_sps_init(width, height);

2
src/video/sdl.c
View File

@ -32,7 +32,7 @@
static char* ffmpeg_buffer; static char* ffmpeg_buffer;
static void sdl_setup(int width, int height, int redrawRate, void* context, int drFlags) { static void sdl_setup(int videoFormat, int width, int height, int redrawRate, void* context, int drFlags) {
int avc_flags = SLICE_THREADING; int avc_flags = SLICE_THREADING;
if (drFlags && FORCE_HARDWARE_ACCELERATION) if (drFlags && FORCE_HARDWARE_ACCELERATION)
avc_flags |= HARDWARE_ACCELERATION; avc_flags |= HARDWARE_ACCELERATION;

2
third_party/moonlight-common-c vendored

@ -1 +1 @@
Subproject commit fbd58c60ea12d8760bae86b7d98b2d0208418baf Subproject commit 4a6b489f51a76c5106960e4069f54d2183b123cb