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

Make SDL more reliable

Browse Source
This commit is contained in:
Iwan Timmer
2015-08-10 10:18:33 +02:00
parent abc9a19a9d
commit 05fc925c19
5 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/input/sdlinput.c
View File

@@ -43,8 +43,7 @@ static int keyboard_modifiers;
void sdlinput_init() {
memset(gamepads, 0, sizeof(gamepads));
//SDL_SetRelativeMouseMode(SDL_TRUE);
SDL_InitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER);
SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER);
SDL_GameControllerAddMappingsFromFile("gamecontrollerdb.txt");
for (int i = 0; i < SDL_NumJoysticks(); ++i) {

10
src/main.c
View File

@@ -84,7 +84,13 @@ static void stream(PSERVER_DATA server, PCONFIGURATION config, enum platform sys
gs_start_app(server, &config->stream, appId, config->sops, config->localaudio);
LiStartConnection(server->address, &config->stream, &connection_callbacks, platform_get_video(system), platform_get_audio(system), NULL, 0, server->serverMajorVersion);
void *context = NULL;
#ifdef HAVE_SDL
if (system == SDL)
context = sdl_window;
#endif
LiStartConnection(server->address, &config->stream, &connection_callbacks, platform_get_video(system), platform_get_audio(system), context, 0, server->serverMajorVersion);
if (IS_EMBEDDED(system))
loop_main();
@@ -207,7 +213,7 @@ int main(int argc, char* argv[]) {
}
#ifdef HAVE_SDL
else if (system == SDL)
sdlinput_init();
sdl_init(config.stream.width, config.stream.height);
#endif
stream(&server, &config, system);

21
src/sdl.c
View File

@@ -25,16 +25,29 @@
#include "limelight-common/Limelight.h"
#include <stdbool.h>
#include <SDL.h>
static bool done;
void sdl_loop() {
SDL_InitSubSystem(SDL_INIT_EVENTS);
SDL_Window *sdl_window;
void sdl_init(int width, int height) {
if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTS)) {
fprintf(stderr, "Could not initialize SDL - %s\n", SDL_GetError());
exit(1);
}
sdl_window = SDL_CreateWindow("Moonlight", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, width, height, 0);
if(!sdl_window) {
fprintf(stderr, "SDL: could not create window - exiting\n");
exit(1);
}
SDL_ShowCursor(SDL_DISABLE);
//SDL_SetRelativeMouseMode(SDL_TRUE);
sdlinput_init();
}
void sdl_loop() {
SDL_Event event;
while(!done && SDL_WaitEvent(&event)) {
if (!sdlinput_handle_event(&event))
done = true;

5
src/sdl.h
View File

@@ -19,6 +19,11 @@
#ifdef HAVE_SDL
#include <SDL.h>
SDL_Window *sdl_window;
void sdl_init(int width, int height);
void sdl_loop();
#endif /* HAVE_SDL */

41
src/video/sdl.c
View File

@@ -44,9 +44,19 @@ static void sdl_setup(int width, int height, int redrawRate, void* context, int
fprintf(stderr, "Not enough memory\n");
exit(1);
}
screen_width = width;
screen_height = height;
SDL_Window *window = (SDL_Window*) context;
renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);
if (!renderer) {
fprintf(stderr, "SDL: could not create renderer - exiting\n");
exit(1);
}
bmp = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_YV12, SDL_TEXTUREACCESS_TARGET, width, height);
if (!bmp) {
fprintf(stderr, "SDL: could not create texture - exiting\n");
exit(1);
}
}
static void sdl_cleanup() {
@@ -54,31 +64,6 @@ static void sdl_cleanup() {
}
static int sdl_submit_decode_unit(PDECODE_UNIT decodeUnit) {
if (window == NULL) {
if(SDL_Init(SDL_INIT_VIDEO)) {
fprintf(stderr, "Could not initialize SDL - %s\n", SDL_GetError());
exit(1);
}
window = SDL_CreateWindow("Moonlight", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, screen_width, screen_height, 0);
if(!window) {
fprintf(stderr, "SDL: could not create window - exiting\n");
exit(1);
}
renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_TARGETTEXTURE);
if (!renderer) {
fprintf(stderr, "SDL: could not create renderer - exiting\n");
exit(1);
}
bmp = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_YV12, SDL_TEXTUREACCESS_TARGET, screen_width, screen_height);
if (!bmp) {
fprintf(stderr, "SDL: could not create texture - exiting\n");
exit(1);
}
}
if (decodeUnit->fullLength < DECODER_BUFFER_SIZE) {
PLENTRY entry = decodeUnit->bufferList;
int length = 0;