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/csputils.h | |
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/csputils.h')
-rw-r--r-- | video/csputils.h | 15 |
1 files changed, 5 insertions, 10 deletions
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} |