RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-28 18:53:02 +00:00
Code Issues Releases Wiki Activity

screenshot: fix segfault when taking a screenshot without video

Browse Source 
Also a style change to exit early when nothing can be done anymore.
This commit is contained in:
Christoph Heinrich 2023-03-04 21:26:37 +01:00 committed by Dudemanguy
parent 31160ff941
commit 855b619cc9
1 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
player/screenshot.c
View File

@ -337,39 +337,43 @@ static struct mp_image *screenshot_get(struct MPContext *mpctx, int mode,
mode = 0; mode = 0;
bool need_add_subs = mode == MODE_SUBTITLES; bool need_add_subs = mode == MODE_SUBTITLES;
if (mpctx->video_out && mpctx->video_out->config_ok) { if (!mpctx->video_out || !mpctx->video_out->config_ok)
vo_wait_frame(mpctx->video_out); // important for each-frame mode return NULL;
struct voctrl_screenshot ctrl = { vo_wait_frame(mpctx->video_out); // important for each-frame mode
.scaled = mode == MODE_FULL_WINDOW,
.subs = mode != 0,
.osd = mode == MODE_FULL_WINDOW,
.high_bit_depth = high_depth && imgopts->high_bit_depth,
.native_csp = image_writer_flexible_csp(imgopts),
};
if (!mpctx->opts->screenshot_sw)
vo_control(mpctx->video_out, VOCTRL_SCREENSHOT, &ctrl);
image = ctrl.res;
if (image)
need_add_subs = false;
if (!image && mode != MODE_FULL_WINDOW) struct voctrl_screenshot ctrl = {
image = vo_get_current_frame(mpctx->video_out); .scaled = mode == MODE_FULL_WINDOW,
if (!image) { .subs = mode != 0,
vo_control(mpctx->video_out, VOCTRL_SCREENSHOT_WIN, &image); .osd = mode == MODE_FULL_WINDOW,
mode = MODE_FULL_WINDOW; .high_bit_depth = high_depth && imgopts->high_bit_depth,
} .native_csp = image_writer_flexible_csp(imgopts),
};
if (!mpctx->opts->screenshot_sw)
vo_control(mpctx->video_out, VOCTRL_SCREENSHOT, &ctrl);
image = ctrl.res;
if (image)
need_add_subs = false;
if (!image && mode != MODE_FULL_WINDOW)
image = vo_get_current_frame(mpctx->video_out);
if (!image) {
vo_control(mpctx->video_out, VOCTRL_SCREENSHOT_WIN, &image);
mode = MODE_FULL_WINDOW;
} }
if (!image)
return NULL;
if (image && (image->fmt.flags & MP_IMGFLAG_HWACCEL)) { if (image->fmt.flags & MP_IMGFLAG_HWACCEL) {
struct mp_image *nimage = mp_image_hw_download(image, NULL); struct mp_image *nimage = mp_image_hw_download(image, NULL);
talloc_free(image); talloc_free(image);
if (!nimage)
return NULL;
image = nimage; image = nimage;
} }
if (image && need_add_subs) if (need_add_subs)
add_subs(mpctx, image); add_subs(mpctx, image);
mp_image_params_guess_csp(&image->params); mp_image_params_guess_csp(&image->params);
return image; return image;
} }