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

video/image_writer: force sRGB for unsupported formats 

After commit c98e7353, we blindly pass the screenshot colorspace to the
image writer. But since we want to introduces the ability to save images
in HDR and other exotic formats, we should strip this for unsupported
formats.

See-Also: #10988
This commit is contained in:
Niklas Haas 2022-12-12 22:01:57 +01:00 committed by Niklas Haas
parent 01351a6412
commit 6d9e72cd89
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
video/image_writer.c
View File

@ -356,6 +356,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,
const struct image_writer_opts *opts,
struct mpv_global *global,
struct mp_log *log)
{
@ -372,13 +373,17 @@ static struct mp_image *convert_image(struct mp_image *image, int destfmt,
};
mp_image_params_guess_csp(&p);
// If RGB, just assume everything is correct.
if (p.color.space != MP_CSP_RGB) {
// Currently, assume what FFmpeg's jpg encoder or libwebp needs.
// Of course this works only for non-HDR (no HDR support in libswscale).
p.color.levels = yuv_levels;
p.color.space = MP_CSP_BT_601;
p.chroma_location = MP_CHROMA_CENTER;
if (!image_writer_flexible_csp(opts)) {
// Formats that don't support non-sRGB csps should be forced to sRGB
p.color.primaries = MP_CSP_PRIM_BT_709;
p.color.gamma = MP_CSP_TRC_SRGB;
p.color.light = MP_CSP_LIGHT_DISPLAY;
p.color.sig_peak = 0;
if (p.color.space != MP_CSP_RGB) {
p.color.levels = yuv_levels;
p.color.space = MP_CSP_BT_601;
p.chroma_location = MP_CHROMA_CENTER;
}
mp_image_params_guess_csp(&p);
}
@ -445,7 +450,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, global, log);
struct mp_image *dst = convert_image(image, destfmt, levels, opts, global, log);
if (!dst)
return false;