mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #915 from mprobinson/master

Browse Source 
Avoid flicker during BFI and slow-motion or pause
This commit is contained in:
Twinaphex 2014-08-31 17:13:23 +02:00
commit 434562a6ad
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/gl.c
View File

@ -1644,8 +1644,8 @@ static bool gl_frame(void *data, const void *frame, unsigned width, unsigned hei
#endif #endif
#endif #endif
// Disable BFI during fast forward to prevent flicker // Disable BFI during fast forward, slow-motion, and pause to prevent flicker
if (g_settings.video.black_frame_insertion && !driver.nonblock_state) if (g_settings.video.black_frame_insertion && !driver.nonblock_state && !g_extern.is_slowmotion && !g_extern.is_paused)
{ {
context_swap_buffers_func(gl); context_swap_buffers_func(gl);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);

6
retroarch.c
View File

@ -2270,6 +2270,9 @@ static void check_slowmotion(void)
if (!g_extern.is_slowmotion) if (!g_extern.is_slowmotion)
return; return;
if (g_settings.video.black_frame_insertion)
rarch_render_cached_frame();
msg_queue_clear(g_extern.msg_queue); msg_queue_clear(g_extern.msg_queue);
msg_queue_push(g_extern.msg_queue, g_extern.frame_is_reverse ? msg_queue_push(g_extern.msg_queue, g_extern.frame_is_reverse ?
"Slow motion rewind." : "Slow motion.", 0, 30); "Slow motion rewind." : "Slow motion.", 0, 30);
@ -2394,6 +2397,9 @@ static void check_pause(void)
if (has_set_audio_start) if (has_set_audio_start)
rarch_main_command(RARCH_CMD_AUDIO_START); rarch_main_command(RARCH_CMD_AUDIO_START);
if (g_extern.is_paused && g_settings.video.black_frame_insertion)
rarch_render_cached_frame();
old_focus = focus; old_focus = focus;
old_state = new_state; old_state = new_state;
} }