RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

player/video: force vo reconfigure on color parameters change 

This workarounds the issue with vo_gpu that would freeze in certain
condition. I haven't go deep inside to understand why, so this should be
considered as a workaround.

Fixes: #13256
This commit is contained in:
Kacper Michajłow 2024-01-21 18:41:44 +01:00 committed by Dudemanguy
parent d00a00e180
commit 62a0292dc1
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
player/video.c
View File

@ -1041,17 +1041,12 @@ static void apply_video_crop(struct MPContext *mpctx, struct vo *vo)
}
}
static bool video_reconfig_needed(const struct mp_image_params *p1,
const struct mp_image_params *p2)
static bool video_reconfig_needed(struct mp_image_params a,
struct mp_image_params b)
{
return p1->imgfmt != p2->imgfmt ||
p1->hw_subfmt != p2->hw_subfmt ||
p1->w != p2->w || p1->h != p2->h ||
p1->p_w != p2->p_w || p1->p_h != p2->p_h ||
p1->force_window != p2->force_window ||
p1->rotate != p2->rotate ||
p1->stereo3d != p2->stereo3d ||
!mp_rect_equals(&p1->crop, &p2->crop);
a.color.hdr = (struct pl_hdr_metadata){0};
b.color.hdr = (struct pl_hdr_metadata){0};
return !mp_image_params_equal(&a, &b);
}
void write_video(struct MPContext *mpctx)
@ -1176,7 +1171,7 @@ void write_video(struct MPContext *mpctx)
// Filter output is different from VO input?
struct mp_image_params *p = &mpctx->next_frames[0]->params;
if (!vo->params || video_reconfig_needed(p, vo->params)) {
if (!vo->params || video_reconfig_needed(*p, *vo->params)) {
// Changing config deletes the current frame; wait until it's finished.
if (vo_still_displaying(vo))
return;