From a52ca8a2b075388dc7dd5012e4e3f4871e26b133 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 6 Jan 2015 15:04:29 +0100 Subject: csputils: get rid of mp_csp_details It used to be central, but now it's just unneeded. --- video/csputils.h | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'video/csputils.h') diff --git a/video/csputils.h b/video/csputils.h index 1ad88bf261..4e2fe611b3 100644 --- a/video/csputils.h +++ b/video/csputils.h @@ -106,17 +106,10 @@ extern const char *const mp_stereo3d_names[MP_STEREO3D_COUNT]; #define MP_STEREO3D_NAME_DEF(x, def) \ (MP_STEREO3D_NAME(x) ? MP_STEREO3D_NAME(x) : (def)) -struct mp_csp_details { - enum mp_csp format; +struct mp_csp_params { + enum mp_csp colorspace; enum mp_csp_levels levels_in; // encoded video enum mp_csp_levels levels_out; // output device -}; - -// initializer for struct mp_csp_details that contains reasonable defaults -#define MP_CSP_DETAILS_DEFAULTS {MP_CSP_BT_601, MP_CSP_LEVELS_TV, MP_CSP_LEVELS_PC} - -struct mp_csp_params { - struct mp_csp_details colorspace; float brightness; float contrast; float hue; @@ -133,7 +126,9 @@ struct mp_csp_params { }; #define MP_CSP_PARAMS_DEFAULTS { \ - .colorspace = MP_CSP_DETAILS_DEFAULTS, \ + .colorspace = MP_CSP_BT_601, \ + .levels_in = MP_CSP_LEVELS_TV, \ + .levels_out = MP_CSP_LEVELS_PC, \ .brightness = 0, .contrast = 1, .hue = 0, .saturation = 1, \ .rgamma = 1, .ggamma = 1, .bgamma = 1, \ .texture_bits = 8, .input_bits = 8} -- cgit v1.2.3