diff options
author | wm4 <wm4@nowhere> | 2015-01-06 15:04:29 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-01-06 16:50:58 +0100 |
commit | a52ca8a2b075388dc7dd5012e4e3f4871e26b133 (patch) | |
tree | 8a29d2451c9763d425e37ba6501644a0f3d06bdb /video/out | |
parent | 02362f938f0a782a39e4c069b150650fb4171dc7 (diff) | |
download | mpv-a52ca8a2b075388dc7dd5012e4e3f4871e26b133.tar.bz2 mpv-a52ca8a2b075388dc7dd5012e4e3f4871e26b133.tar.xz |
csputils: get rid of mp_csp_details
It used to be central, but now it's just unneeded.
Diffstat (limited to 'video/out')
-rw-r--r-- | video/out/gl_video.c | 11 | ||||
-rw-r--r-- | video/out/vo_direct3d.c | 6 | ||||
-rw-r--r-- | video/out/vo_opengl_old.c | 9 |
3 files changed, 12 insertions, 14 deletions
diff --git a/video/out/gl_video.c b/video/out/gl_video.c index 24a7a13f1d..1ff0d9d333 100644 --- a/video/out/gl_video.c +++ b/video/out/gl_video.c @@ -638,19 +638,16 @@ static void update_uniforms(struct gl_video *p, GLuint program) gl->UseProgram(program); - struct mp_csp_details csp = MP_CSP_DETAILS_DEFAULTS; - csp.levels_in = p->image_params.colorlevels; - csp.levels_out = p->image_params.outputlevels; - csp.format = p->image_params.colorspace; - struct mp_csp_params cparams = { - .colorspace = csp, + .colorspace = p->image_params.colorspace, + .levels_in = p->image_params.colorlevels, + .levels_out = p->image_params.outputlevels, .input_bits = p->plane_bits, .texture_bits = (p->plane_bits + 7) & ~7, }; mp_csp_copy_equalizer_values(&cparams, &p->video_eq); if (p->image_desc.flags & MP_IMGFLAG_XYZ) { - cparams.colorspace.format = MP_CSP_XYZ; + cparams.colorspace = MP_CSP_XYZ; cparams.input_bits = 8; cparams.texture_bits = 8; } diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c index 52ec690cf3..4a2c86aab7 100644 --- a/video/out/vo_direct3d.c +++ b/video/out/vo_direct3d.c @@ -1152,9 +1152,9 @@ static void update_colorspace(d3d_priv *priv) { float coeff[3][4]; struct mp_csp_params csp = MP_CSP_PARAMS_DEFAULTS; - csp.colorspace.format = priv->params.colorspace; - csp.colorspace.levels_in = priv->params.colorlevels; - csp.colorspace.levels_out = priv->params.outputlevels; + csp.colorspace = priv->params.colorspace; + csp.levels_in = priv->params.colorlevels; + csp.levels_out = priv->params.outputlevels; mp_csp_copy_equalizer_values(&csp, &priv->video_eq); if (priv->use_shaders) { diff --git a/video/out/vo_opengl_old.c b/video/out/vo_opengl_old.c index dc105baaaa..b88b36e5d1 100644 --- a/video/out/vo_opengl_old.c +++ b/video/out/vo_opengl_old.c @@ -1346,10 +1346,11 @@ static void update_yuvconv(struct vo *vo) if (!vo->params) return; - struct mp_csp_params cparams = { .colorspace = MP_CSP_DETAILS_DEFAULTS }; - cparams.colorspace.format = vo->params->colorspace; - cparams.colorspace.levels_in = vo->params->colorlevels; - cparams.colorspace.levels_out = vo->params->outputlevels; + struct mp_csp_params cparams = { + .colorspace = vo->params->colorspace, + .levels_in = vo->params->colorlevels, + .levels_out = vo->params->outputlevels, + }; mp_csp_copy_equalizer_values(&cparams, &p->video_eq); gl_conversion_params_t params = { p->target, p->yuvconvtype, cparams, |