moonlight-stream/moonlight-embedded
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-embedded.git synced 2026-06-17 06:11:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Present decoded frame in main thread for VAAPI and VDPAU

Browse Source
This commit is contained in:
Iwan Timmer
2017-06-19 19:38:56 +02:00
parent f96a644917
commit 04200f24c7
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/video/x11.c
+20 -19
View File
@@ -55,8 +55,14 @@ static int display_height;
static int frame_handle(int pipefd) { static int frame_handle(int pipefd) {
AVFrame* frame = NULL; AVFrame* frame = NULL;
while (read(pipefd, &frame, sizeof(void*)) > 0); while (read(pipefd, &frame, sizeof(void*)) > 0);
if (frame) if (frame) {
egl_draw(frame->data); if (ffmpeg_decoder == SOFTWARE)
egl_draw(frame->data);
else if (ffmpeg_decoder == VAAPI)
vaapi_queue(frame, window, display_width, display_height);
else if (ffmpeg_decoder == VDPAU)
vdpau_queue(frame);
}
return LOOP_OK; return LOOP_OK;
} }
@@ -135,20 +141,21 @@ int x11_setup(int videoFormat, int width, int height, int redrawRate, void* cont
return -1; return -1;
} }
if (ffmpeg_decoder == SOFTWARE) { if (ffmpeg_decoder == SOFTWARE)
egl_init(display, window, width, height); egl_init(display, window, width, height);
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);
}
#ifdef HAVE_VDPAU #ifdef HAVE_VDPAU
else if (ffmpeg_decoder == VDPAU) if (ffmpeg_decoder == VDPAU)
vdpau_init_presentation(window, width, height, display_width, display_height); vdpau_init_presentation(window, width, height, display_width, display_height);
#endif #endif
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);
x11_input_init(display, window); x11_input_init(display, window);
return 0; return 0;
@@ -178,14 +185,8 @@ int x11_submit_decode_unit(PDECODE_UNIT decodeUnit) {
} }
ffmpeg_decode(ffmpeg_buffer, length); ffmpeg_decode(ffmpeg_buffer, length);
AVFrame* frame = ffmpeg_get_frame(true); AVFrame* frame = ffmpeg_get_frame(true);
if (frame != NULL) { if (frame != NULL)
if (ffmpeg_decoder == SOFTWARE) write(pipefd[1], &frame, sizeof(void*));
write(pipefd[1], &frame, sizeof(void*));
else if (ffmpeg_decoder == VDPAU)
vdpau_queue(frame);
else if (ffmpeg_decoder == VAAPI)
vaapi_queue(frame, window, display_width, display_height);
}
} }
return DR_OK; return DR_OK;