Yessiest
/
libretro-mpv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libmpv: use Render API 

opengl-cb is now deprecated.

Tested working on Linux.

Signed-off-by: Mahyar Koshkouei <mahyar.koshkouei@gmail.com>
This commit is contained in:
Mahyar Koshkouei 2018-05-23 17:39:42 +01:00
parent 1b5c47840a
commit c26772d201
No known key found for this signature in database
GPG Key ID: B790CA66809F18D6
1 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
mpv-libretro.c
View File

@ -31,7 +31,7 @@
#endif #endif
#include <mpv/client.h> #include <mpv/client.h>
#include <mpv/opengl_cb.h> #include <mpv/render_gl.h>
#include <libretro.h> #include <libretro.h>
@ -50,7 +50,7 @@ static retro_input_poll_t input_poll_cb;
static retro_input_state_t input_state_cb; static retro_input_state_t input_state_cb;
static mpv_handle *mpv; static mpv_handle *mpv;
static mpv_opengl_cb_context *mpv_gl; static mpv_render_context *mpv_gl;
/* Save the current playback time for context changes */ /* Save the current playback time for context changes */
static int64_t playback_time = 0; static int64_t playback_time = 0;
@ -60,7 +60,7 @@ static char *filepath = NULL;
static volatile int frame_queue = 0; static volatile int frame_queue = 0;
void queue_new_frame(void *cb_ctx) void on_mpv_redraw(void *cb_ctx)
{ {
frame_queue++; frame_queue++;
} }
@ -271,35 +271,22 @@ static void context_reset(void)
mpv_error_string(ret)); mpv_error_string(ret));
} }
/* The OpenGL API is somewhat separate from the normal mpv API. This only mpv_render_param params[] = {
* returns NULL if no OpenGL support is compiled. {MPV_RENDER_PARAM_API_TYPE, MPV_RENDER_API_TYPE_OPENGL},
*/ {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &(mpv_opengl_init_params){
mpv_gl = mpv_get_sub_api(mpv, MPV_SUB_API_OPENGL_CB); .get_proc_address = get_proc_address_mpv,
}},
{0}
};
if(mpv_gl == NULL) if((ret = mpv_render_context_create(&mpv_gl, mpv, params)) < 0)
{
log_cb(RETRO_LOG_ERROR, "failed to create mpv GL API handle\n");
goto err;
}
if((ret = mpv_opengl_cb_init_gl(mpv_gl, NULL, get_proc_address_mpv, NULL)) < 0)
{ {
log_cb(RETRO_LOG_ERROR, "failed to initialize mpv GL context: %s\n", log_cb(RETRO_LOG_ERROR, "failed to initialize mpv GL context: %s\n",
mpv_error_string(ret)); mpv_error_string(ret));
goto err; goto err;
} }
/* Actually using the opengl_cb state has to be explicitly requested. mpv_render_context_set_update_callback(mpv_gl, on_mpv_redraw, NULL);
* Otherwise, mpv will create a separate platform window.
*/
if((ret = mpv_set_option_string(mpv, "vo", "opengl-cb")) < 0)
{
log_cb(RETRO_LOG_ERROR, "failed to set video output to OpenGL: %s\n",
mpv_error_string(ret));
goto err;
}
mpv_opengl_cb_set_update_callback(mpv_gl, queue_new_frame, NULL);
//mpv_set_option_string(mpv, "ao", "audio-cb"); //mpv_set_option_string(mpv, "ao", "audio-cb");
@ -360,7 +347,7 @@ err:
static void context_destroy(void) static void context_destroy(void)
{ {
mpv_get_property(mpv, "playback-time", MPV_FORMAT_INT64, &playback_time); mpv_get_property(mpv, "playback-time", MPV_FORMAT_INT64, &playback_time);
mpv_opengl_cb_uninit_gl(mpv_gl); mpv_render_context_free(mpv_gl);
mpv_terminate_destroy(mpv); mpv_terminate_destroy(mpv);
log_cb(RETRO_LOG_INFO, "Context destroyed.\n"); log_cb(RETRO_LOG_INFO, "Context destroyed.\n");
} }
@ -558,7 +545,15 @@ void retro_run(void)
#if 1 #if 1
if(frame_queue > 0) if(frame_queue > 0)
{ {
mpv_opengl_cb_draw(mpv_gl, hw_render.get_current_framebuffer(), width, height); mpv_render_param params[] = {
{MPV_RENDER_PARAM_OPENGL_FBO, &(mpv_opengl_fbo){
.fbo = hw_render.get_current_framebuffer(),
.w = width,
.h = height,
}},
{0}
};
mpv_render_context_render(mpv_gl, params);
video_cb(RETRO_HW_FRAME_BUFFER_VALID, width, height, 0); video_cb(RETRO_HW_FRAME_BUFFER_VALID, width, height, 0);
frame_queue--; frame_queue--;
} }