diff options
| author | Niklas Haas <git@nand.wakku.to> | 2015-04-02 11:13:51 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-05-27 11:24:12 +0200 |
| commit | 22af0dce0de5a52806b13003b31aa41467f3034b (patch) | |
| tree | 9a3bb6bfc5bc5480950c213aa76e0077d6e6a4d2 /video | |
| parent | 13d4ee6d1ccbebb35639b10f8f1384ef254ccb61 (diff) | |
| download | mpv-22af0dce0de5a52806b13003b31aa41467f3034b.tar.bz2 mpv-22af0dce0de5a52806b13003b31aa41467f3034b.tar.xz | |
vo_opengl: CMS no longer implies linear scaling
They're completely orthogonal concepts, merged in the past due to
convenience and ease of implementing it in the old #ifdef hell renderer.
Especially after the CMS stuff was generalized by 634b4a, this was a
trivial change to implement and also means color management will be much
higher quality when enabled with vo=opengl (which had quantization
issues in the past due to the 8 bit FBO format and upscaling), since it
can be done in a single pass now.
Diffstat (limited to 'video')
| -rw-r--r-- | video/out/gl_video.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/video/out/gl_video.c b/video/out/gl_video.c index 867e88f267..b007b25bf2 100644 --- a/video/out/gl_video.c +++ b/video/out/gl_video.c @@ -1977,10 +1977,7 @@ static void pass_draw_osd(struct gl_video *p, int draw_flags, double pts, // upscaling static void pass_render_frame(struct gl_video *p) { - bool use_cms = p->use_lut_3d || p->opts.target_prim != MP_CSP_PRIM_AUTO - || p->opts.target_trc != MP_CSP_TRC_AUTO; - p->use_linear = p->opts.linear_scaling || p->opts.sigmoid_upscaling - || use_cms || p->image_params.gamma == MP_CSP_TRC_LINEAR; + p->use_linear = p->opts.linear_scaling || p->opts.sigmoid_upscaling; p->use_indirect = false; // set to true as needed by pass_* pass_read_video(p); pass_convert_yuv(p); |