To be useful for adaptive thresholding with threshold filter.
Unified · Split
| @@ -16623,6 +16623,10 @@ video streams. · 16622 unmodified lines | |||
| 16623 | Set which planes will be processed as bitmap, unprocessed planes will be | 16623 | Set which planes will be processed as bitmap, unprocessed planes will be |
| 16624 | copied from second stream. | 16624 | copied from second stream. |
| 16625 | By default value 0xf, all planes will be processed. | 16625 | By default value 0xf, all planes will be processed. |
| 16626 | |||
| 16627 | @item mode | ||
| 16628 | Set mode of filter operation. Can be @code{abs} or @code{diff}. | ||
| 16629 | Default is @code{abs}. | ||
| 16626 | @end table | 16630 | @end table |
| 16627 | 16631 | ||
| 16628 | @subsection Commands | 16632 | @subsection Commands |
| @@ -32,6 +32,7 @@ typedef struct MaskedThresholdContext { · 31 unmodified lines | |||
| 32 | 32 | ||
| 33 | int threshold; | 33 | int threshold; |
| 34 | int planes; | 34 | int planes; |
| 35 | int mode; | ||
| 35 | 36 | ||
| 36 | int linesize[4]; | 37 | int linesize[4]; |
| 37 | int planewidth[4], planeheight[4]; | 38 | int planewidth[4], planeheight[4]; |
| @@ -43,15 +44,19 @@ typedef struct MaskedThresholdContext { · 5 unmodified lines | |||
| 43 | } MaskedThresholdContext; | 44 | } MaskedThresholdContext; |
| 44 | 45 | ||
| 45 | #define OFFSET(x) offsetof(MaskedThresholdContext, x) | 46 | #define OFFSET(x) offsetof(MaskedThresholdContext, x) |
| 46 | #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_RUNTIME_PARAM | 47 | #define TFLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_RUNTIME_PARAM |
| 48 | #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM | ||
| 47 | 49 | ||
| 48 | typedef struct ThreadData { | 50 | typedef struct ThreadData { |
| 49 | AVFrame *src, *ref, *dst; | 51 | AVFrame *src, *ref, *dst; |
| 50 | } ThreadData; | 52 | } ThreadData; |
| 51 | 53 | ||
| 52 | static const AVOption maskedthreshold_options[] = { | 54 | static const AVOption maskedthreshold_options[] = { |
| 53 | { "threshold", "set threshold", OFFSET(threshold), AV_OPT_TYPE_INT, {.i64=1}, 0, UINT16_MAX, FLAGS }, | 55 | { "threshold", "set threshold", OFFSET(threshold), AV_OPT_TYPE_INT, {.i64=1}, 0, UINT16_MAX, TFLAGS }, |
| 54 | { "planes", "set planes", OFFSET(planes), AV_OPT_TYPE_INT, {.i64=0xF}, 0, 0xF, FLAGS }, | 56 | { "planes", "set planes", OFFSET(planes), AV_OPT_TYPE_INT, {.i64=0xF}, 0, 0xF, TFLAGS }, |
| 57 | { "mode", "set mode", OFFSET(mode), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, FLAGS, "mode" }, | ||
| 58 | { "abs", "", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "mode" }, | ||
| 59 | { "diff", "", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "mode" }, | ||
| 55 | { NULL } | 60 | { NULL } |
| 56 | }; | 61 | }; |
| 57 | 62 | ||
| @@ -77,13 +82,29 @@ static const enum AVPixelFormat pix_fmts[] = { · 19 unmodified lines | |||
| 77 | AV_PIX_FMT_NONE | 82 | AV_PIX_FMT_NONE |
| 78 | }; | 83 | }; |
| 79 | 84 | ||
| 80 | static void threshold8(const uint8_t *src, const uint8_t *ref, uint8_t *dst, int threshold, int w) | 85 | static void threshold8_diff(const uint8_t *src, const uint8_t *ref, uint8_t *dst, int threshold, int w) |
| 86 | { | ||
| 87 | for (int x = 0; x < w; x++) | ||
| 88 | dst[x] = (ref[x] - src[x] <= threshold) ? FFMAX(ref[x] - threshold, 0): src[x]; | ||
| 89 | } | ||
| 90 | |||
| 91 | static void threshold8_abs(const uint8_t *src, const uint8_t *ref, uint8_t *dst, int threshold, int w) | ||
| 81 | { | 92 | { |
| 82 | for (int x = 0; x < w; x++) | 93 | for (int x = 0; x < w; x++) |
| 83 | dst[x] = FFABS(src[x] - ref[x]) <= threshold ? src[x] : ref[x]; | 94 | dst[x] = FFABS(src[x] - ref[x]) <= threshold ? src[x] : ref[x]; |
| 84 | } | 95 | } |
| 85 | 96 | ||
| 86 | static void threshold16(const uint8_t *ssrc, const uint8_t *rref, uint8_t *ddst, int threshold, int w) | 97 | static void threshold16_diff(const uint8_t *ssrc, const uint8_t *rref, uint8_t *ddst, int threshold, int w) |
| 98 | { | ||
| 99 | const uint16_t *src = (const uint16_t *)ssrc; | ||
| 100 | const uint16_t *ref = (const uint16_t *)rref; | ||
| 101 | uint16_t *dst = (uint16_t *)ddst; | ||
| 102 | |||
| 103 | for (int x = 0; x < w; x++) | ||
| 104 | dst[x] = (ref[x] - src[x] <= threshold) ? FFMAX(ref[x] - threshold, 0): src[x]; | ||
| 105 | } | ||
| 106 | |||
| 107 | static void threshold16_abs(const uint8_t *ssrc, const uint8_t *rref, uint8_t *ddst, int threshold, int w) | ||
| 87 | { | 108 | { |
| 88 | const uint16_t *src = (const uint16_t *)ssrc; | 109 | const uint16_t *src = (const uint16_t *)ssrc; |
| 89 | const uint16_t *ref = (const uint16_t *)rref; | 110 | const uint16_t *ref = (const uint16_t *)rref; |
| @@ -115,9 +136,9 @@ static int config_input(AVFilterLink *inlink) · 25 unmodified lines | |||
| 115 | s->depth = desc->comp[0].depth; | 136 | s->depth = desc->comp[0].depth; |
| 116 | 137 | ||
| 117 | if (desc->comp[0].depth == 8) | 138 | if (desc->comp[0].depth == 8) |
| 118 | s->maskedthreshold = threshold8; | 139 | s->maskedthreshold = s->mode ? threshold8_diff : threshold8_abs; |
| 119 | else | 140 | else |
| 120 | s->maskedthreshold = threshold16; | 141 | s->maskedthreshold = s->mode ? threshold16_diff : threshold16_abs; |
| 121 | 142 | ||
| 122 | return 0; | 143 | return 0; |
| 123 | } | 144 | } |