diff options
| -rw-r--r-- | Copyright | 1 | ||||
| -rw-r--r-- | DOCS/interface-changes.rst | 1 | ||||
| -rw-r--r-- | DOCS/man/vf.rst | 26 | ||||
| -rw-r--r-- | video/filter/vf.c | 2 | ||||
| -rw-r--r-- | video/filter/vf_eq.c | 448 | ||||
| -rw-r--r-- | wscript_build.py | 1 |
6 files changed, 1 insertions, 478 deletions
@@ -283,7 +283,6 @@ x player/audio.c LGPL (dysfunctional due to libaf) video/filter/vf_crop.c will be deleted video/filter/vf_d3d11vpp.c LGPL video/filter/vf_dsize.c will be deleted - video/filter/vf_eq.c will be deleted video/filter/vf_expand.c will be deleted video/filter/vf_flip.c will be deleted video/filter/vf_format.c will be deleted diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index e3ef936551..17e9997c57 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -43,6 +43,7 @@ Interface changes - undeprecate --loop, and map it from --loop-playlist to --loop-file (the deprecation was to make sure no API user gets broken by a sudden behavior change) + - remove previously deprecated vf_eq --- mpv 0.26.0 --- - remove remaining deprecated audio device options, like --alsa-device Some of them were removed in earlier releases. diff --git a/DOCS/man/vf.rst b/DOCS/man/vf.rst index 3a5ba7109c..617ceeea04 100644 --- a/DOCS/man/vf.rst +++ b/DOCS/man/vf.rst @@ -484,32 +484,6 @@ Available mpv-only filters are: ``'--vf=lavfi=yadif:o="threads=2,thread_type=slice"'`` forces a specific threading configuration. -``eq[=gamma:contrast:brightness:saturation:rg:gg:bg:weight]`` - Software equalizer that uses lookup tables (slow), allowing gamma correction - in addition to simple brightness and contrast adjustment. The parameters are - given as floating point values. - - ``<0.1-10>`` - initial gamma value (default: 1.0) - ``<-2-2>`` - initial contrast, where negative values result in a negative image - (default: 1.0) - ``<-1-1>`` - initial brightness (default: 0.0) - ``<0-3>`` - initial saturation (default: 1.0) - ``<0.1-10>`` - gamma value for the red component (default: 1.0) - ``<0.1-10>`` - gamma value for the green component (default: 1.0) - ``<0.1-10>`` - gamma value for the blue component (default: 1.0) - ``<0-1>`` - The weight parameter can be used to reduce the effect of a high gamma - value on bright image areas, e.g. keep them from getting overamplified - and just plain white. A value of 0.0 turns the gamma correction all - the way down while 1.0 leaves it at its full strength (default: 1.0). - ``pullup[=jl:jr:jt:jb:sb:mp]`` Pulldown reversal (inverse telecine) filter, capable of handling mixed hard-telecine, 24000/1001 fps progressive, and 30000/1001 fps progressive diff --git a/video/filter/vf.c b/video/filter/vf.c index 0db6f2a286..ae38947262 100644 --- a/video/filter/vf.c +++ b/video/filter/vf.c @@ -47,7 +47,6 @@ extern const vf_info_t vf_info_noformat; extern const vf_info_t vf_info_flip; extern const vf_info_t vf_info_rotate; extern const vf_info_t vf_info_mirror; -extern const vf_info_t vf_info_eq; extern const vf_info_t vf_info_gradfun; extern const vf_info_t vf_info_dsize; extern const vf_info_t vf_info_pullup; @@ -81,7 +80,6 @@ static const vf_info_t *const filter_list[] = { &vf_info_yadif, &vf_info_stereo3d, - &vf_info_eq, &vf_info_dsize, &vf_info_sub, &vf_info_buffer, diff --git a/video/filter/vf_eq.c b/video/filter/vf_eq.c deleted file mode 100644 index 6344cef0e0..0000000000 --- a/video/filter/vf_eq.c +++ /dev/null @@ -1,448 +0,0 @@ -/* - * Software equalizer (brightness, contrast, gamma, saturation) - * - * Hampa Hug <hampa@hampa.ch> (original LUT gamma/contrast/brightness filter) - * Daniel Moreno <comac@comac.darktech.org> (saturation, R/G/B gamma support) - * Richard Felker (original MMX contrast/brightness code (vf_eq.c)) - * Michael Niedermayer <michalni@gmx.at> (LUT16) - * - * This file is part of mpv. - * - * mpv 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. - * - * mpv 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 mpv. If not, see <http://www.gnu.org/licenses/>. - */ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <math.h> -#include <inttypes.h> - -#include "config.h" -#include "common/msg.h" -#include "options/m_option.h" - -#include "video/img_format.h" -#include "video/mp_image.h" -#include "vf.h" - -#define LUT16 - -/* Per channel parameters */ -typedef struct eq2_param_t { - unsigned char lut[256]; -#ifdef LUT16 - uint16_t lut16[256*256]; -#endif - int lut_clean; - - void (*adjust) (struct eq2_param_t *par, unsigned char *dst, unsigned char *src, - unsigned w, unsigned h, unsigned dstride, unsigned sstride); - - double c; - double b; - double g; - double w; -} eq2_param_t; - -typedef struct vf_priv_s { - struct mp_log *log; - eq2_param_t param[3]; - - double contrast; - double brightness; - double saturation; - - double gamma; - double gamma_weight; - double rgamma; - double ggamma; - double bgamma; - - unsigned buf_w[3]; - unsigned buf_h[3]; - unsigned char *buf[3]; - - int gamma_i, contrast_i, brightness_i, saturation_i; - - double par[8]; -} vf_eq2_t; - - -static -void create_lut (eq2_param_t *par) -{ - unsigned i; - double g, v; - double lw, gw; - - g = par->g; - gw = par->w; - lw = 1.0 - gw; - - if ((g < 0.001) || (g > 1000.0)) { - g = 1.0; - } - - g = 1.0 / g; - - for (i = 0; i < 256; i++) { - v = (double) i / 255.0; - v = par->c * (v - 0.5) + 0.5 + par->b; - - if (v <= 0.0) { - par->lut[i] = 0; - } - else { - v = v*lw + pow(v, g)*gw; - - if (v >= 1.0) { - par->lut[i] = 255; - } - else { - par->lut[i] = (unsigned char) (256.0 * v); - } - } - } - -#ifdef LUT16 - for(i=0; i<256*256; i++){ - par->lut16[i]= par->lut[i&0xFF] + (par->lut[i>>8]<<8); - } -#endif - - par->lut_clean = 1; -} - -static -void apply_lut (eq2_param_t *par, unsigned char *dst, unsigned char *src, - unsigned w, unsigned h, unsigned dstride, unsigned sstride) -{ - unsigned i, j, w2; - unsigned char *lut; - uint16_t *lut16; - - if (!par->lut_clean) { - create_lut (par); - } - - lut = par->lut; -#ifdef LUT16 - lut16 = par->lut16; - w2= (w>>3)<<2; - for (j = 0; j < h; j++) { - uint16_t *src16= (uint16_t*)src; - uint16_t *dst16= (uint16_t*)dst; - for (i = 0; i < w2; i+=4) { - dst16[i+0] = lut16[src16[i+0]]; - dst16[i+1] = lut16[src16[i+1]]; - dst16[i+2] = lut16[src16[i+2]]; - dst16[i+3] = lut16[src16[i+3]]; - } - i <<= 1; -#else - w2= (w>>3)<<3; - for (j = 0; j < h; j++) { - for (i = 0; i < w2; i+=8) { - dst[i+0] = lut[src[i+0]]; - dst[i+1] = lut[src[i+1]]; - dst[i+2] = lut[src[i+2]]; - dst[i+3] = lut[src[i+3]]; - dst[i+4] = lut[src[i+4]]; - dst[i+5] = lut[src[i+5]]; - dst[i+6] = lut[src[i+6]]; - dst[i+7] = lut[src[i+7]]; - } -#endif - for (; i < w; i++) { - dst[i] = lut[src[i]]; - } - - src += sstride; - dst += dstride; - } -} - -static struct mp_image *filter(struct vf_instance *vf, struct mp_image *src) -{ - vf_eq2_t *eq2; - unsigned long img_n,img_c; - - eq2 = vf->priv; - - bool skip = true; - for (int i = 0; i < 3; i++) - skip &= eq2->param[i].adjust == NULL; - - if (skip) - return src; - - if ((eq2->buf_w[0] != src->w) || (eq2->buf_h[0] != src->h)) { - eq2->buf_w[0] = src->w; - eq2->buf_h[0] = src->h; - eq2->buf_w[1] = eq2->buf_w[2] = src->w >> src->fmt.chroma_xs; - eq2->buf_h[1] = eq2->buf_h[2] = src->h >> src->fmt.chroma_ys; - img_n = eq2->buf_w[0]*eq2->buf_h[0]; - if(src->num_planes>1){ - img_c = eq2->buf_w[1]*eq2->buf_h[1]; - eq2->buf[0] = realloc (eq2->buf[0], img_n + 2*img_c); - eq2->buf[1] = eq2->buf[0] + img_n; - eq2->buf[2] = eq2->buf[1] + img_c; - } else - eq2->buf[0] = realloc (eq2->buf[0], img_n); - } - - struct mp_image dst = *src; - - for (int i = 0; i < ((src->num_planes>1)?3:1); i++) { - if (eq2->param[i].adjust != NULL) { - dst.planes[i] = eq2->buf[i]; - dst.stride[i] = eq2->buf_w[i]; - - eq2->param[i].adjust (&eq2->param[i], dst.planes[i], src->planes[i], - eq2->buf_w[i], eq2->buf_h[i], dst.stride[i], src->stride[i]); - } - } - - struct mp_image *new = vf_alloc_out_image(vf); - if (new) { - mp_image_copy(new, &dst); - mp_image_copy_attributes(new, &dst); - } - - talloc_free(src); - return new; -} - -static -void check_values (eq2_param_t *par) -{ - /* yuck! floating point comparisons... */ - - if ((par->c == 1.0) && (par->b == 0.0) && (par->g == 1.0)) { - par->adjust = NULL; - } - else { - par->adjust = &apply_lut; - } -} - -static -void print_values (vf_eq2_t *eq2) -{ - MP_VERBOSE(eq2, "vf_eq2: c=%.2f b=%.2f g=%.4f s=%.2f \n", - eq2->contrast, eq2->brightness, eq2->gamma, eq2->saturation - ); -} - -static -void set_contrast (vf_eq2_t *eq2, double c) -{ - eq2->contrast = c; - eq2->param[0].c = c; - eq2->param[0].lut_clean = 0; - check_values (&eq2->param[0]); - print_values (eq2); -} - -static -void set_brightness (vf_eq2_t *eq2, double b) -{ - eq2->brightness = b; - eq2->param[0].b = b; - eq2->param[0].lut_clean = 0; - check_values (&eq2->param[0]); - print_values (eq2); -} - -static -void set_gamma (vf_eq2_t *eq2, double g) -{ - eq2->gamma = g; - - eq2->param[0].g = eq2->gamma * eq2->ggamma; - eq2->param[1].g = sqrt (eq2->bgamma / eq2->ggamma); - eq2->param[2].g = sqrt (eq2->rgamma / eq2->ggamma); - eq2->param[0].w = eq2->param[1].w = eq2->param[2].w = eq2->gamma_weight; - - eq2->param[0].lut_clean = 0; - eq2->param[1].lut_clean = 0; - eq2->param[2].lut_clean = 0; - - check_values (&eq2->param[0]); - check_values (&eq2->param[1]); - check_values (&eq2->param[2]); - - print_values (eq2); -} - -static -void set_saturation (vf_eq2_t *eq2, double s) -{ - eq2->saturation = s; - - eq2->param[1].c = s; - eq2->param[2].c = s; - - eq2->param[1].lut_clean = 0; - eq2->param[2].lut_clean = 0; - - check_values (&eq2->param[1]); - check_values (&eq2->param[2]); - - print_values (eq2); -} - -static -int control (vf_instance_t *vf, int request, void *data) -{ - vf_equalizer_t *eq; - - switch (request) { - case VFCTRL_SET_EQUALIZER: - eq = (vf_equalizer_t *) data; - - if (strcmp (eq->item, "gamma") == 0) { - set_gamma (vf->priv, exp (log (8.0) * eq->value / 100.0)); - vf->priv->gamma_i = eq->value; - return CONTROL_TRUE; - } - else if (strcmp (eq->item, "contrast") == 0) { - set_contrast (vf->priv, (1.0 / 100.0) * (eq->value + 100)); - vf->priv->contrast_i = eq->value; - return CONTROL_TRUE; - } - else if (strcmp (eq->item, "brightness") == 0) { - set_brightness (vf->priv, (1.0 / 100.0) * eq->value); - vf->priv->brightness_i = eq->value; - return CONTROL_TRUE; - } - else if (strcmp (eq->item, "saturation") == 0) { - set_saturation (vf->priv, (double) (eq->value + 100) / 100.0); - vf->priv->saturation_i = eq->value; - return CONTROL_TRUE; - } - break; - - case VFCTRL_GET_EQUALIZER: - eq = (vf_equalizer_t *) data; - if (strcmp (eq->item, "gamma") == 0) { - eq->value = vf->priv->gamma_i; - return CONTROL_TRUE; - } - else if (strcmp (eq->item, "contrast") == 0) { - eq->value = vf->priv->contrast_i; - return CONTROL_TRUE; - } - else if (strcmp (eq->item, "brightness") == 0) { - eq->value = vf->priv->brightness_i; - return CONTROL_TRUE; - } - else if (strcmp (eq->item, "saturation") == 0) { - eq->value = vf->priv->saturation_i; - return CONTROL_TRUE; - } - break; - } - - return CONTROL_UNKNOWN; -} - -static -int query_format (vf_instance_t *vf, unsigned fmt) -{ - switch (fmt) { - case IMGFMT_Y8: - case IMGFMT_444P: - case IMGFMT_420P: - return vf_next_query_format (vf, fmt); - } - - return 0; -} - -static -void uninit (vf_instance_t *vf) -{ - if (vf->priv != NULL) { - free (vf->priv->buf[0]); - } -} - -static -int vf_open(vf_instance_t *vf) -{ - unsigned i; - vf_eq2_t *eq2; - double *par = vf->priv->par; - - MP_WARN(vf, "This filter is deprecated. Use lavfi eq instead.\n" - "For interactive eq, there is no replacement.\n"); - - vf->control = control; - vf->query_format = query_format; - vf->filter = filter; - vf->uninit = uninit; - - eq2 = vf->priv; - eq2->log = vf->log; - - for (i = 0; i < 3; i++) { - eq2->buf[i] = NULL; - eq2->buf_w[i] = 0; - eq2->buf_h[i] = 0; - - eq2->param[i].adjust = NULL; - eq2->param[i].c = 1.0; - eq2->param[i].b = 0.0; - eq2->param[i].g = 1.0; - eq2->param[i].lut_clean = 0; - } - - eq2->rgamma = par[4]; - eq2->ggamma = par[5]; - eq2->bgamma = par[6]; - eq2->gamma_weight = par[7]; - - set_gamma (eq2, par[0]); - eq2->gamma_i = (int) (100.0 * log (vf->priv->gamma) / log (8.0)); - set_contrast (eq2, par[1]); - eq2->contrast_i = (int) (100.0 * vf->priv->contrast) - 100; - set_brightness (eq2, par[2]); - eq2->brightness_i = (int) (100.0 * vf->priv->brightness); - set_saturation (eq2, par[3]); - eq2->saturation_i = (int) (100.0 * vf->priv->saturation) - 100; - - return 1; -} - -#define OPT_BASE_STRUCT struct vf_priv_s -const vf_info_t vf_info_eq = { - .description = "Software equalizer", - .name = "eq", - .open = &vf_open, - .priv_size = sizeof(struct vf_priv_s), - .options = (const struct m_option[]){ -#define PARAM(name, n, def, min_, max_) \ - OPT_DOUBLE(name, par[n], CONF_RANGE, .min = min_, .max = max_, OPTDEF_DOUBLE(def)) - PARAM("gamma", 0, 1.0, 0.1, 10), - PARAM("contrast", 1, 1.0, -2, 2), - PARAM("brightness", 2, 0.0, -1, 1), - PARAM("saturation", 3, 1.0, 0, 3), - PARAM("rg", 4, 1.0, 0.1, 10), - PARAM("gg", 5, 1.0, 0.1, 10), - PARAM("bg", 6, 1.0, 0.1, 10), - PARAM("weight", 7, 1.0, 0, 1), - {0} - }, -}; diff --git a/wscript_build.py b/wscript_build.py index d96ff40133..3c5c00dc64 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -359,7 +359,6 @@ def build(ctx): ( "video/filter/vf_crop.c" ), ( "video/filter/vf_d3d11vpp.c", "d3d-hwaccel" ), ( "video/filter/vf_dsize.c" ), - ( "video/filter/vf_eq.c" ), ( "video/filter/vf_expand.c" ), ( "video/filter/vf_flip.c" ), ( "video/filter/vf_format.c" ), |