diff options
author | wm4 <wm4@nowhere> | 2019-10-31 15:44:09 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2019-10-31 15:44:09 +0100 |
commit | 2c43d2b75a88b8e0e8f0a715f993ffc1c8977d13 (patch) | |
tree | c32e05a5cb48910cbd3ae0f1020f18fcb0adf8b3 /video/image_writer.c | |
parent | 835586513d026bcf1e7dec4693e07c28dda8cedd (diff) | |
download | mpv-2c43d2b75a88b8e0e8f0a715f993ffc1c8977d13.tar.bz2 mpv-2c43d2b75a88b8e0e8f0a715f993ffc1c8977d13.tar.xz |
screenshot, vo_image: use global swscale/zimg parameters
Lots of dumb crap to do... something. Instead of adding yet another dumb
helper, just use the main" sws_utils API in both callers. (Which,
unfortunately, has been duplicated for glorious webp screenshots,
despite the fact that webp is crap.)
Good part: can enable zimg for screenshots (as far as needed).
Bad part: uses "default" swscale parameters instead of HQ now.
Diffstat (limited to 'video/image_writer.c')
-rw-r--r-- | video/image_writer.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/video/image_writer.c b/video/image_writer.c index e66543a772..5438249c42 100644 --- a/video/image_writer.c +++ b/video/image_writer.c @@ -314,6 +314,7 @@ int image_writer_format_from_ext(const char *ext) static struct mp_image *convert_image(struct mp_image *image, int destfmt, enum mp_csp_levels yuv_levels, + struct mpv_global *global, struct mp_log *log) { int d_w, d_h; @@ -350,7 +351,14 @@ static struct mp_image *convert_image(struct mp_image *image, int destfmt, dst->params = p; - if (mp_image_swscale(dst, image, mp_sws_hq_flags) < 0) { + struct mp_sws_context *sws = mp_sws_alloc(NULL); + sws->log = log; + if (global) + mp_sws_enable_cmdline_opts(sws, global); + bool ok = mp_sws_scale(sws, dst, image) >= 0; + talloc_free(sws); + + if (!ok) { mp_err(log, "Error when converting image.\n"); talloc_free(dst); return NULL; @@ -360,7 +368,8 @@ static struct mp_image *convert_image(struct mp_image *image, int destfmt, } bool write_image(struct mp_image *image, const struct image_writer_opts *opts, - const char *filename, struct mp_log *log) + const char *filename, struct mpv_global *global, + struct mp_log *log) { struct image_writer_opts defs = image_writer_opts_defaults; if (!opts) @@ -393,7 +402,7 @@ bool write_image(struct mp_image *image, const struct image_writer_opts *opts, levels = MP_CSP_LEVELS_PC; } - struct mp_image *dst = convert_image(image, destfmt, levels, log); + struct mp_image *dst = convert_image(image, destfmt, levels, global, log); if (!dst) return false; @@ -416,5 +425,5 @@ void dump_png(struct mp_image *image, const char *filename, struct mp_log *log) { struct image_writer_opts opts = image_writer_opts_defaults; opts.format = AV_CODEC_ID_PNG; - write_image(image, &opts, filename, log); + write_image(image, &opts, filename, NULL, log); } |