har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/vf_datascope: pixscope: add commands support

Browse Source
This commit is contained in:
Paul B Mahol 2021-02-13 12:32:59 +01:00
parent 59bb9dc2a6
commit bbf6183e11
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/filters.texi
View File

@ -16218,6 +16218,10 @@ Set window X position, relative offset on X axis.
Set window Y position, relative offset on Y axis. Set window Y position, relative offset on Y axis.
@end table @end table
@subsection Commands
This filter supports same @ref{commands} as options.
@section pp @section pp
Enable the specified chain of postprocessing subfilters using libpostproc. This Enable the specified chain of postprocessing subfilters using libpostproc. This

27
libavfilter/vf_datascope.c
View File

@ -494,13 +494,13 @@ typedef struct PixscopeContext {
#define POFFSET(x) offsetof(PixscopeContext, x) #define POFFSET(x) offsetof(PixscopeContext, x)
static const AVOption pixscope_options[] = { static const AVOption pixscope_options[] = {
{ "x", "set scope x offset", POFFSET(xpos), AV_OPT_TYPE_FLOAT, {.dbl=0.5}, 0, 1, FLAGS }, { "x", "set scope x offset", POFFSET(xpos), AV_OPT_TYPE_FLOAT, {.dbl=0.5}, 0, 1, FLAGSR },
{ "y", "set scope y offset", POFFSET(ypos), AV_OPT_TYPE_FLOAT, {.dbl=0.5}, 0, 1, FLAGS }, { "y", "set scope y offset", POFFSET(ypos), AV_OPT_TYPE_FLOAT, {.dbl=0.5}, 0, 1, FLAGSR },
{ "w", "set scope width", POFFSET(w), AV_OPT_TYPE_INT, {.i64=7}, 1, 80, FLAGS }, { "w", "set scope width", POFFSET(w), AV_OPT_TYPE_INT, {.i64=7}, 1, 80, FLAGSR },
{ "h", "set scope height", POFFSET(h), AV_OPT_TYPE_INT, {.i64=7}, 1, 80, FLAGS }, { "h", "set scope height", POFFSET(h), AV_OPT_TYPE_INT, {.i64=7}, 1, 80, FLAGSR },
{ "o", "set window opacity", POFFSET(o), AV_OPT_TYPE_FLOAT, {.dbl=0.5}, 0, 1, FLAGS }, { "o", "set window opacity", POFFSET(o), AV_OPT_TYPE_FLOAT, {.dbl=0.5}, 0, 1, FLAGSR },
{ "wx", "set window x offset", POFFSET(wx), AV_OPT_TYPE_FLOAT, {.dbl=-1}, -1, 1, FLAGS }, { "wx", "set window x offset", POFFSET(wx), AV_OPT_TYPE_FLOAT, {.dbl=-1}, -1, 1, FLAGSR },
{ "wy", "set window y offset", POFFSET(wy), AV_OPT_TYPE_FLOAT, {.dbl=-1}, -1, 1, FLAGS }, { "wy", "set window y offset", POFFSET(wy), AV_OPT_TYPE_FLOAT, {.dbl=-1}, -1, 1, FLAGSR },
{ NULL } { NULL }
}; };
@ -709,6 +709,18 @@ static int pixscope_filter_frame(AVFilterLink *inlink, AVFrame *in)
return ff_filter_frame(outlink, out); return ff_filter_frame(outlink, out);
} }
static int pixscope_process_command(AVFilterContext *ctx, const char *cmd, const char *args,
char *res, int res_len, int flags)
{
int ret;
ret = ff_filter_process_command(ctx, cmd, args, res, res_len, flags);
if (ret < 0)
return ret;
return pixscope_config_input(ctx->inputs[0]);
}
static const AVFilterPad pixscope_inputs[] = { static const AVFilterPad pixscope_inputs[] = {
{ {
.name = "default", .name = "default",
@ -736,6 +748,7 @@ AVFilter ff_vf_pixscope = {
.inputs = pixscope_inputs, .inputs = pixscope_inputs,
.outputs = pixscope_outputs, .outputs = pixscope_outputs,
.flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC,
.process_command = pixscope_process_command,
}; };
typedef struct PixelValues { typedef struct PixelValues {