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

Render EGL in main thread

Browse Source
This commit is contained in:
Iwan Timmer
2017-06-04 14:47:11 +02:00
parent 5cb4a8cc42
commit f79a99bc05
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/video/x11.c
View File

@@ -22,11 +22,15 @@
#include "ffmpeg.h" #include "ffmpeg.h"
#include "../input/x11.h" #include "../input/x11.h"
#include "../loop.h"
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <stdbool.h> #include <stdbool.h>
#include <unistd.h>
#include <fcntl.h>
#include <poll.h>
#define DECODER_BUFFER_SIZE 92*1024 #define DECODER_BUFFER_SIZE 92*1024
@@ -34,6 +38,17 @@ static char* ffmpeg_buffer = NULL;
static Display *display; static Display *display;
static int pipefd[2];
static int frame_handle(int pipefd) {
const unsigned char** data = NULL;
while (read(pipefd, &data, sizeof(void*)) > 0);
if (data)
egl_draw(data);
return LOOP_OK;
}
int x11_setup(int videoFormat, int width, int height, int redrawRate, void* context, int drFlags) { int x11_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)
@@ -83,6 +98,13 @@ int x11_setup(int videoFormat, int width, int height, int redrawRate, void* cont
egl_init(display, window, width, height); egl_init(display, window, width, height);
x11_input_init(display, window); x11_input_init(display, window);
if (pipe(pipefd) == -1) {
fprintf(stderr, "Can't create communication channel between threads\n");
return -2;
}
loop_add_fd(pipefd[0], &frame_handle, POLLIN);
fcntl(pipefd[0], F_SETFL, O_NONBLOCK);
return 0; return 0;
} }
@@ -102,8 +124,10 @@ int x11_submit_decode_unit(PDECODE_UNIT decodeUnit) {
} }
ffmpeg_decode(ffmpeg_buffer, length); ffmpeg_decode(ffmpeg_buffer, length);
AVFrame* frame = ffmpeg_get_frame(); AVFrame* frame = ffmpeg_get_frame();
if (frame != NULL) if (frame != NULL) {
egl_draw((const unsigned char**) frame->data); void* pointer = frame->data;
write(pipefd[1], &pointer, sizeof(void*));
}
} }
return DR_OK; return DR_OK;