1
mirror of https://github.com/mpv-player/mpv synced 2024-08-04 14:59:58 +02:00

video/filter: remove useless vf_info fields

This time I didn't bother to move the contents of the author field to
the file headers. "git log" is your friend.
This commit is contained in:
wm4 2013-10-23 19:06:42 +02:00
parent c8930e80a8
commit 6d44a4dfd1
33 changed files with 96 additions and 178 deletions

View File

@ -126,7 +126,7 @@ static bool get_desc(struct m_obj_desc *dst, int index)
const vf_info_t *vf = filter_list[index];
*dst = (struct m_obj_desc) {
.name = vf->name,
.description = vf->info,
.description = vf->description,
.priv_size = vf->priv_size,
.priv_defaults = vf->priv_defaults,
.options = vf->options,
@ -254,7 +254,7 @@ static struct vf_instance *vf_open(struct MPOpts *opts, vf_instance_t *next,
if (m_config_initialize_obj(config, &desc, &priv, &args) < 0)
goto error;
vf->priv = priv;
int retcode = vf->info->vf_open(vf, (char *)args);
int retcode = vf->info->open(vf, (char *)args);
if (retcode < 1)
goto error;
return vf;

View File

@ -31,11 +31,9 @@ struct vf_instance;
struct vf_priv_s;
typedef struct vf_info {
const char *info;
const char *description;
const char *name;
const char *author;
const char *comment;
int (*vf_open)(struct vf_instance *vf, char *args);
int (*open)(struct vf_instance *vf, char *args);
void *damn_you;
int priv_size;
const void *priv_defaults;

View File

@ -104,11 +104,9 @@ static const m_option_t vf_opts_fields[] = {
};
const vf_info_t vf_info_crop = {
"cropping",
"crop",
"A'rpi",
"",
vf_open,
.description = "cropping",
.name = "crop",
.open = vf_open,
.priv_size = sizeof(struct vf_priv_s),
.priv_defaults = &vf_priv_dflt,
.options = vf_opts_fields,

View File

@ -316,11 +316,9 @@ static const m_option_t vf_opts_fields[] = {
};
const vf_info_t vf_info_delogo = {
"simple logo remover",
"delogo",
"Jindrich Makovicka, Alex Beregszaszi",
"",
vf_open,
.description = "simple logo remover",
.name = "delogo",
.open = vf_open,
.priv_size = sizeof(struct vf_priv_s),
.priv_defaults = &vf_priv_dflt,
.options = vf_opts_fields,

View File

@ -720,10 +720,7 @@ static int vf_open(vf_instance_t *vf, char *args)
const vf_info_t vf_info_divtc =
{
"inverse telecine for deinterlaced video",
"divtc",
"Ville Saari",
"",
vf_open,
NULL
.description = "inverse telecine for deinterlaced video",
.name = "divtc",
.open = vf_open,
};

View File

@ -375,11 +375,9 @@ static const m_option_t vf_opts_fields[] = {
};
const vf_info_t vf_info_dlopen = {
"Dynamic library filter",
"dlopen",
"Rudolf Polzer",
"",
vf_open,
.description = "Dynamic library filter",
.name = "dlopen",
.open = vf_open,
.priv_size = sizeof(struct vf_priv_s),
.priv_defaults = &vf_priv_dflt,
.options = vf_opts_fields,

View File

@ -150,10 +150,7 @@ static int vf_open(vf_instance_t *vf, char *args)
}
const vf_info_t vf_info_down3dright = {
"convert stereo movie from top-bottom to left-right field",
"down3dright",
"Zdenek Kabelac",
"",
vf_open,
NULL
.description = "convert stereo movie from top-bottom to left-right field",
.name = "down3dright",
.open = vf_open,
};

View File

@ -114,10 +114,7 @@ static int vf_open(vf_instance_t *vf, char *args)
}
const vf_info_t vf_info_dsize = {
"reset displaysize/aspect",
"dsize",
"Rich Felker",
"",
vf_open,
NULL
.description = "reset displaysize/aspect",
.name = "dsize",
.open = vf_open,
};

View File

@ -522,10 +522,7 @@ int vf_open(vf_instance_t *vf, char *args)
}
const vf_info_t vf_info_eq = {
"Software equalizer",
"eq",
"Hampa Hug, Daniel Moreno, Richard Felker",
"",
&vf_open,
NULL
.description = "Software equalizer",
.name = "eq",
.open = &vf_open,
};

View File

@ -175,11 +175,9 @@ static const m_option_t vf_opts_fields[] = {
};
const vf_info_t vf_info_expand = {
"expanding",
"expand",
"A'rpi",
"",
vf_open,
.description = "expanding",
.name = "expand",
.open = vf_open,
.priv_size = sizeof(struct vf_priv_s),
.priv_defaults = &vf_priv_dflt,
.options = vf_opts_fields,

View File

@ -59,12 +59,9 @@ static int vf_open(vf_instance_t *vf, char *args){
}
const vf_info_t vf_info_flip = {
"flip image upside-down",
"flip",
"A'rpi",
"",
vf_open,
NULL
.description = "flip image upside-down",
.name = "flip",
.open = vf_open,
};
//===========================================================================//

View File

@ -80,11 +80,9 @@ static const m_option_t vf_opts_fields[] = {
};
const vf_info_t vf_info_format = {
"force output format",
"format",
"A'rpi",
"FIXME! get_image()/put_image()",
vf_open,
.description = "force output format",
.name = "format",
.open = vf_open,
.priv_size = sizeof(struct vf_priv_s),
.priv_defaults = &vf_priv_dflt,
.options = vf_opts_fields,

View File

@ -401,11 +401,9 @@ static const m_option_t vf_opts_fields[] = {
};
const vf_info_t vf_info_gradfun = {
"gradient deband",
"gradfun",
"Loren Merritt",
"",
vf_open,
.description = "gradient deband",
.name = "gradfun",
.open = vf_open,
.priv_size = sizeof(struct vf_priv_s),
.priv_defaults = &vf_priv_dflt,
.options = vf_opts_fields,

View File

@ -356,12 +356,9 @@ static int vf_open(vf_instance_t *vf, char *args){
}
const vf_info_t vf_info_hqdn3d = {
"High Quality 3D Denoiser",
"hqdn3d",
"Daniel Moreno & A'rpi",
"",
vf_open,
NULL
.description = "High Quality 3D Denoiser",
.name = "hqdn3d",
.open = vf_open,
};
//===========================================================================//

View File

@ -444,10 +444,7 @@ static int vf_open(vf_instance_t *vf, char *args)
}
const vf_info_t vf_info_ilpack = {
"4:2:0 planar -> 4:2:2 packed reinterlacer",
"ilpack",
"Richard Felker",
"",
vf_open,
NULL
.description = "4:2:0 planar -> 4:2:2 packed reinterlacer",
.name = "ilpack",
.open = vf_open,
};

View File

@ -334,11 +334,9 @@ static const m_option_t vf_opts_fields[] = {
};
const vf_info_t vf_info_lavfi = {
"libavfilter bridge",
"lavfi",
"",
"",
vf_open,
.description = "libavfilter bridge",
.name = "lavfi",
.open = vf_open,
.priv_size = sizeof(struct vf_priv_s),
.priv_defaults = &vf_priv_dflt,
.options = vf_opts_fields,

View File

@ -103,12 +103,9 @@ static int vf_open(vf_instance_t *vf, char *args){
}
const vf_info_t vf_info_mirror = {
"horizontal mirror",
"mirror",
"Eyck",
"",
vf_open,
NULL
.description = "horizontal mirror",
.name = "mirror",
.open = vf_open,
};
//===========================================================================//

View File

@ -56,11 +56,9 @@ static const m_option_t vf_opts_fields[] = {
};
const vf_info_t vf_info_noformat = {
"disallow one output format",
"noformat",
"Joey",
"",
vf_open,
.description = "disallow one output format",
.name = "noformat",
.open = vf_open,
.priv_size = sizeof(struct vf_priv_s),
.priv_defaults = &vf_priv_dflt,
.options = vf_opts_fields,

View File

@ -431,12 +431,9 @@ static int vf_open(vf_instance_t *vf, char *args){
}
const vf_info_t vf_info_noise = {
"noise generator",
"noise",
"Michael Niedermayer",
"",
vf_open,
NULL
.description = "noise generator",
.name = "noise",
.open = vf_open,
};
//===========================================================================//

View File

@ -290,10 +290,7 @@ static int vf_open(vf_instance_t *vf, char *args)
const vf_info_t vf_info_phase =
{
"phase shift fields",
"phase",
"Ville Saari",
"",
vf_open,
NULL
.description = "phase shift fields",
.name = "phase",
.open = vf_open,
};

View File

@ -166,12 +166,9 @@ static int vf_open(vf_instance_t *vf, char *args){
}
const vf_info_t vf_info_pp = {
"postprocessing",
"pp",
"A'rpi",
"",
vf_open,
NULL
.description = "postprocessing",
.name = "pp",
.open = vf_open,
};
//===========================================================================//

View File

@ -263,10 +263,7 @@ static int vf_open(vf_instance_t *vf, char *args)
}
const vf_info_t vf_info_pullup = {
"pullup (from field sequence to frames)",
"pullup",
"Rich Felker",
"",
vf_open,
NULL
.description = "pullup (from field sequence to frames)",
.name = "pullup",
.open = vf_open,
};

View File

@ -125,12 +125,9 @@ static int vf_open(vf_instance_t *vf, char *args){
}
const vf_info_t vf_info_rotate = {
"rotate",
"rotate",
"A'rpi",
"",
vf_open,
NULL
.description = "rotate",
.name = "rotate",
.open = vf_open,
};
//===========================================================================//

View File

@ -426,11 +426,9 @@ static const m_option_t vf_opts_fields[] = {
};
const vf_info_t vf_info_scale = {
"software scaling",
"scale",
"A'rpi",
"",
vf_open,
.description = "software scaling",
.name = "scale",
.open = vf_open,
.priv_size = sizeof(struct vf_priv_s),
.priv_defaults = &vf_priv_dflt,
.options = vf_opts_fields,

View File

@ -84,10 +84,7 @@ static int vf_open(vf_instance_t *vf, char *args)
}
const vf_info_t vf_info_screenshot = {
"screenshot to file",
"screenshot",
"A'rpi, Jindrich Makovicka",
"",
vf_open,
NULL
.description = "screenshot to file",
.name = "screenshot",
.open = vf_open,
};

View File

@ -163,10 +163,7 @@ static int vf_open(vf_instance_t *vf, char *args)
}
const vf_info_t vf_info_softpulldown = {
"mpeg2 soft 3:2 pulldown",
"softpulldown",
"Tobias Diedrich <ranma+mplayer@tdiedrich.de>",
"",
vf_open,
NULL
.description = "mpeg2 soft 3:2 pulldown",
.name = "softpulldown",
.open = vf_open,
};

View File

@ -465,11 +465,9 @@ static const m_option_t vf_opts_fields[] = {
//==info struct==//
const vf_info_t vf_info_stereo3d = {
"stereoscopic 3d view",
"stereo3d",
"Gordon Schmidt",
"view stereoscopic videos",
vf_open,
.description = "stereoscopic 3d view",
.name = "stereo3d",
.open = vf_open,
.priv_size = sizeof(struct vf_priv_s),
.priv_defaults = &vf_priv_default,
.options = vf_opts_fields,

View File

@ -147,11 +147,9 @@ static const m_option_t vf_opts_fields[] = {
};
const vf_info_t vf_info_sub = {
"Render subtitles",
"sub",
"Evgeniy Stepanov",
"",
vf_open,
.description = "Render subtitles",
.name = "sub",
.open = vf_open,
.priv_size = sizeof(struct vf_priv_s),
.priv_defaults = &vf_priv_dflt,
.options = vf_opts_fields,

View File

@ -56,12 +56,9 @@ static int vf_open(vf_instance_t *vf, char *args){
}
const vf_info_t vf_info_swapuv = {
"UV swapper",
"swapuv",
"Michael Niedermayer",
"",
vf_open,
NULL
.description = "UV swapper",
.name = "swapuv",
.open = vf_open,
};
//===========================================================================//

View File

@ -285,12 +285,9 @@ static int vf_open( vf_instance_t *vf, char *args ) {
}
const vf_info_t vf_info_unsharp = {
"unsharp mask & gaussian blur",
"unsharp",
"Remi Guyomarch",
"",
vf_open,
NULL
.description = "unsharp mask & gaussian blur",
.name = "unsharp",
.open = vf_open,
};
//===========================================================================//

View File

@ -395,11 +395,9 @@ static const m_option_t vf_opts_fields[] = {
};
const vf_info_t vf_info_vaapi = {
.info = "VA-API Video Post-Process Filter",
.description = "VA-API Video Post-Process Filter",
.name = "vavpp",
.author = "xylosper",
.comment = "",
.vf_open = vf_open,
.open = vf_open,
.priv_size = sizeof(struct vf_priv_s),
.priv_defaults = &vf_priv_default,
.options = vf_opts_fields,

View File

@ -115,10 +115,7 @@ static int vf_open(vf_instance_t *vf, char *args)
}
const vf_info_t vf_info_vo = {
"libvo wrapper",
"vo",
"A'rpi",
"for internal use",
vf_open,
NULL
.description = "libvo wrapper",
.name = "vo",
.open = vf_open,
};

View File

@ -524,11 +524,9 @@ static const m_option_t vf_opts_fields[] = {
};
const vf_info_t vf_info_yadif = {
"Yet Another DeInterlacing Filter",
"yadif",
"Michael Niedermayer",
"",
vf_open,
.description = "Yet Another DeInterlacing Filter",
.name = "yadif",
.open = vf_open,
.priv_size = sizeof(struct vf_priv_s),
.priv_defaults = &vf_priv_default,
.options = vf_opts_fields,