github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-11-14 22:48:35 +01:00
Code Releases Activity

player: disable video equalizer frontend code for WIP LGPL mode

Browse Source 
Nick and kiriuja could not be reached, and created/changed this in
92c5c274, 6441a5ad, bffd4007, 555c6766, c2c997fd. The video equalizer
stuff was redone fully later, but there are still parts that look too
similar and basically use the same approach. I'm more comfortable with
declaring it GPL only for now.

I plan to redo them later in a way that will remove copyright.
This commit is contained in:
wm4 2017-06-23 15:13:47 +02:00
parent 690a312f42
commit 96b906a51d
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
options/options.c
View File

@ -564,6 +564,7 @@ const m_option_t mp_opts[] = {
.deprecation_message = "use Lua scripting instead"),
OPT_FLOAT("heartbeat-interval", heartbeat_interval, CONF_MIN, 0),
#if HAVE_GPL
OPT_INTRANGE("brightness", gamma_brightness, 0, -100, 100),
OPT_INTRANGE("saturation", gamma_saturation, 0, -100, 100),
OPT_INTRANGE("contrast", gamma_contrast, 0, -100, 100),
@ -571,6 +572,7 @@ const m_option_t mp_opts[] = {
OPT_INTRANGE("gamma", gamma_gamma, 0, -100, 100),
OPT_CHOICE_C("video-output-levels", video_output_levels, 0,
mp_csp_levels_names),
#endif
OPT_FLAG("use-filedir-conf", use_filedir_conf, 0),
OPT_CHOICE("osd-level", osd_level, 0,

4
player/command.c
View File

@ -2618,6 +2618,7 @@ static int mp_property_frame_count(void *ctx, struct m_property *prop,
return m_property_int_ro(action, arg, frames);
}
#if HAVE_GPL
static int mp_property_video_color(void *ctx, struct m_property *prop,
int action, void *arg)
{
@ -2644,6 +2645,7 @@ static int mp_property_video_color(void *ctx, struct m_property *prop,
}
return mp_property_generic_option(mpctx, prop, action, arg);
}
#endif
/// Video codec tag (RO)
static int mp_property_video_format(void *ctx, struct m_property *prop,
@ -3969,6 +3971,7 @@ static const struct m_property mp_properties_base[] = {
{"ontop", mp_property_ontop},
{"border", mp_property_border},
{"on-all-workspaces", mp_property_all_workspaces},
#if HAVE_GPL
{"gamma", mp_property_video_color},
{"brightness", mp_property_video_color},
{"contrast", mp_property_video_color},
@ -3976,6 +3979,7 @@ static const struct m_property mp_properties_base[] = {
{"hue", mp_property_video_color},
{"video-output-levels", mp_property_video_color,
.priv = (void *)"output-levels"},
#endif
{"video-out-params", mp_property_vo_imgparams},
{"video-dec-params", mp_property_dec_imgparams},
{"video-params", mp_property_vd_imgparams},

4
player/video.c
View File

@ -68,6 +68,7 @@ static const char av_desync_help_text[] =
"position will not match to the video (see A-V status field).\n"
"\n";
#if HAVE_GPL
int video_set_colors(struct vo_chain *vo_c, const char *item, int value)
{
vf_equalizer_t data;
@ -96,6 +97,7 @@ int video_get_colors(struct vo_chain *vo_c, const char *item, int *value)
}
return 0;
}
#endif
// Send a VCTRL, or if it doesn't work, translate it to a VOCTRL and try the VO.
int video_vf_vo_control(struct vo_chain *vo_c, int vf_cmd, void *data)
@ -992,6 +994,7 @@ static void init_vo(struct MPContext *mpctx)
struct MPOpts *opts = mpctx->opts;
struct vo_chain *vo_c = mpctx->vo_chain;
#if HAVE_GPL
if (opts->gamma_gamma != 0)
video_set_colors(vo_c, "gamma", opts->gamma_gamma);
if (opts->gamma_brightness != 0)
@ -1003,6 +1006,7 @@ static void init_vo(struct MPContext *mpctx)
if (opts->gamma_hue != 0)
video_set_colors(vo_c, "hue", opts->gamma_hue);
video_set_colors(vo_c, "output-levels", opts->video_output_levels);
#endif
mp_notify(mpctx, MPV_EVENT_VIDEO_RECONFIG, NULL);
}