RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-26 10:14:33 +00:00
Code Issues Releases Wiki Activity

vo_gpu_next: correctly set params.frame_mixer

Browse Source 
This was incorrectly adapted from the old options system, we forgot to
ever actually assign p->frame_mixer to params.frame_mixer.

Fixes: d2082841df
This commit is contained in:
Niklas Haas 2023-08-27 13:58:50 +02:00 committed by Niklas Haas
parent 23e9b57791
commit 6fb9d92b25
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
video/out/vo_gpu_next.c
View File

@ -143,7 +143,6 @@ struct priv {
struct mp_csp_equalizer_state *video_eq; struct mp_csp_equalizer_state *video_eq;
struct scaler_params scalers[SCALER_COUNT]; struct scaler_params scalers[SCALER_COUNT];
const struct pl_hook **hooks; // storage for `params.hooks` const struct pl_hook **hooks; // storage for `params.hooks`
const struct pl_filter_config *frame_mixer;
enum mp_csp_levels output_levels; enum mp_csp_levels output_levels;
char **raw_opts; char **raw_opts;
@ -1952,11 +1951,11 @@ static void update_render_options(struct vo *vo)
pars->params.upscaler = map_scaler(p, SCALER_SCALE); pars->params.upscaler = map_scaler(p, SCALER_SCALE);
pars->params.downscaler = map_scaler(p, SCALER_DSCALE); pars->params.downscaler = map_scaler(p, SCALER_DSCALE);
pars->params.plane_upscaler = map_scaler(p, SCALER_CSCALE); pars->params.plane_upscaler = map_scaler(p, SCALER_CSCALE);
p->frame_mixer = opts->interpolation ? map_scaler(p, SCALER_TSCALE) : NULL; pars->params.frame_mixer = opts->interpolation ? map_scaler(p, SCALER_TSCALE) : NULL;
// Request as many frames as required from the decoder // Request as many frames as required from the decoder
if (p->frame_mixer) { if (pars->params.frame_mixer) {
vo_set_queue_params(vo, 0, 2 + ceilf(p->frame_mixer->kernel->radius)); vo_set_queue_params(vo, 0, 2 + ceilf(pars->params.frame_mixer->kernel->radius));
} else { } else {
vo_set_queue_params(vo, 0, 2); vo_set_queue_params(vo, 0, 2);
} }