mirror of
https://github.com/mpv-player/mpv
synced 2024-12-25 00:02:13 +00:00
6a833797db
This commit: - Changes some of the #define and variable names for clarification and adds comments where appropriate. - Unifies :srgb and :icc-profile, making them fit into the same step of the decoding process and removing the weird interactions between both of them. - Makes :icc-profile take precedence over :srgb (to significantly reduce the number of confusing and useless special cases) - Moves BT709 decompanding (approximate or actual) to the shader in all cases, making it happen before upscaling (instead of the old 0.45 gamma function). This is the simpler and more proper way to do it. - Enables the approx gamma function to work with :srgb as well due to this (since they now share the gamma expansion code). - Renames :icc-approx-gamma to :approx-gamma since it is no longer tied to the ICC options or LittleCMS. - Uses gamma 2.4 as input space for the actual 3DLUT, this is now a pretty arbitrary factor but I picked 2.4 mainly because a higher pure power value here seems to produce visually better results with wide gamut profiles, rather then the previous 1.95 or BT.709. - Adds the input gamma space to the 3dlut cache header in case we change it more in the future, or even make it user customizable (though I don't see why the latter would really be necessary). - Fixes the OSD's gamma when using :srgb, which was previously still using the old (0.45) approximation in all cases. - Updates documentation on :srgb, it was still mentioning the old behavior from circa a year ago. This commit should serve to both open up and make the CMS/shader code much more accessible and less confusing/error-prone and simultaneously also improve the performance of 3DLUTs with wide gamut color spaces. I would liked to have made it more modular but almost all of these changes are interdependent, save for the documentation updates. Note: Right now, the "3DLUT takes precedence over SRGB" logic is just coded into gl_lcms.c's compile_shaders function. Ideally, this should be done earlier, when parsing the options (by overriding the actual opts.srgb flag) and output a warning to the user. Note: I'm not sure how well this works together with real-world subtitles that may need to be color corrected as well. I'm not sure whether :approx-gamma needs to apply to subtitles as well. I'll need to test this on proper files later. Note: As of now, linear light scaling is still intrinsically tied to either :srgb or :icc-profile. It would be thinkable to have this as an extra option, :linear-scaling or similar, that could be used with or without the two color management options.
83 lines
2.7 KiB
C
83 lines
2.7 KiB
C
/*
|
|
* This file is part of mpv.
|
|
*
|
|
* mpv is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* mpv is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with mpv. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#ifndef MP_GL_VIDEO_H
|
|
#define MP_GL_VIDEO_H
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include "sub/osd.h"
|
|
#include "gl_common.h"
|
|
|
|
struct lut3d {
|
|
uint16_t *data;
|
|
int size[3];
|
|
};
|
|
|
|
struct gl_video_opts {
|
|
char *scalers[2];
|
|
float scaler_params[2];
|
|
int indirect;
|
|
float gamma;
|
|
int srgb;
|
|
int approx_gamma;
|
|
int scale_sep;
|
|
int fancy_downscaling;
|
|
int scaler_resizes_only;
|
|
int npot;
|
|
int pbo;
|
|
int dither_depth;
|
|
int dither_algo;
|
|
int dither_size;
|
|
int temporal_dither;
|
|
int fbo_format;
|
|
int stereo_mode;
|
|
int alpha_mode;
|
|
int chroma_location;
|
|
int use_rectangle;
|
|
};
|
|
|
|
extern const struct m_sub_options gl_video_conf;
|
|
extern const struct gl_video_opts gl_video_opts_hq_def;
|
|
|
|
struct gl_video;
|
|
|
|
struct gl_video *gl_video_init(GL *gl, struct mp_log *log);
|
|
void gl_video_uninit(struct gl_video *p);
|
|
void gl_video_set_options(struct gl_video *p, struct gl_video_opts *opts);
|
|
bool gl_video_check_format(struct gl_video *p, int mp_format);
|
|
void gl_video_config(struct gl_video *p, struct mp_image_params *params);
|
|
void gl_video_set_output_depth(struct gl_video *p, int r, int g, int b);
|
|
void gl_video_set_lut3d(struct gl_video *p, struct lut3d *lut3d);
|
|
void gl_video_draw_osd(struct gl_video *p, struct osd_state *osd);
|
|
void gl_video_upload_image(struct gl_video *p, struct mp_image *img);
|
|
void gl_video_render_frame(struct gl_video *p);
|
|
struct mp_image *gl_video_download_image(struct gl_video *p);
|
|
void gl_video_resize(struct gl_video *p, struct mp_rect *window,
|
|
struct mp_rect *src, struct mp_rect *dst,
|
|
struct mp_osd_res *osd);
|
|
bool gl_video_get_csp_override(struct gl_video *p, struct mp_csp_details *csp);
|
|
bool gl_video_set_equalizer(struct gl_video *p, const char *name, int val);
|
|
bool gl_video_get_equalizer(struct gl_video *p, const char *name, int *val);
|
|
|
|
void gl_video_set_debug(struct gl_video *p, bool enable);
|
|
void gl_video_resize_redraw(struct gl_video *p, int w, int h);
|
|
|
|
struct gl_hwdec;
|
|
void gl_video_set_hwdec(struct gl_video *p, struct gl_hwdec *hwdec);
|
|
|
|
#endif
|