mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
avfilter/vf_grayworld: Remove empty options and AVClass
This filter only had an AVClass and empty options because up until recently, avfilter_init_str() errored out when options were provided for a filter without an AVClass. But setting (generic) options is necessary to take advantage of timeline support. So with avfilter_init_str() fixed, the AVClass and the options can be removed. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
parent
de288e406a
commit
8d3fdb42c0
@ -27,7 +27,6 @@
|
|||||||
|
|
||||||
#include "libavutil/imgutils.h"
|
#include "libavutil/imgutils.h"
|
||||||
#include "libavutil/mem.h"
|
#include "libavutil/mem.h"
|
||||||
#include "libavutil/opt.h"
|
|
||||||
|
|
||||||
#include "avfilter.h"
|
#include "avfilter.h"
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
@ -41,20 +40,11 @@ typedef struct ThreadData {
|
|||||||
} ThreadData;
|
} ThreadData;
|
||||||
|
|
||||||
typedef struct GrayWorldContext {
|
typedef struct GrayWorldContext {
|
||||||
const AVClass *class;
|
|
||||||
float *tmpplab;
|
float *tmpplab;
|
||||||
int *line_count_pels;
|
int *line_count_pels;
|
||||||
float *line_sum;
|
float *line_sum;
|
||||||
} GrayWorldContext;
|
} GrayWorldContext;
|
||||||
|
|
||||||
#define OFFSET(x) offsetof(GrayWorldContext, x)
|
|
||||||
#define FLAGS AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_RUNTIME_PARAM
|
|
||||||
static const AVOption grayworld_options[] = {
|
|
||||||
{ NULL }
|
|
||||||
};
|
|
||||||
|
|
||||||
AVFILTER_DEFINE_CLASS(grayworld);
|
|
||||||
|
|
||||||
static void apply_matrix(const float matrix[3][3], const float input[3], float output[3])
|
static void apply_matrix(const float matrix[3][3], const float input[3], float output[3])
|
||||||
{
|
{
|
||||||
output[0] = matrix[0][0] * input[0] + matrix[0][1] * input[1] + matrix[0][2] * input[2];
|
output[0] = matrix[0][0] * input[0] + matrix[0][1] * input[1] + matrix[0][2] * input[2];
|
||||||
@ -311,7 +301,6 @@ const AVFilter ff_vf_grayworld = {
|
|||||||
.name = "grayworld",
|
.name = "grayworld",
|
||||||
.description = NULL_IF_CONFIG_SMALL("Adjust white balance using LAB gray world algorithm"),
|
.description = NULL_IF_CONFIG_SMALL("Adjust white balance using LAB gray world algorithm"),
|
||||||
.priv_size = sizeof(GrayWorldContext),
|
.priv_size = sizeof(GrayWorldContext),
|
||||||
.priv_class = &grayworld_class,
|
|
||||||
FILTER_INPUTS(grayworld_inputs),
|
FILTER_INPUTS(grayworld_inputs),
|
||||||
FILTER_OUTPUTS(ff_video_default_filterpad),
|
FILTER_OUTPUTS(ff_video_default_filterpad),
|
||||||
FILTER_PIXFMTS(AV_PIX_FMT_GBRPF32, AV_PIX_FMT_GBRAPF32),
|
FILTER_PIXFMTS(AV_PIX_FMT_GBRPF32, AV_PIX_FMT_GBRAPF32),
|
||||||
|
Loading…
Reference in New Issue
Block a user