Unified · Split
| @@ -85,6 +85,7 @@ typedef struct VectorscopeContext { · 84 unmodified lines | ||
| 85 | 85 | |
| 86 | 86 | #define OFFSET(x) offsetof(VectorscopeContext, x) |
| 87 | 87 | #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM |
| 88 | +#define TFLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_RUNTIME_PARAM | |
| 88 | 89 | |
| 89 | 90 | static const AVOption vectorscope_options[] = { |
| 90 | 91 | { "mode", "set vectorscope mode", OFFSET(mode), AV_OPT_TYPE_INT, {.i64=0}, 0, MODE_NB-1, FLAGS, "mode"}, |
| @@ -98,29 +99,29 @@ static const AVOption vectorscope_options[] = { · 7 unmodified lines | ||
| 98 | 99 | { "color5", 0, 0, AV_OPT_TYPE_CONST, {.i64=COLOR5}, 0, 0, FLAGS, "mode" }, |
| 99 | 100 | { "x", "set color component on X axis", OFFSET(x), AV_OPT_TYPE_INT, {.i64=1}, 0, 2, FLAGS}, |
| 100 | 101 | { "y", "set color component on Y axis", OFFSET(y), AV_OPT_TYPE_INT, {.i64=2}, 0, 2, FLAGS}, |
| 101 | − { "intensity", "set intensity", OFFSET(fintensity), AV_OPT_TYPE_FLOAT, {.dbl=0.004}, 0, 1, FLAGS}, | |
| 102 | − { "i", "set intensity", OFFSET(fintensity), AV_OPT_TYPE_FLOAT, {.dbl=0.004}, 0, 1, FLAGS}, | |
| 103 | − { "envelope", "set envelope", OFFSET(envelope), AV_OPT_TYPE_INT, {.i64=0}, 0, 3, FLAGS, "envelope"}, | |
| 104 | − { "e", "set envelope", OFFSET(envelope), AV_OPT_TYPE_INT, {.i64=0}, 0, 3, FLAGS, "envelope"}, | |
| 105 | − { "none", 0, 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "envelope" }, | |
| 106 | − { "instant", 0, 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "envelope" }, | |
| 107 | − { "peak", 0, 0, AV_OPT_TYPE_CONST, {.i64=2}, 0, 0, FLAGS, "envelope" }, | |
| 108 | − { "peak+instant", 0, 0, AV_OPT_TYPE_CONST, {.i64=3}, 0, 0, FLAGS, "envelope" }, | |
| 102 | + { "intensity", "set intensity", OFFSET(fintensity), AV_OPT_TYPE_FLOAT, {.dbl=0.004}, 0, 1, TFLAGS}, | |
| 103 | + { "i", "set intensity", OFFSET(fintensity), AV_OPT_TYPE_FLOAT, {.dbl=0.004}, 0, 1, TFLAGS}, | |
| 104 | + { "envelope", "set envelope", OFFSET(envelope), AV_OPT_TYPE_INT, {.i64=0}, 0, 3, TFLAGS, "envelope"}, | |
| 105 | + { "e", "set envelope", OFFSET(envelope), AV_OPT_TYPE_INT, {.i64=0}, 0, 3, TFLAGS, "envelope"}, | |
| 106 | + { "none", 0, 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, TFLAGS, "envelope" }, | |
| 107 | + { "instant", 0, 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, TFLAGS, "envelope" }, | |
| 108 | + { "peak", 0, 0, AV_OPT_TYPE_CONST, {.i64=2}, 0, 0, TFLAGS, "envelope" }, | |
| 109 | + { "peak+instant", 0, 0, AV_OPT_TYPE_CONST, {.i64=3}, 0, 0, TFLAGS, "envelope" }, | |
| 109 | 110 | { "graticule", "set graticule", OFFSET(graticule), AV_OPT_TYPE_INT, {.i64=GRAT_NONE}, 0, NB_GRATICULES-1, FLAGS, "graticule"}, |
| 110 | 111 | { "g", "set graticule", OFFSET(graticule), AV_OPT_TYPE_INT, {.i64=GRAT_NONE}, 0, NB_GRATICULES-1, FLAGS, "graticule"}, |
| 111 | 112 | { "none", 0, 0, AV_OPT_TYPE_CONST, {.i64=GRAT_NONE}, 0, 0, FLAGS, "graticule" }, |
| 112 | 113 | { "green", 0, 0, AV_OPT_TYPE_CONST, {.i64=GRAT_GREEN}, 0, 0, FLAGS, "graticule" }, |
| 113 | 114 | { "color", 0, 0, AV_OPT_TYPE_CONST, {.i64=GRAT_COLOR}, 0, 0, FLAGS, "graticule" }, |
| 114 | 115 | { "invert", 0, 0, AV_OPT_TYPE_CONST, {.i64=GRAT_INVERT},0, 0, FLAGS, "graticule" }, |
| 115 | − { "opacity", "set graticule opacity", OFFSET(opacity), AV_OPT_TYPE_FLOAT, {.dbl=0.75}, 0, 1, FLAGS}, | |
| 116 | − { "o", "set graticule opacity", OFFSET(opacity), AV_OPT_TYPE_FLOAT, {.dbl=0.75}, 0, 1, FLAGS}, | |
| 117 | − { "flags", "set graticule flags", OFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64=4}, 0, 7, FLAGS, "flags"}, | |
| 118 | − { "f", "set graticule flags", OFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64=4}, 0, 7, FLAGS, "flags"}, | |
| 119 | − { "white", "draw white point", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "flags" }, | |
| 120 | − { "black", "draw black point", 0, AV_OPT_TYPE_CONST, {.i64=2}, 0, 0, FLAGS, "flags" }, | |
| 121 | − { "name", "draw point name", 0, AV_OPT_TYPE_CONST, {.i64=4}, 0, 0, FLAGS, "flags" }, | |
| 122 | − { "bgopacity", "set background opacity", OFFSET(bgopacity), AV_OPT_TYPE_FLOAT, {.dbl=0.3}, 0, 1, FLAGS}, | |
| 123 | − { "b", "set background opacity", OFFSET(bgopacity), AV_OPT_TYPE_FLOAT, {.dbl=0.3}, 0, 1, FLAGS}, | |
| 116 | + { "opacity", "set graticule opacity", OFFSET(opacity), AV_OPT_TYPE_FLOAT, {.dbl=0.75}, 0, 1, TFLAGS}, | |
| 117 | + { "o", "set graticule opacity", OFFSET(opacity), AV_OPT_TYPE_FLOAT, {.dbl=0.75}, 0, 1, TFLAGS}, | |
| 118 | + { "flags", "set graticule flags", OFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64=4}, 0, 7, TFLAGS, "flags"}, | |
| 119 | + { "f", "set graticule flags", OFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64=4}, 0, 7, TFLAGS, "flags"}, | |
| 120 | + { "white", "draw white point", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, TFLAGS, "flags" }, | |
| 121 | + { "black", "draw black point", 0, AV_OPT_TYPE_CONST, {.i64=2}, 0, 0, TFLAGS, "flags" }, | |
| 122 | + { "name", "draw point name", 0, AV_OPT_TYPE_CONST, {.i64=4}, 0, 0, TFLAGS, "flags" }, | |
| 123 | + { "bgopacity", "set background opacity", OFFSET(bgopacity), AV_OPT_TYPE_FLOAT, {.dbl=0.3}, 0, 1, TFLAGS}, | |
| 124 | + { "b", "set background opacity", OFFSET(bgopacity), AV_OPT_TYPE_FLOAT, {.dbl=0.3}, 0, 1, TFLAGS}, | |
| 124 | 125 | { "lthreshold", "set low threshold", OFFSET(lthreshold), AV_OPT_TYPE_FLOAT, {.dbl=0}, 0, 1, FLAGS}, |
| 125 | 126 | { "l", "set low threshold", OFFSET(lthreshold), AV_OPT_TYPE_FLOAT, {.dbl=0}, 0, 1, FLAGS}, |
| 126 | 127 | { "hthreshold", "set high threshold", OFFSET(hthreshold), AV_OPT_TYPE_FLOAT, {.dbl=1}, 0, 1, FLAGS}, |
| @@ -130,10 +131,10 @@ static const AVOption vectorscope_options[] = { · 3 unmodified lines | ||
| 130 | 131 | { "auto", 0, 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "colorspace" }, |
| 131 | 132 | { "601", 0, 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "colorspace" }, |
| 132 | 133 | { "709", 0, 0, AV_OPT_TYPE_CONST, {.i64=2}, 0, 0, FLAGS, "colorspace" }, |
| 133 | − { "tint0", "set 1st tint", OFFSET(ftint[0]), AV_OPT_TYPE_FLOAT, {.dbl=0}, -1, 1, FLAGS}, | |
| 134 | − { "t0", "set 1st tint", OFFSET(ftint[0]), AV_OPT_TYPE_FLOAT, {.dbl=0}, -1, 1, FLAGS}, | |
| 135 | − { "tint1", "set 2nd tint", OFFSET(ftint[1]), AV_OPT_TYPE_FLOAT, {.dbl=0}, -1, 1, FLAGS}, | |
| 136 | − { "t1", "set 2nd tint", OFFSET(ftint[1]), AV_OPT_TYPE_FLOAT, {.dbl=0}, -1, 1, FLAGS}, | |
| 134 | + { "tint0", "set 1st tint", OFFSET(ftint[0]), AV_OPT_TYPE_FLOAT, {.dbl=0}, -1, 1, TFLAGS}, | |
| 135 | + { "t0", "set 1st tint", OFFSET(ftint[0]), AV_OPT_TYPE_FLOAT, {.dbl=0}, -1, 1, TFLAGS}, | |
| 136 | + { "tint1", "set 2nd tint", OFFSET(ftint[1]), AV_OPT_TYPE_FLOAT, {.dbl=0}, -1, 1, TFLAGS}, | |
| 137 | + { "t1", "set 2nd tint", OFFSET(ftint[1]), AV_OPT_TYPE_FLOAT, {.dbl=0}, -1, 1, TFLAGS}, | |
| 137 | 138 | { NULL } |
| 138 | 139 | }; |
| 139 | 140 | |
| @@ -272,7 +273,6 @@ static int config_output(AVFilterLink *outlink) · 132 unmodified lines | ||
| 272 | 273 | VectorscopeContext *s = outlink->src->priv; |
| 273 | 274 | int i; |
| 274 | 275 | |
| 275 | − s->intensity = s->fintensity * (s->size - 1); | |
| 276 | 276 | outlink->h = outlink->w = s->size; |
| 277 | 277 | outlink->sample_aspect_ratio = (AVRational){1,1}; |
| 278 | 278 | |
| @@ -1442,6 +1442,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 1163 unmodified lines | ||
| 1442 | 1442 | AVFrame *out; |
| 1443 | 1443 | int plane; |
| 1444 | 1444 | |
| 1445 | + s->bg_color[3] = s->bgopacity * (s->size - 1); | |
| 1446 | + | |
| 1447 | + s->tint[0] = .5f * (s->ftint[0] + 1.f) * (s->size - 1); | |
| 1448 | + s->tint[1] = .5f * (s->ftint[1] + 1.f) * (s->size - 1); | |
| 1449 | + | |
| 1450 | + s->intensity = s->fintensity * (s->size - 1); | |
| 1451 | + | |
| 1445 | 1452 | if (s->colorspace) { |
| 1446 | 1453 | s->cs = (s->depth - 8) * 2 + s->colorspace - 1; |
| 1447 | 1454 | } else { |
| @@ -1529,11 +1536,6 @@ static int config_input(AVFilterLink *inlink) · 81 unmodified lines | ||
| 1529 | 1536 | s->graticulef = invert_graticule16; |
| 1530 | 1537 | } |
| 1531 | 1538 | |
| 1532 | − s->bg_color[3] = s->bgopacity * (s->size - 1); | |
| 1533 | − | |
| 1534 | − s->tint[0] = .5f * (s->ftint[0] + 1.f) * (s->size - 1); | |
| 1535 | − s->tint[1] = .5f * (s->ftint[1] + 1.f) * (s->size - 1); | |
| 1536 | − | |
| 1537 | 1539 | switch (inlink->format) { |
| 1538 | 1540 | case AV_PIX_FMT_GBRP12: |
| 1539 | 1541 | case AV_PIX_FMT_GBRP10: |
| @@ -1594,4 +1596,5 @@ const AVFilter ff_vf_vectorscope = { · 54 unmodified lines | ||
| 1594 | 1596 | FILTER_INPUTS(inputs), |
| 1595 | 1597 | FILTER_OUTPUTS(outputs), |
| 1596 | 1598 | FILTER_QUERY_FUNC(query_formats), |
| 1599 | + .process_command = ff_filter_process_command, | |
| 1597 | 1600 | }; |