GithubStar/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2026-10-26 04:59:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

vo_gpu_next: don't nuke main options state in video_screenshot

Browse Source 
This actually fixes a bug that was present in this code even before the
new pl_options system, which is that `video_screenshot` would
permanently leave `peak_detect_params.allow_delayed` as false, until
something else forced options re-application due to options cache
change.
This commit is contained in:
Niklas Haas
2023-08-27 14:39:45 +02:00
committed by Niklas Haas
parent 87aa65285b
commit 23e9b57791
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
video/out/vo_gpu_next.c
+13 -6
View File
@@ -1185,11 +1185,18 @@ static void video_screenshot(struct vo *vo, struct voctrl_screenshot *args)
args->res = NULL;
update_options(vo);
pars->params.info_callback = NULL;
pars->params.skip_caching_single_frame = true;
pars->params.preserve_mixing_cache = false;
pars->params.frame_mixer = NULL;
pars->peak_detect_params.allow_delayed = false;
struct pl_render_params params = pars->params;
params.info_callback = NULL;
params.skip_caching_single_frame = true;
params.preserve_mixing_cache = false;
params.frame_mixer = NULL;
struct pl_peak_detect_params peak_params;
if (params.peak_detect_params) {
peak_params = *params.peak_detect_params;
params.peak_detect_params = &peak_params;
peak_params.allow_delayed = false;
}
// Retrieve the current frame from the frame queue
struct pl_frame_mix mix;
@@ -1290,7 +1297,7 @@ static void video_screenshot(struct vo *vo, struct voctrl_screenshot *args)
&p->osd_state, &target);
image.num_overlays = 0; // Disable on-screen overlays
if (!pl_render_image(p->rr, &image, &target, &pars->params)) {
if (!pl_render_image(p->rr, &image, &target, &params)) {
MP_ERR(vo, "Failed rendering frame!\n");
goto done;
}