diff options
author | wm4 <wm4@nowhere> | 2018-02-07 20:18:36 +0100 |
---|---|---|
committer | Kevin Mitchell <kevmitch@gmail.com> | 2018-02-11 17:45:51 -0800 |
commit | 9f595f3a80eeaa0bfbda5702031f054f684f6123 (patch) | |
tree | 0667e6e7ab4c64dcfd28aa23e10690e1776a6f03 /player/screenshot.c | |
parent | 7b1e73139f73f446a472782e1465040c0e6b16dd (diff) | |
download | mpv-9f595f3a80eeaa0bfbda5702031f054f684f6123.tar.bz2 mpv-9f595f3a80eeaa0bfbda5702031f054f684f6123.tar.xz |
vo_gpu: make screenshots use the GL renderer
Using the GL renderer for color conversion will make sure screenshots
will use the same conversion as normal video rendering. It can do this
for all types of screenshots.
The logic when to write 16 bit PNGs changes. To approximate the old
behavior, we decide by looking whether the source video format has more
than 8 bits per component. We apply this logic even for window
screenshots. Also, 16 bit PNGs now always include an unused alpha
channel. The reason is that FFmpeg has RGB48 and RGBA64 formats, but no
RGB064. RGB48 is 3 bytes and usually not supported by GPUs for
rendering, so we have to use RGBA64, which forces an alpha channel.
Will break for users who use --target-trc and similar options.
I considered creating a new gl_video context, but it could double GPU
memory use, so I didn't.
This uses FBOs instead of glGetTexImage(), because that increases the
chance it could work on GLES (e.g. ANGLE). Untested. No support for the
Vulkan and D3D11 backends yet.
Fixes #5498. Also fixes #5240, because the code for reading back is not
used with the new code path.
Diffstat (limited to 'player/screenshot.c')
-rw-r--r-- | player/screenshot.c | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/player/screenshot.c b/player/screenshot.c index 16ff357dc8..d0e5777a65 100644 --- a/player/screenshot.c +++ b/player/screenshot.c @@ -389,16 +389,30 @@ static void add_subs(struct MPContext *mpctx, struct mp_image *image) OSD_DRAW_SUB_ONLY, image); } -static struct mp_image *screenshot_get(struct MPContext *mpctx, int mode) +static struct mp_image *screenshot_get(struct MPContext *mpctx, int mode, + bool high_depth) { struct mp_image *image = NULL; if (mode == MODE_SUBTITLES && osd_get_render_subs_in_filter(mpctx->osd)) mode = 0; + bool need_add_subs = mode == MODE_SUBTITLES; if (mpctx->video_out && mpctx->video_out->config_ok) { vo_wait_frame(mpctx->video_out); // important for each-frame mode - if (mode != MODE_FULL_WINDOW) + struct voctrl_screenshot ctrl = { + .scaled = mode == MODE_FULL_WINDOW, + .subs = mode != 0, + .osd = mode == MODE_FULL_WINDOW, + .high_bit_depth = high_depth && + mpctx->opts->screenshot_image_opts->high_bit_depth, + }; + 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); @@ -412,7 +426,7 @@ static struct mp_image *screenshot_get(struct MPContext *mpctx, int mode) image = nimage; } - if (image && mode == MODE_SUBTITLES) + if (image && need_add_subs) add_subs(mpctx, image); return image; @@ -420,7 +434,7 @@ static struct mp_image *screenshot_get(struct MPContext *mpctx, int mode) struct mp_image *screenshot_get_rgb(struct MPContext *mpctx, int mode) { - struct mp_image *mpi = screenshot_get(mpctx, mode); + struct mp_image *mpi = screenshot_get(mpctx, mode, false); if (!mpi) return NULL; struct mp_image *res = convert_image(mpi, IMGFMT_BGR0, mpctx->log); @@ -440,7 +454,8 @@ void screenshot_to_file(struct MPContext *mpctx, const char *filename, int mode, int format = image_writer_format_from_ext(ext); if (format) opts.format = format; - struct mp_image *image = screenshot_get(mpctx, mode); + bool high_depth = image_writer_high_depth(&opts); + struct mp_image *image = screenshot_get(mpctx, mode, high_depth); if (!image) { screenshot_msg(ctx, MSGL_ERR, "Taking screenshot failed."); goto end; @@ -471,10 +486,12 @@ void screenshot_request(struct MPContext *mpctx, int mode, bool each_frame, ctx->mode = mode; ctx->osd = osd; - struct mp_image *image = screenshot_get(mpctx, mode); + struct image_writer_opts *opts = mpctx->opts->screenshot_image_opts; + bool high_depth = image_writer_high_depth(opts); + + struct mp_image *image = screenshot_get(mpctx, mode, high_depth); if (image) { - struct image_writer_opts *opts = mpctx->opts->screenshot_image_opts; char *filename = gen_fname(ctx, image_writer_file_ext(opts)); if (filename) write_screenshot(mpctx, image, filename, NULL, async); |