From d4bdd0473d6f43132257c9fb3848d829755167a3 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 5 Nov 2012 17:02:04 +0100 Subject: Rename directories, move files (step 1 of 2) (does not compile) Tis drops the silly lib prefixes, and attempts to organize the tree in a more logical way. Make the top-level directory less cluttered as well. Renames the following directories: libaf -> audio/filter libao2 -> audio/out libvo -> video/out libmpdemux -> demux Split libmpcodecs: vf* -> video/filter vd*, dec_video.* -> video/decode mp_image*, img_format*, ... -> video/ ad*, dec_audio.* -> audio/decode libaf/format.* is moved to audio/ - this is similar to how mp_image.* is located in video/. Move most top-level .c/.h files to core. (talloc.c/.h is left on top- level, because it's external.) Park some of the more annoying files in compat/. Some of these are relicts from the time mplayer used ffmpeg internals. sub/ is not split, because it's too much of a mess (subtitle code is mixed with OSD display and rendering). Maybe the organization of core is not ideal: it mixes playback core (like mplayer.c) and utility helpers (like bstr.c/h). Should the need arise, the playback core will be moved somewhere else, while core contains all helper and common code. --- video/csputils.h | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) create mode 100644 video/csputils.h (limited to 'video/csputils.h') diff --git a/video/csputils.h b/video/csputils.h new file mode 100644 index 0000000000..d66bb86fa3 --- /dev/null +++ b/video/csputils.h @@ -0,0 +1,151 @@ +/* + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * You can alternatively redistribute this file and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + */ + +#ifndef MPLAYER_CSPUTILS_H +#define MPLAYER_CSPUTILS_H + +#include +#include + +#include "libavcodec/avcodec.h" + +/* NOTE: the csp and levels AUTO values are converted to specific ones + * above vf/vo level. At least vf_scale relies on all valid settings being + * nonzero at vf/vo level. + */ + +enum mp_csp { + MP_CSP_AUTO, + MP_CSP_BT_601, + MP_CSP_BT_709, + MP_CSP_SMPTE_240M, + MP_CSP_RGB, + MP_CSP_COUNT +}; + +// Any enum mp_csp value is a valid index (except MP_CSP_COUNT) +extern char * const mp_csp_names[MP_CSP_COUNT]; + +enum mp_csp_levels { + MP_CSP_LEVELS_AUTO, + MP_CSP_LEVELS_TV, + MP_CSP_LEVELS_PC, + MP_CSP_LEVELS_COUNT, +}; + +struct mp_csp_details { + enum mp_csp format; + 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; + float saturation; + float rgamma; + float ggamma; + float bgamma; + // texture_bits/input_bits is for rescaling fixed point input to range [0,1] + int texture_bits; + int input_bits; + // for scaling integer input and output (if 0, assume range [0,1]) + int int_bits_in; + int int_bits_out; +}; + +#define MP_CSP_PARAMS_DEFAULTS { \ + .colorspace = MP_CSP_DETAILS_DEFAULTS, \ + .brightness = 0, .contrast = 1, .hue = 0, .saturation = 1, \ + .rgamma = 1, .ggamma = 1, .bgamma = 1, \ + .texture_bits = 8, .input_bits = 8} + +enum mp_csp_equalizer_param { + MP_CSP_EQ_BRIGHTNESS, + MP_CSP_EQ_CONTRAST, + MP_CSP_EQ_HUE, + MP_CSP_EQ_SATURATION, + MP_CSP_EQ_GAMMA, + MP_CSP_EQ_COUNT, +}; + +#define MP_CSP_EQ_CAPS_COLORMATRIX \ + ( (1 << MP_CSP_EQ_BRIGHTNESS) \ + | (1 << MP_CSP_EQ_CONTRAST) \ + | (1 << MP_CSP_EQ_HUE) \ + | (1 << MP_CSP_EQ_SATURATION) ) + +#define MP_CSP_EQ_CAPS_GAMMA (1 << MP_CSP_EQ_GAMMA) + +extern char * const mp_csp_equalizer_names[MP_CSP_EQ_COUNT]; + +// Default initialization with 0 is enough, except for the capabilities field +struct mp_csp_equalizer { + // Bit field of capabilities. For example (1 << MP_CSP_EQ_HUE) means hue + // support is available. + int capabilities; + // Value for each property is in the range [-100, 100]. + // 0 is default, meaning neutral or no change. + int values[MP_CSP_EQ_COUNT]; +}; + + +void mp_csp_copy_equalizer_values(struct mp_csp_params *params, + const struct mp_csp_equalizer *eq); + +int mp_csp_equalizer_set(struct mp_csp_equalizer *eq, const char *property, + int value); + +int mp_csp_equalizer_get(struct mp_csp_equalizer *eq, const char *property, + int *out_value); + +enum mp_csp avcol_spc_to_mp_csp(enum AVColorSpace colorspace); + +enum mp_csp_levels avcol_range_to_mp_csp_levels(enum AVColorRange range); + +enum AVColorSpace mp_csp_to_avcol_spc(enum mp_csp colorspace); + +enum AVColorRange mp_csp_levels_to_avcol_range(enum mp_csp_levels range); + +enum mp_csp mp_csp_guess_colorspace(int width, int height); + +void mp_gen_gamma_map(unsigned char *map, int size, float gamma); +#define ROW_R 0 +#define ROW_G 1 +#define ROW_B 2 +#define COL_Y 0 +#define COL_U 1 +#define COL_V 2 +#define COL_C 3 +void mp_get_yuv2rgb_coeffs(struct mp_csp_params *params, float yuv2rgb[3][4]); +void mp_gen_yuv2rgb_map(struct mp_csp_params *params, uint8_t *map, int size); + +void mp_invert_yuv2rgb(float out[3][4], float in[3][4]); +void mp_map_int_color(float matrix[3][4], int clip_bits, int c[3]); + +#endif /* MPLAYER_CSPUTILS_H */ -- cgit v1.2.3