diff options
| author | wm4 <wm4@nowhere> | 2016-06-03 20:35:17 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-06-03 20:35:22 +0200 |
| commit | 026b75e7f509d29d25f42cb335538f369fb6c381 (patch) | |
| tree | 23bf7c8664e97cb040fe6c90efd7156b2aa1040b /video/out/opengl/video.h | |
| parent | 2179879172be97541ceffdd7d29cba09c1ca9629 (diff) | |
| download | mpv-026b75e7f509d29d25f42cb335538f369fb6c381.tar.bz2 mpv-026b75e7f509d29d25f42cb335538f369fb6c381.tar.xz | |
vo_opengl: move all icc handling from vo_opengl.c to video.c
Originally, video.c did not access any CMS things (other than lut3d
being set on it), but this has changed. In practice, almost all accesses
to it have moved to video.c. vo_opengl only created it, and set the auto
icc profile path.
Complete the move.
Some things wrt. option handling are a bit fishy. (But when is this not
the case.)
icc-profile-auto was not tested, but the distributed human CI will take
care of it.
Diffstat (limited to 'video/out/opengl/video.h')
| -rw-r--r-- | video/out/opengl/video.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/video/out/opengl/video.h b/video/out/opengl/video.h index 026d18526d..29a5ea9643 100644 --- a/video/out/opengl/video.h +++ b/video/out/opengl/video.h @@ -148,6 +148,7 @@ struct gl_video_opts { float prescale_downscaling_threshold; struct superxbr_opts *superxbr_opts; struct nnedi3_opts *nnedi3_opts; + struct mp_icc_opts *icc_opts; }; extern const struct m_sub_options gl_video_conf; @@ -157,15 +158,13 @@ extern const struct gl_video_opts gl_video_opts_def; struct gl_video; struct vo_frame; -struct gl_video *gl_video_init(GL *gl, struct mp_log *log, struct mpv_global *g, - struct gl_lcms *cms); +struct gl_video *gl_video_init(GL *gl, struct mp_log *log, struct mpv_global *g); void gl_video_uninit(struct gl_video *p); void gl_video_set_osd_source(struct gl_video *p, struct osd_state *osd); 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_update_profile(struct gl_video *p); void gl_video_render_frame(struct gl_video *p, struct vo_frame *frame, int fbo); void gl_video_resize(struct gl_video *p, int vp_w, int vp_h, struct mp_rect *src, struct mp_rect *dst, @@ -179,6 +178,8 @@ void gl_video_set_debug(struct gl_video *p, bool enable); float gl_video_scale_ambient_lux(float lmin, float lmax, float rmin, float rmax, float lux); void gl_video_set_ambient_lux(struct gl_video *p, int lux); +void gl_video_set_icc_profile(struct gl_video *p, bstr icc_data); +bool gl_video_icc_auto_enabled(struct gl_video *p); void gl_video_set_gl_state(struct gl_video *p); void gl_video_unset_gl_state(struct gl_video *p); |