X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvf_waveform.c;h=bcee57cf3b0565c16aee3df5719c4730bde0055f;hb=50ae1f7e0ff1fa00236622415039f7e28d919a25;hp=02a7046f33d43c354c22125a3dea36e83de80320;hpb=b656fa710a34ec7c3b192c38344a2c470ff2eaf5;p=ffmpeg diff --git a/libavfilter/vf_waveform.c b/libavfilter/vf_waveform.c index 02a7046f33d..bcee57cf3b0 100644 --- a/libavfilter/vf_waveform.c +++ b/libavfilter/vf_waveform.c @@ -29,6 +29,14 @@ #include "internal.h" #include "video.h" +typedef struct ThreadData { + AVFrame *in; + AVFrame *out; + int component; + int offset_y; + int offset_x; +} ThreadData; + enum FilterType { LOWPASS, FLAT, @@ -36,6 +44,7 @@ enum FilterType { CHROMA, COLOR, ACOLOR, + XFLAT, NB_FILTERS }; @@ -89,14 +98,13 @@ typedef struct WaveformContext { int max; int size; int scale; + uint8_t grat_yuva_color[4]; int shift_w[4], shift_h[4]; GraticuleLines *glines; int nb_glines; - void (*waveform)(struct WaveformContext *s, - AVFrame *in, AVFrame *out, - int component, int intensity, - int offset_y, int offset_x, - int column, int mirror); + + int (*waveform_slice)(AVFilterContext *ctx, void *arg, + int jobnr, int nb_jobs); void (*graticulef)(struct WaveformContext *s, AVFrame *out); const AVPixFmtDescriptor *desc; const AVPixFmtDescriptor *odesc; @@ -135,10 +143,12 @@ static const AVOption waveform_options[] = { { "chroma", NULL, 0, AV_OPT_TYPE_CONST, {.i64=CHROMA}, 0, 0, FLAGS, "filter" }, { "color", NULL, 0, AV_OPT_TYPE_CONST, {.i64=COLOR}, 0, 0, FLAGS, "filter" }, { "acolor", NULL, 0, AV_OPT_TYPE_CONST, {.i64=ACOLOR}, 0, 0, FLAGS, "filter" }, - { "graticule", "set graticule", OFFSET(graticule), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, FLAGS, "graticule" }, - { "g", "set graticule", OFFSET(graticule), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, FLAGS, "graticule" }, - { "none", NULL, 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "graticule" }, - { "green", NULL, 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "graticule" }, + { "xflat", NULL, 0, AV_OPT_TYPE_CONST, {.i64=XFLAT}, 0, 0, FLAGS, "filter" }, + { "graticule", "set graticule", OFFSET(graticule), AV_OPT_TYPE_INT, {.i64=0}, 0, 2, FLAGS, "graticule" }, + { "g", "set graticule", OFFSET(graticule), AV_OPT_TYPE_INT, {.i64=0}, 0, 2, FLAGS, "graticule" }, + { "none", NULL, 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "graticule" }, + { "green", NULL, 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "graticule" }, + { "orange", NULL, 0, AV_OPT_TYPE_CONST, {.i64=2}, 0, 0, FLAGS, "graticule" }, { "opacity", "set graticule opacity", OFFSET(opacity), AV_OPT_TYPE_FLOAT, {.dbl=0.75}, 0, 1, FLAGS }, { "o", "set graticule opacity", OFFSET(opacity), AV_OPT_TYPE_FLOAT, {.dbl=0.75}, 0, 1, FLAGS }, { "flags", "set graticule flags", OFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64=1}, 0, 3, FLAGS, "flags" }, @@ -291,6 +301,7 @@ static int query_formats(AVFilterContext *ctx) switch (s->filter) { case LOWPASS: in_pix_fmts = in_lowpass_pix_fmts; break; case CHROMA: + case XFLAT: case AFLAT: case FLAT: in_pix_fmts = in_flat_pix_fmts; break; case ACOLOR: @@ -619,11 +630,28 @@ static void update(uint8_t *target, int max, int intensity) *target = 255; } +static void update_cr(uint8_t *target, int unused, int intensity) +{ + if (*target - intensity > 0) + *target -= intensity; + else + *target = 0; +} + +static void update16_cr(uint16_t *target, int unused, int intensity, int limit) +{ + if (*target - intensity > 0) + *target -= intensity; + else + *target = 0; +} + static av_always_inline void lowpass16(WaveformContext *s, AVFrame *in, AVFrame *out, int component, int intensity, int offset_y, int offset_x, - int column, int mirror) + int column, int mirror, + int jobnr, int nb_jobs) { const int plane = s->desc->comp[component].plane; const int shift_w = s->shift_w[component]; @@ -635,22 +663,26 @@ static av_always_inline void lowpass16(WaveformContext *s, const int max = limit - intensity; const int src_h = AV_CEIL_RSHIFT(in->height, shift_h); const int src_w = AV_CEIL_RSHIFT(in->width, shift_w); - const uint16_t *src_data = (const uint16_t *)in->data[plane]; - uint16_t *dst_data = (uint16_t *)out->data[plane] + offset_y * dst_linesize + offset_x; + const int sliceh_start = !column ? (src_h * jobnr) / nb_jobs : 0; + const int sliceh_end = !column ? (src_h * (jobnr+1)) / nb_jobs : src_h; + const int slicew_start = column ? (src_w * jobnr) / nb_jobs : 0; + const int slicew_end = column ? (src_w * (jobnr+1)) / nb_jobs : src_w; + const int step = column ? 1 << shift_w : 1 << shift_h; + const uint16_t *src_data = (const uint16_t *)in->data[plane] + sliceh_start * src_linesize; + uint16_t *dst_data = (uint16_t *)out->data[plane] + (offset_y + sliceh_start * step) * dst_linesize + offset_x; uint16_t * const dst_bottom_line = dst_data + dst_linesize * (s->size - 1); uint16_t * const dst_line = (mirror ? dst_bottom_line : dst_data); - const int step = column ? 1 << shift_w : 1 << shift_h; const uint16_t *p; int y; if (!column && mirror) dst_data += s->size; - for (y = 0; y < src_h; y++) { - const uint16_t *src_data_end = src_data + src_w; - uint16_t *dst = dst_line; + for (y = sliceh_start; y < sliceh_end; y++) { + const uint16_t *src_data_end = src_data + slicew_end; + uint16_t *dst = dst_line + slicew_start * step; - for (p = src_data; p < src_data_end; p++) { + for (p = src_data + slicew_start; p < src_data_end; p++) { uint16_t *target; int i = 0, v = FFMIN(*p, limit); @@ -674,19 +706,26 @@ static av_always_inline void lowpass16(WaveformContext *s, src_data += src_linesize; dst_data += dst_linesize * step; } - - envelope16(s, out, plane, plane, column ? offset_x : offset_y); } -#define LOWPASS16_FUNC(name, column, mirror) \ -static void lowpass16_##name(WaveformContext *s, \ - AVFrame *in, AVFrame *out, \ - int component, int intensity, \ - int offset_y, int offset_x, \ - int unused1, int unused2) \ -{ \ - lowpass16(s, in, out, component, intensity, \ - offset_y, offset_x, column, mirror); \ +#define LOWPASS16_FUNC(name, column, mirror) \ +static int lowpass16_##name(AVFilterContext *ctx, \ + void *arg, int jobnr, \ + int nb_jobs) \ +{ \ + WaveformContext *s = ctx->priv; \ + ThreadData *td = arg; \ + AVFrame *in = td->in; \ + AVFrame *out = td->out; \ + int component = td->component; \ + int offset_y = td->offset_y; \ + int offset_x = td->offset_x; \ + \ + lowpass16(s, in, out, component, s->intensity, \ + offset_y, offset_x, column, mirror, \ + jobnr, nb_jobs); \ + \ + return 0; \ } LOWPASS16_FUNC(column_mirror, 1, 1) @@ -698,7 +737,8 @@ static av_always_inline void lowpass(WaveformContext *s, AVFrame *in, AVFrame *out, int component, int intensity, int offset_y, int offset_x, - int column, int mirror) + int column, int mirror, + int jobnr, int nb_jobs) { const int plane = s->desc->comp[component].plane; const int shift_w = s->shift_w[component]; @@ -709,22 +749,26 @@ static av_always_inline void lowpass(WaveformContext *s, const int max = 255 - intensity; const int src_h = AV_CEIL_RSHIFT(in->height, shift_h); const int src_w = AV_CEIL_RSHIFT(in->width, shift_w); - const uint8_t *src_data = in->data[plane]; - uint8_t *dst_data = out->data[plane] + offset_y * dst_linesize + offset_x; + const int sliceh_start = !column ? (src_h * jobnr) / nb_jobs : 0; + const int sliceh_end = !column ? (src_h * (jobnr+1)) / nb_jobs : src_h; + const int slicew_start = column ? (src_w * jobnr) / nb_jobs : 0; + const int slicew_end = column ? (src_w * (jobnr+1)) / nb_jobs : src_w; + const int step = column ? 1 << shift_w : 1 << shift_h; + const uint8_t *src_data = in->data[plane] + sliceh_start * src_linesize; + uint8_t *dst_data = out->data[plane] + (offset_y + sliceh_start * step) * dst_linesize + offset_x; uint8_t * const dst_bottom_line = dst_data + dst_linesize * (s->size - 1); uint8_t * const dst_line = (mirror ? dst_bottom_line : dst_data); - const int step = column ? 1 << shift_w : 1 << shift_h; const uint8_t *p; int y; if (!column && mirror) dst_data += s->size; - for (y = 0; y < src_h; y++) { - const uint8_t *src_data_end = src_data + src_w; - uint8_t *dst = dst_line; + for (y = sliceh_start; y < sliceh_end; y++) { + const uint8_t *src_data_end = src_data + slicew_end; + uint8_t *dst = dst_line + slicew_start * step; - for (p = src_data; p < src_data_end; p++) { + for (p = src_data + slicew_start; p < src_data_end; p++) { uint8_t *target; if (column) { target = dst + dst_signed_linesize * *p; @@ -745,14 +789,13 @@ static av_always_inline void lowpass(WaveformContext *s, } if (column && step > 1) { - const int dst_w = s->display == PARADE ? out->width / s->acomp : out->width; const int dst_h = 256; uint8_t *dst; int x, z; dst = out->data[plane] + offset_y * dst_linesize + offset_x; for (y = 0; y < dst_h; y++) { - for (x = 0; x < dst_w; x+=step) { + for (x = slicew_start * step; x < slicew_end * step; x+=step) { for (z = 1; z < step; z++) { dst[x + z] = dst[x]; } @@ -760,31 +803,37 @@ static av_always_inline void lowpass(WaveformContext *s, dst += dst_linesize; } } else if (step > 1) { - const int dst_h = s->display == PARADE ? out->height / s->acomp : out->height; const int dst_w = 256; uint8_t *dst; int z; - dst = out->data[plane] + offset_y * dst_linesize + offset_x; - for (y = 0; y < dst_h; y+=step) { + dst = out->data[plane] + (offset_y + sliceh_start * step) * dst_linesize + offset_x; + for (y = sliceh_start * step; y < sliceh_end * step; y+=step) { for (z = 1; z < step; z++) memcpy(dst + dst_linesize * z, dst, dst_w); dst += dst_linesize * step; } } - - envelope(s, out, plane, plane, column ? offset_x : offset_y); } -#define LOWPASS_FUNC(name, column, mirror) \ -static void lowpass_##name(WaveformContext *s, \ - AVFrame *in, AVFrame *out, \ - int component, int intensity, \ - int offset_y, int offset_x, \ - int unused1, int unused2) \ -{ \ - lowpass(s, in, out, component, intensity, \ - offset_y, offset_x, column, mirror); \ +#define LOWPASS_FUNC(name, column, mirror) \ +static int lowpass_##name(AVFilterContext *ctx, \ + void *arg, int jobnr, \ + int nb_jobs) \ +{ \ + WaveformContext *s = ctx->priv; \ + ThreadData *td = arg; \ + AVFrame *in = td->in; \ + AVFrame *out = td->out; \ + int component = td->component; \ + int offset_y = td->offset_y; \ + int offset_x = td->offset_x; \ + \ + lowpass(s, in, out, component, s->intensity, \ + offset_y, offset_x, column, mirror, \ + jobnr, nb_jobs); \ + \ + return 0; \ } LOWPASS_FUNC(column_mirror, 1, 1) @@ -796,7 +845,8 @@ static av_always_inline void flat16(WaveformContext *s, AVFrame *in, AVFrame *out, int component, int intensity, int offset_y, int offset_x, - int column, int mirror) + int column, int mirror, + int jobnr, int nb_jobs) { const int plane = s->desc->comp[component].plane; const int c0_linesize = in->linesize[ plane + 0 ] / 2; @@ -815,13 +865,17 @@ static av_always_inline void flat16(WaveformContext *s, const int mid = s->max / 2; const int src_h = in->height; const int src_w = in->width; + const int sliceh_start = !column ? (src_h * jobnr) / nb_jobs : 0; + const int sliceh_end = !column ? (src_h * (jobnr+1)) / nb_jobs : src_h; + const int slicew_start = column ? (src_w * jobnr) / nb_jobs : 0; + const int slicew_end = column ? (src_w * (jobnr+1)) / nb_jobs : src_w; int x, y; if (column) { const int d0_signed_linesize = d0_linesize * (mirror == 1 ? -1 : 1); const int d1_signed_linesize = d1_linesize * (mirror == 1 ? -1 : 1); - for (x = 0; x < src_w; x++) { + for (x = slicew_start; x < slicew_end; x++) { const uint16_t *c0_data = (uint16_t *)in->data[plane + 0]; const uint16_t *c1_data = (uint16_t *)in->data[(plane + 1) % s->ncomp]; const uint16_t *c2_data = (uint16_t *)in->data[(plane + 2) % s->ncomp]; @@ -855,18 +909,18 @@ static av_always_inline void flat16(WaveformContext *s, } } } else { - const uint16_t *c0_data = (uint16_t *)in->data[plane]; - const uint16_t *c1_data = (uint16_t *)in->data[(plane + 1) % s->ncomp]; - const uint16_t *c2_data = (uint16_t *)in->data[(plane + 2) % s->ncomp]; - uint16_t *d0_data = (uint16_t *)(out->data[plane]) + offset_y * d0_linesize + offset_x; - uint16_t *d1_data = (uint16_t *)(out->data[(plane + 1) % s->ncomp]) + offset_y * d1_linesize + offset_x; + const uint16_t *c0_data = (uint16_t *)(in->data[plane]) + (sliceh_start >> c0_shift_h) * c0_linesize; + const uint16_t *c1_data = (uint16_t *)(in->data[(plane + 1) % s->ncomp]) + (sliceh_start >> c1_shift_h) * c1_linesize; + const uint16_t *c2_data = (uint16_t *)(in->data[(plane + 2) % s->ncomp]) + (sliceh_start >> c2_shift_h) * c2_linesize; + uint16_t *d0_data = (uint16_t *)(out->data[plane]) + (offset_y + sliceh_start) * d0_linesize + offset_x; + uint16_t *d1_data = (uint16_t *)(out->data[(plane + 1) % s->ncomp]) + (offset_y + sliceh_start) * d1_linesize + offset_x; if (mirror) { d0_data += s->size - 1; d1_data += s->size - 1; } - for (y = 0; y < src_h; y++) { + for (y = sliceh_start; y < sliceh_end; y++) { for (x = 0; x < src_w; x++) { const int c0 = FFMIN(c0_data[x >> c0_shift_w], limit) + s->max; const int c1 = FFMIN(FFABS(c1_data[x >> c1_shift_w] - mid) + FFABS(c2_data[x >> c2_shift_w] - mid), limit); @@ -899,16 +953,39 @@ static av_always_inline void flat16(WaveformContext *s, d1_data += d1_linesize; } } +} - envelope16(s, out, plane, plane, column ? offset_x : offset_y); - envelope16(s, out, plane, (plane + 1) % s->ncomp, column ? offset_x : offset_y); +#define FLAT16_FUNC(name, column, mirror) \ +static int flat16_##name(AVFilterContext *ctx, \ + void *arg, int jobnr, \ + int nb_jobs) \ +{ \ + WaveformContext *s = ctx->priv; \ + ThreadData *td = arg; \ + AVFrame *in = td->in; \ + AVFrame *out = td->out; \ + int component = td->component; \ + int offset_y = td->offset_y; \ + int offset_x = td->offset_x; \ + \ + flat16(s, in, out, component, s->intensity, \ + offset_y, offset_x, column, mirror, \ + jobnr, nb_jobs); \ + \ + return 0; \ } +FLAT16_FUNC(column_mirror, 1, 1) +FLAT16_FUNC(column, 1, 0) +FLAT16_FUNC(row_mirror, 0, 1) +FLAT16_FUNC(row, 0, 0) + static av_always_inline void flat(WaveformContext *s, AVFrame *in, AVFrame *out, int component, int intensity, int offset_y, int offset_x, - int column, int mirror) + int column, int mirror, + int jobnr, int nb_jobs) { const int plane = s->desc->comp[component].plane; const int c0_linesize = in->linesize[ plane + 0 ]; @@ -925,13 +1002,17 @@ static av_always_inline void flat(WaveformContext *s, const int max = 255 - intensity; const int src_h = in->height; const int src_w = in->width; + const int sliceh_start = !column ? (src_h * jobnr) / nb_jobs : 0; + const int sliceh_end = !column ? (src_h * (jobnr+1)) / nb_jobs : src_h; + const int slicew_start = column ? (src_w * jobnr) / nb_jobs : 0; + const int slicew_end = column ? (src_w * (jobnr+1)) / nb_jobs : src_w; int x, y; if (column) { const int d0_signed_linesize = d0_linesize * (mirror == 1 ? -1 : 1); const int d1_signed_linesize = d1_linesize * (mirror == 1 ? -1 : 1); - for (x = 0; x < src_w; x++) { + for (x = slicew_start; x < slicew_end; x++) { const uint8_t *c0_data = in->data[plane + 0]; const uint8_t *c1_data = in->data[(plane + 1) % s->ncomp]; const uint8_t *c2_data = in->data[(plane + 2) % s->ncomp]; @@ -965,20 +1046,20 @@ static av_always_inline void flat(WaveformContext *s, } } } else { - const uint8_t *c0_data = in->data[plane]; - const uint8_t *c1_data = in->data[(plane + 1) % s->ncomp]; - const uint8_t *c2_data = in->data[(plane + 2) % s->ncomp]; - uint8_t *d0_data = out->data[plane] + offset_y * d0_linesize + offset_x; - uint8_t *d1_data = out->data[(plane + 1) % s->ncomp] + offset_y * d1_linesize + offset_x; + const uint8_t *c0_data = in->data[plane] + (sliceh_start >> c0_shift_h) * c0_linesize; + const uint8_t *c1_data = in->data[(plane + 1) % s->ncomp] + (sliceh_start >> c1_shift_h) * c1_linesize; + const uint8_t *c2_data = in->data[(plane + 2) % s->ncomp] + (sliceh_start >> c2_shift_h) * c2_linesize; + uint8_t *d0_data = out->data[plane] + (offset_y + sliceh_start) * d0_linesize + offset_x; + uint8_t *d1_data = out->data[(plane + 1) % s->ncomp] + (offset_y + sliceh_start) * d1_linesize + offset_x; if (mirror) { d0_data += s->size - 1; d1_data += s->size - 1; } - for (y = 0; y < src_h; y++) { + for (y = sliceh_start; y < sliceh_end; y++) { for (x = 0; x < src_w; x++) { - int c0 = c0_data[x >> c0_shift_w] + 256; + const int c0 = c0_data[x >> c0_shift_w] + 256; const int c1 = FFABS(c1_data[x >> c1_shift_w] - 128) + FFABS(c2_data[x >> c2_shift_w] - 128); uint8_t *target; @@ -1009,266 +1090,323 @@ static av_always_inline void flat(WaveformContext *s, d1_data += d1_linesize; } } - - envelope(s, out, plane, plane, column ? offset_x : offset_y); - envelope(s, out, plane, (plane + 1) % s->ncomp, column ? offset_x : offset_y); } -static av_always_inline void aflat16(WaveformContext *s, - AVFrame *in, AVFrame *out, - int component, int intensity, - int offset_y, int offset_x, - int column, int mirror) -{ - const int plane = s->desc->comp[component].plane; - const int c0_linesize = in->linesize[ plane + 0 ] / 2; - const int c1_linesize = in->linesize[(plane + 1) % s->ncomp] / 2; - const int c2_linesize = in->linesize[(plane + 2) % s->ncomp] / 2; - const int c0_shift_w = s->shift_w[ component + 0 ]; - const int c1_shift_w = s->shift_w[(component + 1) % s->ncomp]; - const int c2_shift_w = s->shift_w[(component + 2) % s->ncomp]; - const int c0_shift_h = s->shift_h[ component + 0 ]; - const int c1_shift_h = s->shift_h[(component + 1) % s->ncomp]; - const int c2_shift_h = s->shift_h[(component + 2) % s->ncomp]; - const int d0_linesize = out->linesize[ plane + 0 ] / 2; - const int d1_linesize = out->linesize[(plane + 1) % s->ncomp] / 2; - const int d2_linesize = out->linesize[(plane + 2) % s->ncomp] / 2; - const int limit = s->max - 1; - const int max = limit - intensity; - const int mid = s->max / 2; - const int src_h = in->height; - const int src_w = in->width; - int x, y; - - if (column) { - const int d0_signed_linesize = d0_linesize * (mirror == 1 ? -1 : 1); - const int d1_signed_linesize = d1_linesize * (mirror == 1 ? -1 : 1); - const int d2_signed_linesize = d2_linesize * (mirror == 1 ? -1 : 1); - - for (x = 0; x < src_w; x++) { - const uint16_t *c0_data = (uint16_t *)in->data[plane + 0]; - const uint16_t *c1_data = (uint16_t *)in->data[(plane + 1) % s->ncomp]; - const uint16_t *c2_data = (uint16_t *)in->data[(plane + 2) % s->ncomp]; - uint16_t *d0_data = (uint16_t *)out->data[plane] + offset_y * d0_linesize + offset_x; - uint16_t *d1_data = (uint16_t *)out->data[(plane + 1) % s->ncomp] + offset_y * d1_linesize + offset_x; - uint16_t *d2_data = (uint16_t *)out->data[(plane + 2) % s->ncomp] + offset_y * d2_linesize + offset_x; - uint16_t * const d0_bottom_line = d0_data + d0_linesize * (s->size - 1); - uint16_t * const d0 = (mirror ? d0_bottom_line : d0_data); - uint16_t * const d1_bottom_line = d1_data + d1_linesize * (s->size - 1); - uint16_t * const d1 = (mirror ? d1_bottom_line : d1_data); - uint16_t * const d2_bottom_line = d2_data + d2_linesize * (s->size - 1); - uint16_t * const d2 = (mirror ? d2_bottom_line : d2_data); - - for (y = 0; y < src_h; y++) { - const int c0 = FFMIN(c0_data[x >> c0_shift_w], limit) + mid; - const int c1 = FFMIN(c1_data[x >> c1_shift_w], limit) - mid; - const int c2 = FFMIN(c2_data[x >> c2_shift_w], limit) - mid; - uint16_t *target; - - target = d0 + x + d0_signed_linesize * c0; - update16(target, max, intensity, limit); - - target = d1 + x + d1_signed_linesize * (c0 + c1); - update16(target, max, intensity, limit); - - target = d2 + x + d2_signed_linesize * (c0 + c2); - update16(target, max, intensity, limit); - - if (!c0_shift_h || (y & c0_shift_h)) - c0_data += c0_linesize; - if (!c1_shift_h || (y & c1_shift_h)) - c1_data += c1_linesize; - if (!c2_shift_h || (y & c2_shift_h)) - c2_data += c2_linesize; - d0_data += d0_linesize; - d1_data += d1_linesize; - d2_data += d2_linesize; - } - } - } else { - const uint16_t *c0_data = (uint16_t *)in->data[plane]; - const uint16_t *c1_data = (uint16_t *)in->data[(plane + 1) % s->ncomp]; - const uint16_t *c2_data = (uint16_t *)in->data[(plane + 2) % s->ncomp]; - uint16_t *d0_data = (uint16_t *)out->data[plane] + offset_y * d0_linesize + offset_x; - uint16_t *d1_data = (uint16_t *)out->data[(plane + 1) % s->ncomp] + offset_y * d1_linesize + offset_x; - uint16_t *d2_data = (uint16_t *)out->data[(plane + 2) % s->ncomp] + offset_y * d2_linesize + offset_x; - - if (mirror) { - d0_data += s->size - 1; - d1_data += s->size - 1; - d2_data += s->size - 1; - } - - for (y = 0; y < src_h; y++) { - for (x = 0; x < src_w; x++) { - const int c0 = FFMIN(c0_data[x >> c0_shift_w], limit) + mid; - const int c1 = FFMIN(c1_data[x >> c1_shift_w], limit) - mid; - const int c2 = FFMIN(c2_data[x >> c2_shift_w], limit) - mid; - uint16_t *target; - - if (mirror) { - target = d0_data - c0; - update16(target, max, intensity, limit); - target = d1_data - (c0 + c1); - update16(target, max, intensity, limit); - target = d2_data - (c0 + c2); - update16(target, max, intensity, limit); - } else { - target = d0_data + c0; - update16(target, max, intensity, limit); - target = d1_data + (c0 + c1); - update16(target, max, intensity, limit); - target = d2_data + (c0 + c2); - update16(target, max, intensity, limit); - } - } - - if (!c0_shift_h || (y & c0_shift_h)) - c0_data += c0_linesize; - if (!c1_shift_h || (y & c1_shift_h)) - c1_data += c1_linesize; - if (!c2_shift_h || (y & c2_shift_h)) - c2_data += c2_linesize; - d0_data += d0_linesize; - d1_data += d1_linesize; - d2_data += d2_linesize; - } - } - - envelope16(s, out, plane, (plane + 0) % s->ncomp, column ? offset_x : offset_y); - envelope16(s, out, plane, (plane + 1) % s->ncomp, column ? offset_x : offset_y); - envelope16(s, out, plane, (plane + 2) % s->ncomp, column ? offset_x : offset_y); +#define FLAT_FUNC(name, column, mirror) \ +static int flat_##name(AVFilterContext *ctx, \ + void *arg, int jobnr, \ + int nb_jobs) \ +{ \ + WaveformContext *s = ctx->priv; \ + ThreadData *td = arg; \ + AVFrame *in = td->in; \ + AVFrame *out = td->out; \ + int component = td->component; \ + int offset_y = td->offset_y; \ + int offset_x = td->offset_x; \ + \ + flat(s, in, out, component, s->intensity, \ + offset_y, offset_x, column, mirror, \ + jobnr, nb_jobs); \ + \ + return 0; \ } -static av_always_inline void aflat(WaveformContext *s, - AVFrame *in, AVFrame *out, - int component, int intensity, - int offset_y, int offset_x, - int column, int mirror) -{ - const int plane = s->desc->comp[component].plane; - const int c0_linesize = in->linesize[ plane + 0 ]; - const int c1_linesize = in->linesize[(plane + 1) % s->ncomp]; - const int c2_linesize = in->linesize[(plane + 2) % s->ncomp]; - const int c0_shift_w = s->shift_w[ component + 0 ]; - const int c1_shift_w = s->shift_w[(component + 1) % s->ncomp]; - const int c2_shift_w = s->shift_w[(component + 2) % s->ncomp]; - const int c0_shift_h = s->shift_h[ component + 0 ]; - const int c1_shift_h = s->shift_h[(component + 1) % s->ncomp]; - const int c2_shift_h = s->shift_h[(component + 2) % s->ncomp]; - const int d0_linesize = out->linesize[ plane + 0 ]; - const int d1_linesize = out->linesize[(plane + 1) % s->ncomp]; - const int d2_linesize = out->linesize[(plane + 2) % s->ncomp]; - const int max = 255 - intensity; - const int src_h = in->height; - const int src_w = in->width; - int x, y; - - if (column) { - const int d0_signed_linesize = d0_linesize * (mirror == 1 ? -1 : 1); - const int d1_signed_linesize = d1_linesize * (mirror == 1 ? -1 : 1); - const int d2_signed_linesize = d2_linesize * (mirror == 1 ? -1 : 1); - - for (x = 0; x < src_w; x++) { - const uint8_t *c0_data = in->data[plane + 0]; - const uint8_t *c1_data = in->data[(plane + 1) % s->ncomp]; - const uint8_t *c2_data = in->data[(plane + 2) % s->ncomp]; - uint8_t *d0_data = out->data[plane] + offset_y * d0_linesize + offset_x; - uint8_t *d1_data = out->data[(plane + 1) % s->ncomp] + offset_y * d1_linesize + offset_x; - uint8_t *d2_data = out->data[(plane + 2) % s->ncomp] + offset_y * d2_linesize + offset_x; - uint8_t * const d0_bottom_line = d0_data + d0_linesize * (s->size - 1); - uint8_t * const d0 = (mirror ? d0_bottom_line : d0_data); - uint8_t * const d1_bottom_line = d1_data + d1_linesize * (s->size - 1); - uint8_t * const d1 = (mirror ? d1_bottom_line : d1_data); - uint8_t * const d2_bottom_line = d2_data + d2_linesize * (s->size - 1); - uint8_t * const d2 = (mirror ? d2_bottom_line : d2_data); - - for (y = 0; y < src_h; y++) { - const int c0 = c0_data[x >> c0_shift_w] + 128; - const int c1 = c1_data[x >> c1_shift_w] - 128; - const int c2 = c2_data[x >> c2_shift_w] - 128; - uint8_t *target; - - target = d0 + x + d0_signed_linesize * c0; - update(target, max, intensity); - - target = d1 + x + d1_signed_linesize * (c0 + c1); - update(target, max, intensity); - - target = d2 + x + d2_signed_linesize * (c0 + c2); - update(target, max, intensity); - - if (!c0_shift_h || (y & c0_shift_h)) - c0_data += c0_linesize; - if (!c1_shift_h || (y & c1_shift_h)) - c1_data += c1_linesize; - if (!c1_shift_h || (y & c1_shift_h)) - c2_data += c1_linesize; - d0_data += d0_linesize; - d1_data += d1_linesize; - d2_data += d2_linesize; - } - } - } else { - const uint8_t *c0_data = in->data[plane]; - const uint8_t *c1_data = in->data[(plane + 1) % s->ncomp]; - const uint8_t *c2_data = in->data[(plane + 2) % s->ncomp]; - uint8_t *d0_data = out->data[plane] + offset_y * d0_linesize + offset_x; - uint8_t *d1_data = out->data[(plane + 1) % s->ncomp] + offset_y * d1_linesize + offset_x; - uint8_t *d2_data = out->data[(plane + 2) % s->ncomp] + offset_y * d2_linesize + offset_x; - - if (mirror) { - d0_data += s->size - 1; - d1_data += s->size - 1; - d2_data += s->size - 1; - } - - for (y = 0; y < src_h; y++) { - for (x = 0; x < src_w; x++) { - const int c0 = c0_data[x >> c0_shift_w] + 128; - const int c1 = c1_data[x >> c1_shift_w] - 128; - const int c2 = c2_data[x >> c2_shift_w] - 128; - uint8_t *target; - - if (mirror) { - target = d0_data - c0; - update(target, max, intensity); - target = d1_data - (c0 + c1); - update(target, max, intensity); - target = d2_data - (c0 + c2); - update(target, max, intensity); - } else { - target = d0_data + c0; - update(target, max, intensity); - target = d1_data + (c0 + c1); - update(target, max, intensity); - target = d2_data + (c0 + c2); - update(target, max, intensity); - } - } - - if (!c0_shift_h || (y & c0_shift_h)) - c0_data += c0_linesize; - if (!c1_shift_h || (y & c1_shift_h)) - c1_data += c1_linesize; - if (!c2_shift_h || (y & c2_shift_h)) - c2_data += c2_linesize; - d0_data += d0_linesize; - d1_data += d1_linesize; - d2_data += d2_linesize; - } - } +FLAT_FUNC(column_mirror, 1, 1) +FLAT_FUNC(column, 1, 0) +FLAT_FUNC(row_mirror, 0, 1) +FLAT_FUNC(row, 0, 0) + +#define AFLAT16(name, update_cr, column, mirror) \ +static int name(AVFilterContext *ctx, \ + void *arg, int jobnr, \ + int nb_jobs) \ +{ \ + WaveformContext *s = ctx->priv; \ + ThreadData *td = arg; \ + AVFrame *in = td->in; \ + AVFrame *out = td->out; \ + int component = td->component; \ + int offset_y = td->offset_y; \ + int offset_x = td->offset_x; \ + const int intensity = s->intensity; \ + const int plane = s->desc->comp[component].plane; \ + const int c0_linesize = in->linesize[ plane + 0 ] / 2; \ + const int c1_linesize = in->linesize[(plane + 1) % s->ncomp] / 2; \ + const int c2_linesize = in->linesize[(plane + 2) % s->ncomp] / 2; \ + const int c0_shift_w = s->shift_w[ component + 0 ]; \ + const int c1_shift_w = s->shift_w[(component + 1) % s->ncomp]; \ + const int c2_shift_w = s->shift_w[(component + 2) % s->ncomp]; \ + const int c0_shift_h = s->shift_h[ component + 0 ]; \ + const int c1_shift_h = s->shift_h[(component + 1) % s->ncomp]; \ + const int c2_shift_h = s->shift_h[(component + 2) % s->ncomp]; \ + const int d0_linesize = out->linesize[ plane + 0 ] / 2; \ + const int d1_linesize = out->linesize[(plane + 1) % s->ncomp] / 2; \ + const int d2_linesize = out->linesize[(plane + 2) % s->ncomp] / 2; \ + const int limit = s->max - 1; \ + const int max = limit - intensity; \ + const int mid = s->max / 2; \ + const int src_h = in->height; \ + const int src_w = in->width; \ + const int sliceh_start = !column ? (src_h * jobnr) / nb_jobs : 0; \ + const int sliceh_end = !column ? (src_h * (jobnr+1)) / nb_jobs : src_h; \ + const int slicew_start = column ? (src_w * jobnr) / nb_jobs : 0; \ + const int slicew_end = column ? (src_w * (jobnr+1)) / nb_jobs : src_w; \ + int x, y; \ + \ + if (column) { \ + const int d0_signed_linesize = d0_linesize * (mirror == 1 ? -1 : 1); \ + const int d1_signed_linesize = d1_linesize * (mirror == 1 ? -1 : 1); \ + const int d2_signed_linesize = d2_linesize * (mirror == 1 ? -1 : 1); \ + \ + for (x = slicew_start; x < slicew_end; x++) { \ + const uint16_t *c0_data = (uint16_t *)in->data[plane + 0]; \ + const uint16_t *c1_data = (uint16_t *)in->data[(plane + 1) % s->ncomp]; \ + const uint16_t *c2_data = (uint16_t *)in->data[(plane + 2) % s->ncomp]; \ + uint16_t *d0_data = (uint16_t *)out->data[plane] + offset_y * d0_linesize + offset_x; \ + uint16_t *d1_data = (uint16_t *)out->data[(plane + 1) % s->ncomp] + offset_y * d1_linesize + offset_x; \ + uint16_t *d2_data = (uint16_t *)out->data[(plane + 2) % s->ncomp] + offset_y * d2_linesize + offset_x; \ + uint16_t * const d0_bottom_line = d0_data + d0_linesize * (s->size - 1); \ + uint16_t * const d0 = (mirror ? d0_bottom_line : d0_data); \ + uint16_t * const d1_bottom_line = d1_data + d1_linesize * (s->size - 1); \ + uint16_t * const d1 = (mirror ? d1_bottom_line : d1_data); \ + uint16_t * const d2_bottom_line = d2_data + d2_linesize * (s->size - 1); \ + uint16_t * const d2 = (mirror ? d2_bottom_line : d2_data); \ + \ + for (y = 0; y < src_h; y++) { \ + const int c0 = FFMIN(c0_data[x >> c0_shift_w], limit) + mid; \ + const int c1 = FFMIN(c1_data[x >> c1_shift_w], limit) - mid; \ + const int c2 = FFMIN(c2_data[x >> c2_shift_w], limit) - mid; \ + uint16_t *target; \ + \ + target = d0 + x + d0_signed_linesize * c0; \ + update16(target, max, intensity, limit); \ + \ + target = d1 + x + d1_signed_linesize * (c0 + c1); \ + update16(target, max, intensity, limit); \ + \ + target = d2 + x + d2_signed_linesize * (c0 + c2); \ + update_cr(target, max, intensity, limit); \ + \ + if (!c0_shift_h || (y & c0_shift_h)) \ + c0_data += c0_linesize; \ + if (!c1_shift_h || (y & c1_shift_h)) \ + c1_data += c1_linesize; \ + if (!c2_shift_h || (y & c2_shift_h)) \ + c2_data += c2_linesize; \ + d0_data += d0_linesize; \ + d1_data += d1_linesize; \ + d2_data += d2_linesize; \ + } \ + } \ + } else { \ + const uint16_t *c0_data = (uint16_t *)in->data[plane] + (sliceh_start >> c0_shift_h) * c0_linesize; \ + const uint16_t *c1_data = (uint16_t *)in->data[(plane + 1) % s->ncomp] + (sliceh_start >> c1_shift_h) * c1_linesize; \ + const uint16_t *c2_data = (uint16_t *)in->data[(plane + 2) % s->ncomp] + (sliceh_start >> c2_shift_h) * c2_linesize; \ + uint16_t *d0_data = (uint16_t *)out->data[plane] + (offset_y + sliceh_start) * d0_linesize + offset_x; \ + uint16_t *d1_data = (uint16_t *)out->data[(plane + 1) % s->ncomp] + (offset_y + sliceh_start) * d1_linesize + offset_x; \ + uint16_t *d2_data = (uint16_t *)out->data[(plane + 2) % s->ncomp] + (offset_y + sliceh_start) * d2_linesize + offset_x; \ + \ + if (mirror) { \ + d0_data += s->size - 1; \ + d1_data += s->size - 1; \ + d2_data += s->size - 1; \ + } \ + \ + for (y = sliceh_start; y < sliceh_end; y++) { \ + for (x = 0; x < src_w; x++) { \ + const int c0 = FFMIN(c0_data[x >> c0_shift_w], limit) + mid; \ + const int c1 = FFMIN(c1_data[x >> c1_shift_w], limit) - mid; \ + const int c2 = FFMIN(c2_data[x >> c2_shift_w], limit) - mid; \ + uint16_t *target; \ + \ + if (mirror) { \ + target = d0_data - c0; \ + update16(target, max, intensity, limit); \ + target = d1_data - (c0 + c1); \ + update16(target, max, intensity, limit); \ + target = d2_data - (c0 + c2); \ + update_cr(target, max, intensity, limit); \ + } else { \ + target = d0_data + c0; \ + update16(target, max, intensity, limit); \ + target = d1_data + (c0 + c1); \ + update16(target, max, intensity, limit); \ + target = d2_data + (c0 + c2); \ + update_cr(target, max, intensity, limit); \ + } \ + } \ + \ + if (!c0_shift_h || (y & c0_shift_h)) \ + c0_data += c0_linesize; \ + if (!c1_shift_h || (y & c1_shift_h)) \ + c1_data += c1_linesize; \ + if (!c2_shift_h || (y & c2_shift_h)) \ + c2_data += c2_linesize; \ + d0_data += d0_linesize; \ + d1_data += d1_linesize; \ + d2_data += d2_linesize; \ + } \ + } \ + return 0; \ +} - envelope(s, out, plane, (plane + 0) % s->ncomp, column ? offset_x : offset_y); - envelope(s, out, plane, (plane + 1) % s->ncomp, column ? offset_x : offset_y); - envelope(s, out, plane, (plane + 2) % s->ncomp, column ? offset_x : offset_y); +#define AFLAT(name, update_cr, column, mirror) \ +static int name(AVFilterContext *ctx, \ + void *arg, int jobnr, \ + int nb_jobs) \ +{ \ + WaveformContext *s = ctx->priv; \ + ThreadData *td = arg; \ + AVFrame *in = td->in; \ + AVFrame *out = td->out; \ + int component = td->component; \ + int offset_y = td->offset_y; \ + int offset_x = td->offset_x; \ + const int src_h = in->height; \ + const int src_w = in->width; \ + const int sliceh_start = !column ? (src_h * jobnr) / nb_jobs : 0; \ + const int sliceh_end = !column ? (src_h * (jobnr+1)) / nb_jobs : src_h; \ + const int slicew_start = column ? (src_w * jobnr) / nb_jobs : 0; \ + const int slicew_end = column ? (src_w * (jobnr+1)) / nb_jobs : src_w; \ + const int intensity = s->intensity; \ + const int plane = s->desc->comp[component].plane; \ + const int c0_linesize = in->linesize[ plane + 0 ]; \ + const int c1_linesize = in->linesize[(plane + 1) % s->ncomp]; \ + const int c2_linesize = in->linesize[(plane + 2) % s->ncomp]; \ + const int c0_shift_w = s->shift_w[ component + 0 ]; \ + const int c1_shift_w = s->shift_w[(component + 1) % s->ncomp]; \ + const int c2_shift_w = s->shift_w[(component + 2) % s->ncomp]; \ + const int c0_shift_h = s->shift_h[ component + 0 ]; \ + const int c1_shift_h = s->shift_h[(component + 1) % s->ncomp]; \ + const int c2_shift_h = s->shift_h[(component + 2) % s->ncomp]; \ + const int d0_linesize = out->linesize[ plane + 0 ]; \ + const int d1_linesize = out->linesize[(plane + 1) % s->ncomp]; \ + const int d2_linesize = out->linesize[(plane + 2) % s->ncomp]; \ + const int max = 255 - intensity; \ + int x, y; \ + \ + if (column) { \ + const int d0_signed_linesize = d0_linesize * (mirror == 1 ? -1 : 1); \ + const int d1_signed_linesize = d1_linesize * (mirror == 1 ? -1 : 1); \ + const int d2_signed_linesize = d2_linesize * (mirror == 1 ? -1 : 1); \ + \ + for (x = slicew_start; x < slicew_end; x++) { \ + const uint8_t *c0_data = in->data[plane + 0]; \ + const uint8_t *c1_data = in->data[(plane + 1) % s->ncomp]; \ + const uint8_t *c2_data = in->data[(plane + 2) % s->ncomp]; \ + uint8_t *d0_data = out->data[plane] + offset_y * d0_linesize + offset_x; \ + uint8_t *d1_data = out->data[(plane + 1) % s->ncomp] + offset_y * d1_linesize + offset_x; \ + uint8_t *d2_data = out->data[(plane + 2) % s->ncomp] + offset_y * d2_linesize + offset_x; \ + uint8_t * const d0_bottom_line = d0_data + d0_linesize * (s->size - 1); \ + uint8_t * const d0 = (mirror ? d0_bottom_line : d0_data); \ + uint8_t * const d1_bottom_line = d1_data + d1_linesize * (s->size - 1); \ + uint8_t * const d1 = (mirror ? d1_bottom_line : d1_data); \ + uint8_t * const d2_bottom_line = d2_data + d2_linesize * (s->size - 1); \ + uint8_t * const d2 = (mirror ? d2_bottom_line : d2_data); \ + \ + for (y = 0; y < src_h; y++) { \ + const int c0 = c0_data[x >> c0_shift_w] + 128; \ + const int c1 = c1_data[x >> c1_shift_w] - 128; \ + const int c2 = c2_data[x >> c2_shift_w] - 128; \ + uint8_t *target; \ + \ + target = d0 + x + d0_signed_linesize * c0; \ + update(target, max, intensity); \ + \ + target = d1 + x + d1_signed_linesize * (c0 + c1); \ + update(target, max, intensity); \ + \ + target = d2 + x + d2_signed_linesize * (c0 + c2); \ + update_cr(target, max, intensity); \ + \ + if (!c0_shift_h || (y & c0_shift_h)) \ + c0_data += c0_linesize; \ + if (!c1_shift_h || (y & c1_shift_h)) \ + c1_data += c1_linesize; \ + if (!c1_shift_h || (y & c1_shift_h)) \ + c2_data += c1_linesize; \ + d0_data += d0_linesize; \ + d1_data += d1_linesize; \ + d2_data += d2_linesize; \ + } \ + } \ + } else { \ + const uint8_t *c0_data = in->data[plane] + (sliceh_start >> c0_shift_h) * c0_linesize; \ + const uint8_t *c1_data = in->data[(plane + 1) % s->ncomp] + (sliceh_start >> c1_shift_h) * c1_linesize; \ + const uint8_t *c2_data = in->data[(plane + 2) % s->ncomp] + (sliceh_start >> c2_shift_h) * c2_linesize; \ + uint8_t *d0_data = out->data[plane] + (offset_y + sliceh_start) * d0_linesize + offset_x; \ + uint8_t *d1_data = out->data[(plane + 1) % s->ncomp] + (offset_y + sliceh_start) * d1_linesize + offset_x; \ + uint8_t *d2_data = out->data[(plane + 2) % s->ncomp] + (offset_y + sliceh_start) * d2_linesize + offset_x; \ + \ + if (mirror) { \ + d0_data += s->size - 1; \ + d1_data += s->size - 1; \ + d2_data += s->size - 1; \ + } \ + \ + for (y = sliceh_start; y < sliceh_end; y++) { \ + for (x = 0; x < src_w; x++) { \ + const int c0 = c0_data[x >> c0_shift_w] + 128; \ + const int c1 = c1_data[x >> c1_shift_w] - 128; \ + const int c2 = c2_data[x >> c2_shift_w] - 128; \ + uint8_t *target; \ + \ + if (mirror) { \ + target = d0_data - c0; \ + update(target, max, intensity); \ + target = d1_data - (c0 + c1); \ + update(target, max, intensity); \ + target = d2_data - (c0 + c2); \ + update_cr(target, max, intensity); \ + } else { \ + target = d0_data + c0; \ + update(target, max, intensity); \ + target = d1_data + (c0 + c1); \ + update(target, max, intensity); \ + target = d2_data + (c0 + c2); \ + update_cr(target, max, intensity); \ + } \ + } \ + \ + if (!c0_shift_h || (y & c0_shift_h)) \ + c0_data += c0_linesize; \ + if (!c1_shift_h || (y & c1_shift_h)) \ + c1_data += c1_linesize; \ + if (!c2_shift_h || (y & c2_shift_h)) \ + c2_data += c2_linesize; \ + d0_data += d0_linesize; \ + d1_data += d1_linesize; \ + d2_data += d2_linesize; \ + } \ + } \ + return 0; \ } +AFLAT16(aflat16_row, update16, 0, 0) +AFLAT16(aflat16_row_mirror, update16, 0, 1) +AFLAT16(aflat16_column, update16, 1, 0) +AFLAT16(aflat16_column_mirror, update16, 1, 1) +AFLAT16(xflat16_row, update16_cr, 0, 0) +AFLAT16(xflat16_row_mirror, update16_cr, 0, 1) +AFLAT16(xflat16_column, update16_cr, 1, 0) +AFLAT16(xflat16_column_mirror, update16_cr, 1, 1) + +AFLAT(aflat_row, update, 0, 0) +AFLAT(aflat_row_mirror, update, 0, 1) +AFLAT(aflat_column, update, 1, 0) +AFLAT(aflat_column_mirror, update, 1, 1) +AFLAT(xflat_row, update_cr, 0, 0) +AFLAT(xflat_row_mirror, update_cr, 0, 1) +AFLAT(xflat_column, update_cr, 1, 0) +AFLAT(xflat_column_mirror, update_cr, 1, 1) + static av_always_inline void chroma16(WaveformContext *s, AVFrame *in, AVFrame *out, int component, int intensity, int offset_y, int offset_x, - int column, int mirror) + int column, int mirror, + int jobnr, int nb_jobs) { const int plane = s->desc->comp[component].plane; const int c0_linesize = in->linesize[(plane + 1) % s->ncomp] / 2; @@ -1283,12 +1421,16 @@ static av_always_inline void chroma16(WaveformContext *s, const int c1_shift_h = s->shift_h[(component + 2) % s->ncomp]; const int src_h = in->height; const int src_w = in->width; + const int sliceh_start = !column ? (src_h * jobnr) / nb_jobs : 0; + const int sliceh_end = !column ? (src_h * (jobnr+1)) / nb_jobs : src_h; + const int slicew_start = column ? (src_w * jobnr) / nb_jobs : 0; + const int slicew_end = column ? (src_w * (jobnr+1)) / nb_jobs : src_w; int x, y; if (column) { const int dst_signed_linesize = dst_linesize * (mirror == 1 ? -1 : 1); - for (x = 0; x < src_w; x++) { + for (x = slicew_start; x < slicew_end; x++) { const uint16_t *c0_data = (uint16_t *)in->data[(plane + 1) % s->ncomp]; const uint16_t *c1_data = (uint16_t *)in->data[(plane + 2) % s->ncomp]; uint16_t *dst_data = (uint16_t *)out->data[plane] + offset_y * dst_linesize + offset_x; @@ -1311,13 +1453,13 @@ static av_always_inline void chroma16(WaveformContext *s, } } } else { - const uint16_t *c0_data = (uint16_t *)in->data[(plane + 1) % s->ncomp]; - const uint16_t *c1_data = (uint16_t *)in->data[(plane + 2) % s->ncomp]; - uint16_t *dst_data = (uint16_t *)out->data[plane] + offset_y * dst_linesize + offset_x; + const uint16_t *c0_data = (uint16_t *)in->data[(plane + 1) % s->ncomp] + (sliceh_start >> c0_shift_h) * c0_linesize; + const uint16_t *c1_data = (uint16_t *)in->data[(plane + 2) % s->ncomp] + (sliceh_start >> c1_shift_h) * c1_linesize; + uint16_t *dst_data = (uint16_t *)out->data[plane] + (offset_y + sliceh_start) * dst_linesize + offset_x; if (mirror) dst_data += s->size - 1; - for (y = 0; y < src_h; y++) { + for (y = sliceh_start; y < sliceh_end; y++) { for (x = 0; x < src_w; x++) { const int sum = FFMIN(FFABS(c0_data[x >> c0_shift_w] - mid) + FFABS(c1_data[x >> c1_shift_w] - mid - 1), limit); uint16_t *target; @@ -1338,17 +1480,47 @@ static av_always_inline void chroma16(WaveformContext *s, dst_data += dst_linesize; } } +} - envelope16(s, out, plane, plane, column ? offset_x : offset_y); +#define CHROMA16_FUNC(name, column, mirror) \ +static int chroma16_##name(AVFilterContext *ctx, \ + void *arg, int jobnr, \ + int nb_jobs) \ +{ \ + WaveformContext *s = ctx->priv; \ + ThreadData *td = arg; \ + AVFrame *in = td->in; \ + AVFrame *out = td->out; \ + int component = td->component; \ + int offset_y = td->offset_y; \ + int offset_x = td->offset_x; \ + \ + chroma16(s, in, out, component, s->intensity,\ + offset_y, offset_x, column, mirror, \ + jobnr, nb_jobs); \ + \ + return 0; \ } +CHROMA16_FUNC(column_mirror, 1, 1) +CHROMA16_FUNC(column, 1, 0) +CHROMA16_FUNC(row_mirror, 0, 1) +CHROMA16_FUNC(row, 0, 0) + static av_always_inline void chroma(WaveformContext *s, AVFrame *in, AVFrame *out, int component, int intensity, int offset_y, int offset_x, - int column, int mirror) + int column, int mirror, + int jobnr, int nb_jobs) { const int plane = s->desc->comp[component].plane; + const int src_h = in->height; + const int src_w = in->width; + const int sliceh_start = !column ? (src_h * jobnr) / nb_jobs : 0; + const int sliceh_end = !column ? (src_h * (jobnr+1)) / nb_jobs : src_h; + const int slicew_start = column ? (src_w * jobnr) / nb_jobs : 0; + const int slicew_end = column ? (src_w * (jobnr+1)) / nb_jobs : src_w; const int c0_linesize = in->linesize[(plane + 1) % s->ncomp]; const int c1_linesize = in->linesize[(plane + 2) % s->ncomp]; const int dst_linesize = out->linesize[plane]; @@ -1357,14 +1529,12 @@ static av_always_inline void chroma(WaveformContext *s, const int c1_shift_w = s->shift_w[(component + 2) % s->ncomp]; const int c0_shift_h = s->shift_h[(component + 1) % s->ncomp]; const int c1_shift_h = s->shift_h[(component + 2) % s->ncomp]; - const int src_h = in->height; - const int src_w = in->width; int x, y; if (column) { const int dst_signed_linesize = dst_linesize * (mirror == 1 ? -1 : 1); - for (x = 0; x < src_w; x++) { + for (x = slicew_start; x < slicew_end; x++) { const uint8_t *c0_data = in->data[(plane + 1) % s->ncomp]; const uint8_t *c1_data = in->data[(plane + 2) % s->ncomp]; uint8_t *dst_data = out->data[plane] + offset_y * dst_linesize + offset_x; @@ -1387,13 +1557,13 @@ static av_always_inline void chroma(WaveformContext *s, } } } else { - const uint8_t *c0_data = in->data[(plane + 1) % s->ncomp]; - const uint8_t *c1_data = in->data[(plane + 2) % s->ncomp]; - uint8_t *dst_data = out->data[plane] + offset_y * dst_linesize + offset_x; + const uint8_t *c0_data = in->data[(plane + 1) % s->ncomp] + (sliceh_start >> c0_shift_h) * c0_linesize; + const uint8_t *c1_data = in->data[(plane + 2) % s->ncomp] + (sliceh_start >> c1_shift_h) * c1_linesize; + uint8_t *dst_data = out->data[plane] + (offset_y + sliceh_start) * dst_linesize + offset_x; if (mirror) dst_data += s->size - 1; - for (y = 0; y < src_h; y++) { + for (y = sliceh_start; y < sliceh_end; y++) { for (x = 0; x < src_w; x++) { const int sum = FFABS(c0_data[x >> c0_shift_w] - 128) + FFABS(c1_data[x >> c1_shift_w] - 127); uint8_t *target; @@ -1414,35 +1584,63 @@ static av_always_inline void chroma(WaveformContext *s, dst_data += dst_linesize; } } +} - envelope(s, out, plane, plane, column ? offset_x : offset_y); +#define CHROMA_FUNC(name, column, mirror) \ +static int chroma_##name(AVFilterContext *ctx, \ + void *arg, int jobnr, \ + int nb_jobs) \ +{ \ + WaveformContext *s = ctx->priv; \ + ThreadData *td = arg; \ + AVFrame *in = td->in; \ + AVFrame *out = td->out; \ + int component = td->component; \ + int offset_y = td->offset_y; \ + int offset_x = td->offset_x; \ + \ + chroma(s, in, out, component, s->intensity, \ + offset_y, offset_x, column, mirror, \ + jobnr, nb_jobs); \ + \ + return 0; \ } +CHROMA_FUNC(column_mirror, 1, 1) +CHROMA_FUNC(column, 1, 0) +CHROMA_FUNC(row_mirror, 0, 1) +CHROMA_FUNC(row, 0, 0) + static av_always_inline void color16(WaveformContext *s, AVFrame *in, AVFrame *out, int component, int intensity, int offset_y, int offset_x, - int column, int mirror) + int column, int mirror, + int jobnr, int nb_jobs) { const int plane = s->desc->comp[component].plane; const int limit = s->max - 1; - const uint16_t *c0_data = (const uint16_t *)in->data[plane + 0]; - const uint16_t *c1_data = (const uint16_t *)in->data[(plane + 1) % s->ncomp]; - const uint16_t *c2_data = (const uint16_t *)in->data[(plane + 2) % s->ncomp]; + const int src_h = in->height; + const int src_w = in->width; + const int sliceh_start = !column ? (src_h * jobnr) / nb_jobs : 0; + const int sliceh_end = !column ? (src_h * (jobnr+1)) / nb_jobs : src_h; + const int slicew_start = column ? (src_w * jobnr) / nb_jobs : 0; + const int slicew_end = column ? (src_w * (jobnr+1)) / nb_jobs : src_w; const int c0_linesize = in->linesize[ plane + 0 ] / 2; const int c1_linesize = in->linesize[(plane + 1) % s->ncomp] / 2; const int c2_linesize = in->linesize[(plane + 2) % s->ncomp] / 2; + const int c0_shift_h = s->shift_h[ component + 0 ]; + const int c1_shift_h = s->shift_h[(component + 1) % s->ncomp]; + const int c2_shift_h = s->shift_h[(component + 2) % s->ncomp]; + const uint16_t *c0_data = (const uint16_t *)in->data[plane + 0] + (sliceh_start >> c0_shift_h) * c0_linesize; + const uint16_t *c1_data = (const uint16_t *)in->data[(plane + 1) % s->ncomp] + (sliceh_start >> c1_shift_h) * c1_linesize; + const uint16_t *c2_data = (const uint16_t *)in->data[(plane + 2) % s->ncomp] + (sliceh_start >> c2_shift_h) * c2_linesize; const int d0_linesize = out->linesize[ plane + 0 ] / 2; const int d1_linesize = out->linesize[(plane + 1) % s->ncomp] / 2; const int d2_linesize = out->linesize[(plane + 2) % s->ncomp] / 2; const int c0_shift_w = s->shift_w[ component + 0 ]; const int c1_shift_w = s->shift_w[(component + 1) % s->ncomp]; const int c2_shift_w = s->shift_w[(component + 2) % s->ncomp]; - const int c0_shift_h = s->shift_h[ component + 0 ]; - const int c1_shift_h = s->shift_h[(component + 1) % s->ncomp]; - const int c2_shift_h = s->shift_h[(component + 2) % s->ncomp]; - const int src_h = in->height; - const int src_w = in->width; int x, y; if (column) { @@ -1460,7 +1658,7 @@ static av_always_inline void color16(WaveformContext *s, uint16_t * const d2 = (mirror ? d2_bottom_line : d2_data); for (y = 0; y < src_h; y++) { - for (x = 0; x < src_w; x++) { + for (x = slicew_start; x < slicew_end; x++) { const int c0 = FFMIN(c0_data[x >> c0_shift_w], limit); const int c1 = c1_data[x >> c1_shift_w]; const int c2 = c2_data[x >> c2_shift_w]; @@ -1481,9 +1679,9 @@ static av_always_inline void color16(WaveformContext *s, d2_data += d2_linesize; } } else { - uint16_t *d0_data = (uint16_t *)out->data[plane] + offset_y * d0_linesize + offset_x; - uint16_t *d1_data = (uint16_t *)out->data[(plane + 1) % s->ncomp] + offset_y * d1_linesize + offset_x; - uint16_t *d2_data = (uint16_t *)out->data[(plane + 2) % s->ncomp] + offset_y * d2_linesize + offset_x; + uint16_t *d0_data = (uint16_t *)out->data[plane] + (offset_y + sliceh_start) * d0_linesize + offset_x; + uint16_t *d1_data = (uint16_t *)out->data[(plane + 1) % s->ncomp] + (offset_y + sliceh_start) * d1_linesize + offset_x; + uint16_t *d2_data = (uint16_t *)out->data[(plane + 2) % s->ncomp] + (offset_y + sliceh_start) * d2_linesize + offset_x; if (mirror) { d0_data += s->size - 1; @@ -1491,7 +1689,7 @@ static av_always_inline void color16(WaveformContext *s, d2_data += s->size - 1; } - for (y = 0; y < src_h; y++) { + for (y = sliceh_start; y < sliceh_end; y++) { for (x = 0; x < src_w; x++) { const int c0 = FFMIN(c0_data[x >> c0_shift_w], limit); const int c1 = c1_data[x >> c1_shift_w]; @@ -1519,37 +1717,65 @@ static av_always_inline void color16(WaveformContext *s, d2_data += d2_linesize; } } +} - envelope16(s, out, plane, plane, column ? offset_x : offset_y); +#define COLOR16_FUNC(name, column, mirror) \ +static int color16_##name(AVFilterContext *ctx, \ + void *arg, int jobnr, \ + int nb_jobs) \ +{ \ + WaveformContext *s = ctx->priv; \ + ThreadData *td = arg; \ + AVFrame *in = td->in; \ + AVFrame *out = td->out; \ + int component = td->component; \ + int offset_y = td->offset_y; \ + int offset_x = td->offset_x; \ + \ + color16(s, in, out, component, s->intensity, \ + offset_y, offset_x, column, mirror, \ + jobnr, nb_jobs); \ + \ + return 0; \ } +COLOR16_FUNC(column_mirror, 1, 1) +COLOR16_FUNC(column, 1, 0) +COLOR16_FUNC(row_mirror, 0, 1) +COLOR16_FUNC(row, 0, 0) + static av_always_inline void color(WaveformContext *s, AVFrame *in, AVFrame *out, int component, int intensity, int offset_y, int offset_x, - int column, int mirror) + int column, int mirror, + int jobnr, int nb_jobs) { const int plane = s->desc->comp[component].plane; - const uint8_t *c0_data = in->data[plane + 0]; - const uint8_t *c1_data = in->data[(plane + 1) % s->ncomp]; - const uint8_t *c2_data = in->data[(plane + 2) % s->ncomp]; + const int src_h = in->height; + const int src_w = in->width; + const int sliceh_start = !column ? (src_h * jobnr) / nb_jobs : 0; + const int sliceh_end = !column ? (src_h * (jobnr+1)) / nb_jobs : src_h; + const int slicew_start = column ? (src_w * jobnr) / nb_jobs : 0; + const int slicew_end = column ? (src_w * (jobnr+1)) / nb_jobs : src_w; const int c0_linesize = in->linesize[ plane + 0 ]; const int c1_linesize = in->linesize[(plane + 1) % s->ncomp]; const int c2_linesize = in->linesize[(plane + 2) % s->ncomp]; + const int c0_shift_h = s->shift_h[ component + 0 ]; + const int c1_shift_h = s->shift_h[(component + 1) % s->ncomp]; + const int c2_shift_h = s->shift_h[(component + 2) % s->ncomp]; + const uint8_t *c0_data = in->data[plane] + (sliceh_start >> c0_shift_h) * c0_linesize; + const uint8_t *c1_data = in->data[(plane + 1) % s->ncomp] + (sliceh_start >> c1_shift_h) * c1_linesize; + const uint8_t *c2_data = in->data[(plane + 2) % s->ncomp] + (sliceh_start >> c2_shift_h) * c2_linesize; const int d0_linesize = out->linesize[ plane + 0 ]; const int d1_linesize = out->linesize[(plane + 1) % s->ncomp]; const int d2_linesize = out->linesize[(plane + 2) % s->ncomp]; const int c0_shift_w = s->shift_w[ component + 0 ]; const int c1_shift_w = s->shift_w[(component + 1) % s->ncomp]; const int c2_shift_w = s->shift_w[(component + 2) % s->ncomp]; - const int c0_shift_h = s->shift_h[ component + 0 ]; - const int c1_shift_h = s->shift_h[(component + 1) % s->ncomp]; - const int c2_shift_h = s->shift_h[(component + 2) % s->ncomp]; - const int src_h = in->height; - const int src_w = in->width; int x, y; - if (s->mode) { + if (column) { const int d0_signed_linesize = d0_linesize * (mirror == 1 ? -1 : 1); const int d1_signed_linesize = d1_linesize * (mirror == 1 ? -1 : 1); const int d2_signed_linesize = d2_linesize * (mirror == 1 ? -1 : 1); @@ -1564,7 +1790,7 @@ static av_always_inline void color(WaveformContext *s, uint8_t * const d2 = (mirror ? d2_bottom_line : d2_data); for (y = 0; y < src_h; y++) { - for (x = 0; x < src_w; x++) { + for (x = slicew_start; x < slicew_end; x++) { const int c0 = c0_data[x >> c0_shift_w]; const int c1 = c1_data[x >> c1_shift_w]; const int c2 = c2_data[x >> c2_shift_w]; @@ -1585,9 +1811,9 @@ static av_always_inline void color(WaveformContext *s, d2_data += d2_linesize; } } else { - uint8_t *d0_data = out->data[plane] + offset_y * d0_linesize + offset_x; - uint8_t *d1_data = out->data[(plane + 1) % s->ncomp] + offset_y * d1_linesize + offset_x; - uint8_t *d2_data = out->data[(plane + 2) % s->ncomp] + offset_y * d2_linesize + offset_x; + uint8_t *d0_data = out->data[plane] + (offset_y + sliceh_start) * d0_linesize + offset_x; + uint8_t *d1_data = out->data[(plane + 1) % s->ncomp] + (offset_y + sliceh_start) * d1_linesize + offset_x; + uint8_t *d2_data = out->data[(plane + 2) % s->ncomp] + (offset_y + sliceh_start) * d2_linesize + offset_x; if (mirror) { d0_data += s->size - 1; @@ -1595,7 +1821,7 @@ static av_always_inline void color(WaveformContext *s, d2_data += s->size - 1; } - for (y = 0; y < src_h; y++) { + for (y = sliceh_start; y < sliceh_end; y++) { for (x = 0; x < src_w; x++) { const int c0 = c0_data[x >> c0_shift_w]; const int c1 = c1_data[x >> c1_shift_w]; @@ -1623,39 +1849,67 @@ static av_always_inline void color(WaveformContext *s, d2_data += d2_linesize; } } +} - envelope(s, out, plane, plane, column ? offset_x : offset_y); +#define COLOR_FUNC(name, column, mirror) \ +static int color_##name(AVFilterContext *ctx, \ + void *arg, int jobnr, \ + int nb_jobs) \ +{ \ + WaveformContext *s = ctx->priv; \ + ThreadData *td = arg; \ + AVFrame *in = td->in; \ + AVFrame *out = td->out; \ + int component = td->component; \ + int offset_y = td->offset_y; \ + int offset_x = td->offset_x; \ + \ + color(s, in, out, component, s->intensity, \ + offset_y, offset_x, column, mirror, \ + jobnr, nb_jobs); \ + \ + return 0; \ } +COLOR_FUNC(column_mirror, 1, 1) +COLOR_FUNC(column, 1, 0) +COLOR_FUNC(row_mirror, 0, 1) +COLOR_FUNC(row, 0, 0) + static av_always_inline void acolor16(WaveformContext *s, AVFrame *in, AVFrame *out, int component, int intensity, int offset_y, int offset_x, - int column, int mirror) + int column, int mirror, + int jobnr, int nb_jobs) { const int plane = s->desc->comp[component].plane; const int limit = s->max - 1; const int max = limit - intensity; - const uint16_t *c0_data = (const uint16_t *)in->data[plane + 0]; - const uint16_t *c1_data = (const uint16_t *)in->data[(plane + 1) % s->ncomp]; - const uint16_t *c2_data = (const uint16_t *)in->data[(plane + 2) % s->ncomp]; + const int src_h = in->height; + const int src_w = in->width; + const int sliceh_start = !column ? (src_h * jobnr) / nb_jobs : 0; + const int sliceh_end = !column ? (src_h * (jobnr+1)) / nb_jobs : src_h; + const int slicew_start = column ? (src_w * jobnr) / nb_jobs : 0; + const int slicew_end = column ? (src_w * (jobnr+1)) / nb_jobs : src_w; + const int c0_shift_h = s->shift_h[ component + 0 ]; + const int c1_shift_h = s->shift_h[(component + 1) % s->ncomp]; + const int c2_shift_h = s->shift_h[(component + 2) % s->ncomp]; const int c0_linesize = in->linesize[ plane + 0 ] / 2; const int c1_linesize = in->linesize[(plane + 1) % s->ncomp] / 2; const int c2_linesize = in->linesize[(plane + 2) % s->ncomp] / 2; + const uint16_t *c0_data = (const uint16_t *)in->data[plane + 0] + (sliceh_start >> c0_shift_h) * c0_linesize; + const uint16_t *c1_data = (const uint16_t *)in->data[(plane + 1) % s->ncomp] + (sliceh_start >> c1_shift_h) * c1_linesize; + const uint16_t *c2_data = (const uint16_t *)in->data[(plane + 2) % s->ncomp] + (sliceh_start >> c2_shift_h) * c2_linesize; const int d0_linesize = out->linesize[ plane + 0 ] / 2; const int d1_linesize = out->linesize[(plane + 1) % s->ncomp] / 2; const int d2_linesize = out->linesize[(plane + 2) % s->ncomp] / 2; const int c0_shift_w = s->shift_w[ component + 0 ]; const int c1_shift_w = s->shift_w[(component + 1) % s->ncomp]; const int c2_shift_w = s->shift_w[(component + 2) % s->ncomp]; - const int c0_shift_h = s->shift_h[ component + 0 ]; - const int c1_shift_h = s->shift_h[(component + 1) % s->ncomp]; - const int c2_shift_h = s->shift_h[(component + 2) % s->ncomp]; - const int src_h = in->height; - const int src_w = in->width; int x, y; - if (s->mode) { + if (column) { const int d0_signed_linesize = d0_linesize * (mirror == 1 ? -1 : 1); const int d1_signed_linesize = d1_linesize * (mirror == 1 ? -1 : 1); const int d2_signed_linesize = d2_linesize * (mirror == 1 ? -1 : 1); @@ -1670,7 +1924,7 @@ static av_always_inline void acolor16(WaveformContext *s, uint16_t * const d2 = (mirror ? d2_bottom_line : d2_data); for (y = 0; y < src_h; y++) { - for (x = 0; x < src_w; x++) { + for (x = slicew_start; x < slicew_end; x++) { const int c0 = FFMIN(c0_data[x >> c0_shift_w], limit); const int c1 = c1_data[x >> c1_shift_w]; const int c2 = c2_data[x >> c2_shift_w]; @@ -1691,9 +1945,9 @@ static av_always_inline void acolor16(WaveformContext *s, d2_data += d2_linesize; } } else { - uint16_t *d0_data = (uint16_t *)out->data[plane] + offset_y * d0_linesize + offset_x; - uint16_t *d1_data = (uint16_t *)out->data[(plane + 1) % s->ncomp] + offset_y * d1_linesize + offset_x; - uint16_t *d2_data = (uint16_t *)out->data[(plane + 2) % s->ncomp] + offset_y * d2_linesize + offset_x; + uint16_t *d0_data = (uint16_t *)out->data[plane] + (offset_y + sliceh_start) * d0_linesize + offset_x; + uint16_t *d1_data = (uint16_t *)out->data[(plane + 1) % s->ncomp] + (offset_y + sliceh_start) * d1_linesize + offset_x; + uint16_t *d2_data = (uint16_t *)out->data[(plane + 2) % s->ncomp] + (offset_y + sliceh_start) * d2_linesize + offset_x; if (mirror) { d0_data += s->size - 1; @@ -1701,7 +1955,7 @@ static av_always_inline void acolor16(WaveformContext *s, d2_data += s->size - 1; } - for (y = 0; y < src_h; y++) { + for (y = sliceh_start; y < sliceh_end; y++) { for (x = 0; x < src_w; x++) { const int c0 = FFMIN(c0_data[x >> c0_shift_w], limit); const int c1 = c1_data[x >> c1_shift_w]; @@ -1729,38 +1983,66 @@ static av_always_inline void acolor16(WaveformContext *s, d2_data += d2_linesize; } } +} - envelope16(s, out, plane, plane, column ? offset_x : offset_y); +#define ACOLOR16_FUNC(name, column, mirror) \ +static int acolor16_##name(AVFilterContext *ctx, \ + void *arg, int jobnr, \ + int nb_jobs) \ +{ \ + WaveformContext *s = ctx->priv; \ + ThreadData *td = arg; \ + AVFrame *in = td->in; \ + AVFrame *out = td->out; \ + int component = td->component; \ + int offset_y = td->offset_y; \ + int offset_x = td->offset_x; \ + \ + acolor16(s, in, out, component, s->intensity,\ + offset_y, offset_x, column, mirror, \ + jobnr, nb_jobs); \ + \ + return 0; \ } +ACOLOR16_FUNC(column_mirror, 1, 1) +ACOLOR16_FUNC(column, 1, 0) +ACOLOR16_FUNC(row_mirror, 0, 1) +ACOLOR16_FUNC(row, 0, 0) + static av_always_inline void acolor(WaveformContext *s, AVFrame *in, AVFrame *out, int component, int intensity, int offset_y, int offset_x, - int column, int mirror) + int column, int mirror, + int jobnr, int nb_jobs) { const int plane = s->desc->comp[component].plane; - const uint8_t *c0_data = in->data[plane + 0]; - const uint8_t *c1_data = in->data[(plane + 1) % s->ncomp]; - const uint8_t *c2_data = in->data[(plane + 2) % s->ncomp]; - const int c0_linesize = in->linesize[ plane + 0 ]; - const int c1_linesize = in->linesize[(plane + 1) % s->ncomp]; - const int c2_linesize = in->linesize[(plane + 2) % s->ncomp]; - const int d0_linesize = out->linesize[ plane + 0 ]; - const int d1_linesize = out->linesize[(plane + 1) % s->ncomp]; - const int d2_linesize = out->linesize[(plane + 2) % s->ncomp]; + const int src_h = in->height; + const int src_w = in->width; + const int sliceh_start = !column ? (src_h * jobnr) / nb_jobs : 0; + const int sliceh_end = !column ? (src_h * (jobnr+1)) / nb_jobs : src_h; + const int slicew_start = column ? (src_w * jobnr) / nb_jobs : 0; + const int slicew_end = column ? (src_w * (jobnr+1)) / nb_jobs : src_w; const int c0_shift_w = s->shift_w[ component + 0 ]; const int c1_shift_w = s->shift_w[(component + 1) % s->ncomp]; const int c2_shift_w = s->shift_w[(component + 2) % s->ncomp]; const int c0_shift_h = s->shift_h[ component + 0 ]; const int c1_shift_h = s->shift_h[(component + 1) % s->ncomp]; const int c2_shift_h = s->shift_h[(component + 2) % s->ncomp]; + const int c0_linesize = in->linesize[ plane + 0 ]; + const int c1_linesize = in->linesize[(plane + 1) % s->ncomp]; + const int c2_linesize = in->linesize[(plane + 2) % s->ncomp]; + const uint8_t *c0_data = in->data[plane + 0] + (sliceh_start >> c0_shift_h) * c0_linesize; + const uint8_t *c1_data = in->data[(plane + 1) % s->ncomp] + (sliceh_start >> c1_shift_h) * c1_linesize; + const uint8_t *c2_data = in->data[(plane + 2) % s->ncomp] + (sliceh_start >> c2_shift_h) * c2_linesize; + const int d0_linesize = out->linesize[ plane + 0 ]; + const int d1_linesize = out->linesize[(plane + 1) % s->ncomp]; + const int d2_linesize = out->linesize[(plane + 2) % s->ncomp]; const int max = 255 - intensity; - const int src_h = in->height; - const int src_w = in->width; int x, y; - if (s->mode) { + if (column) { const int d0_signed_linesize = d0_linesize * (mirror == 1 ? -1 : 1); const int d1_signed_linesize = d1_linesize * (mirror == 1 ? -1 : 1); const int d2_signed_linesize = d2_linesize * (mirror == 1 ? -1 : 1); @@ -1775,7 +2057,7 @@ static av_always_inline void acolor(WaveformContext *s, uint8_t * const d2 = (mirror ? d2_bottom_line : d2_data); for (y = 0; y < src_h; y++) { - for (x = 0; x < src_w; x++) { + for (x = slicew_start; x < slicew_end; x++) { const int c0 = c0_data[x >> c0_shift_w]; const int c1 = c1_data[x >> c1_shift_w]; const int c2 = c2_data[x >> c2_shift_w]; @@ -1796,9 +2078,9 @@ static av_always_inline void acolor(WaveformContext *s, d2_data += d2_linesize; } } else { - uint8_t *d0_data = out->data[plane] + offset_y * d0_linesize + offset_x; - uint8_t *d1_data = out->data[(plane + 1) % s->ncomp] + offset_y * d1_linesize + offset_x; - uint8_t *d2_data = out->data[(plane + 2) % s->ncomp] + offset_y * d2_linesize + offset_x; + uint8_t *d0_data = out->data[plane] + (offset_y + sliceh_start) * d0_linesize + offset_x; + uint8_t *d1_data = out->data[(plane + 1) % s->ncomp] + (offset_y + sliceh_start) * d1_linesize + offset_x; + uint8_t *d2_data = out->data[(plane + 2) % s->ncomp] + (offset_y + sliceh_start) * d2_linesize + offset_x; if (mirror) { d0_data += s->size - 1; @@ -1806,7 +2088,7 @@ static av_always_inline void acolor(WaveformContext *s, d2_data += s->size - 1; } - for (y = 0; y < src_h; y++) { + for (y = sliceh_start; y < sliceh_end; y++) { for (x = 0; x < src_w; x++) { const int c0 = c0_data[x >> c0_shift_w]; const int c1 = c1_data[x >> c1_shift_w]; @@ -1834,12 +2116,34 @@ static av_always_inline void acolor(WaveformContext *s, d2_data += d2_linesize; } } +} - envelope(s, out, plane, plane, column ? offset_x : offset_y); +#define ACOLOR_FUNC(name, column, mirror) \ +static int acolor_##name(AVFilterContext *ctx, \ + void *arg, int jobnr, \ + int nb_jobs) \ +{ \ + WaveformContext *s = ctx->priv; \ + ThreadData *td = arg; \ + AVFrame *in = td->in; \ + AVFrame *out = td->out; \ + int component = td->component; \ + int offset_y = td->offset_y; \ + int offset_x = td->offset_x; \ + \ + acolor(s, in, out, component, s->intensity, \ + offset_y, offset_x, column, mirror, \ + jobnr, nb_jobs); \ + \ + return 0; \ } +ACOLOR_FUNC(column_mirror, 1, 1) +ACOLOR_FUNC(column, 1, 0) +ACOLOR_FUNC(row_mirror, 0, 1) +ACOLOR_FUNC(row, 0, 0) + static const uint8_t black_yuva_color[4] = { 0, 127, 127, 255 }; -static const uint8_t green_yuva_color[4] = { 255, 0, 0, 255 }; static const uint8_t black_gbrp_color[4] = { 0, 0, 0, 255 }; static const GraticuleLines aflat_digital8[] = { @@ -2300,7 +2604,7 @@ static void graticule_none(WaveformContext *s, AVFrame *out) { } -static void graticule_green_row(WaveformContext *s, AVFrame *out) +static void graticule_row(WaveformContext *s, AVFrame *out) { const int step = (s->flags & 2) + 1; const float o1 = s->opacity; @@ -2314,7 +2618,7 @@ static void graticule_green_row(WaveformContext *s, AVFrame *out) k++; for (p = 0; p < s->ncomp; p++) { - const int v = green_yuva_color[p]; + const int v = s->grat_yuva_color[p]; for (l = 0; l < s->nb_glines; l++) { const uint16_t pos = s->glines[l].line[c].pos; int x = offset_x + (s->mirror ? s->size - 1 - pos : pos); @@ -2332,7 +2636,7 @@ static void graticule_green_row(WaveformContext *s, AVFrame *out) if (x < 0) x = 4; - draw_vtext(out, x, offset_y + 2, o1, o2, name, green_yuva_color); + draw_vtext(out, x, offset_y + 2, o1, o2, name, s->grat_yuva_color); } offset_x += s->size * (s->display == STACK); @@ -2340,12 +2644,12 @@ static void graticule_green_row(WaveformContext *s, AVFrame *out) } } -static void graticule16_green_row(WaveformContext *s, AVFrame *out) +static void graticule16_row(WaveformContext *s, AVFrame *out) { const int step = (s->flags & 2) + 1; const float o1 = s->opacity; const float o2 = 1. - o1; - const int mult = s->size / 256; + const int mult = s->max / 256; const int height = s->display == PARADE ? out->height / s->acomp : out->height; int k = 0, c, p, l, offset_x = 0, offset_y = 0; @@ -2355,7 +2659,7 @@ static void graticule16_green_row(WaveformContext *s, AVFrame *out) k++; for (p = 0; p < s->ncomp; p++) { - const int v = green_yuva_color[p] * mult; + const int v = s->grat_yuva_color[p] * mult; for (l = 0; l < s->nb_glines ; l++) { const uint16_t pos = s->glines[l].line[c].pos; int x = offset_x + (s->mirror ? s->size - 1 - pos : pos); @@ -2373,7 +2677,7 @@ static void graticule16_green_row(WaveformContext *s, AVFrame *out) if (x < 0) x = 4; - draw_vtext16(out, x, offset_y + 2, mult, o1, o2, name, green_yuva_color); + draw_vtext16(out, x, offset_y + 2, mult, o1, o2, name, s->grat_yuva_color); } offset_x += s->size * (s->display == STACK); @@ -2381,7 +2685,7 @@ static void graticule16_green_row(WaveformContext *s, AVFrame *out) } } -static void graticule_green_column(WaveformContext *s, AVFrame *out) +static void graticule_column(WaveformContext *s, AVFrame *out) { const int step = (s->flags & 2) + 1; const float o1 = s->opacity; @@ -2395,7 +2699,7 @@ static void graticule_green_column(WaveformContext *s, AVFrame *out) k++; for (p = 0; p < s->ncomp; p++) { - const int v = green_yuva_color[p]; + const int v = s->grat_yuva_color[p]; for (l = 0; l < s->nb_glines ; l++) { const uint16_t pos = s->glines[l].line[c].pos; int y = offset_y + (s->mirror ? s->size - 1 - pos : pos); @@ -2413,7 +2717,7 @@ static void graticule_green_column(WaveformContext *s, AVFrame *out) if (y < 0) y = 4; - draw_htext(out, 2 + offset_x, y, o1, o2, name, green_yuva_color); + draw_htext(out, 2 + offset_x, y, o1, o2, name, s->grat_yuva_color); } offset_y += s->size * (s->display == STACK); @@ -2421,12 +2725,12 @@ static void graticule_green_column(WaveformContext *s, AVFrame *out) } } -static void graticule16_green_column(WaveformContext *s, AVFrame *out) +static void graticule16_column(WaveformContext *s, AVFrame *out) { const int step = (s->flags & 2) + 1; const float o1 = s->opacity; const float o2 = 1. - o1; - const int mult = s->size / 256; + const int mult = s->max / 256; const int width = s->display == PARADE ? out->width / s->acomp : out->width; int k = 0, c, p, l, offset_x = 0, offset_y = 0; @@ -2436,7 +2740,7 @@ static void graticule16_green_column(WaveformContext *s, AVFrame *out) k++; for (p = 0; p < s->ncomp; p++) { - const int v = green_yuva_color[p] * mult; + const int v = s->grat_yuva_color[p] * mult; for (l = 0; l < s->nb_glines ; l++) { const uint16_t pos = s->glines[l].line[c].pos; int y = offset_y + (s->mirror ? s->size - 1 - pos : pos); @@ -2454,7 +2758,7 @@ static void graticule16_green_column(WaveformContext *s, AVFrame *out) if (y < 0) y = 4; - draw_htext16(out, 2 + offset_x, y, mult, o1, o2, name, green_yuva_color); + draw_htext16(out, 2 + offset_x, y, mult, o1, o2, name, s->grat_yuva_color); } offset_y += s->size * (s->display == STACK); @@ -2481,6 +2785,7 @@ static int config_input(AVFilterLink *inlink) s->graticulef = graticule_none; switch (s->filter) { + case XFLAT: case AFLAT: s->size = 256 * 2; break; case FLAT: s->size = 256 * 3; break; default: s->size = 256; break; @@ -2488,67 +2793,80 @@ static int config_input(AVFilterLink *inlink) switch (s->filter | ((s->bits > 8) << 4) | (s->mode << 8) | (s->mirror << 12)) { - case 0x1100: s->waveform = lowpass_column_mirror; break; - case 0x1000: s->waveform = lowpass_row_mirror; break; - case 0x0100: s->waveform = lowpass_column; break; - case 0x0000: s->waveform = lowpass_row; break; - case 0x1110: s->waveform = lowpass16_column_mirror; break; - case 0x1010: s->waveform = lowpass16_row_mirror; break; - case 0x0110: s->waveform = lowpass16_column; break; - case 0x0010: s->waveform = lowpass16_row; break; - case 0x1101: - case 0x1001: - case 0x0101: - case 0x0001: s->waveform = flat; break; - case 0x1111: - case 0x1011: - case 0x0111: - case 0x0011: s->waveform = flat16; break; - case 0x1102: - case 0x1002: - case 0x0102: - case 0x0002: s->waveform = aflat; break; - case 0x1112: - case 0x1012: - case 0x0112: - case 0x0012: s->waveform = aflat16; break; - case 0x1103: - case 0x1003: - case 0x0103: - case 0x0003: s->waveform = chroma; break; - case 0x1113: - case 0x1013: - case 0x0113: - case 0x0013: s->waveform = chroma16; break; - case 0x1104: - case 0x1004: - case 0x0104: - case 0x0004: s->waveform = color; break; - case 0x1114: - case 0x1014: - case 0x0114: - case 0x0014: s->waveform = color16; break; - case 0x1105: - case 0x1005: - case 0x0105: - case 0x0005: s->waveform = acolor; break; - case 0x1115: - case 0x1015: - case 0x0115: - case 0x0015: s->waveform = acolor16; break; + case 0x1100: s->waveform_slice = lowpass_column_mirror; break; + case 0x1000: s->waveform_slice = lowpass_row_mirror; break; + case 0x0100: s->waveform_slice = lowpass_column; break; + case 0x0000: s->waveform_slice = lowpass_row; break; + case 0x1110: s->waveform_slice = lowpass16_column_mirror; break; + case 0x1010: s->waveform_slice = lowpass16_row_mirror; break; + case 0x0110: s->waveform_slice = lowpass16_column; break; + case 0x0010: s->waveform_slice = lowpass16_row; break; + case 0x1101: s->waveform_slice = flat_column_mirror; break; + case 0x1001: s->waveform_slice = flat_row_mirror; break; + case 0x0101: s->waveform_slice = flat_column; break; + case 0x0001: s->waveform_slice = flat_row; break; + case 0x1111: s->waveform_slice = flat16_column_mirror; break; + case 0x1011: s->waveform_slice = flat16_row_mirror; break; + case 0x0111: s->waveform_slice = flat16_column; break; + case 0x0011: s->waveform_slice = flat16_row; break; + case 0x1102: s->waveform_slice = aflat_column_mirror; break; + case 0x1002: s->waveform_slice = aflat_row_mirror; break; + case 0x0102: s->waveform_slice = aflat_column; break; + case 0x0002: s->waveform_slice = aflat_row; break; + case 0x1112: s->waveform_slice = aflat16_column_mirror; break; + case 0x1012: s->waveform_slice = aflat16_row_mirror; break; + case 0x0112: s->waveform_slice = aflat16_column; break; + case 0x0012: s->waveform_slice = aflat16_row; break; + case 0x1103: s->waveform_slice = chroma_column_mirror; break; + case 0x1003: s->waveform_slice = chroma_row_mirror; break; + case 0x0103: s->waveform_slice = chroma_column; break; + case 0x0003: s->waveform_slice = chroma_row; break; + case 0x1113: s->waveform_slice = chroma16_column_mirror; break; + case 0x1013: s->waveform_slice = chroma16_row_mirror; break; + case 0x0113: s->waveform_slice = chroma16_column; break; + case 0x0013: s->waveform_slice = chroma16_row; break; + case 0x1104: s->waveform_slice = color_column_mirror; break; + case 0x1004: s->waveform_slice = color_row_mirror; break; + case 0x0104: s->waveform_slice = color_column; break; + case 0x0004: s->waveform_slice = color_row; break; + case 0x1114: s->waveform_slice = color16_column_mirror; break; + case 0x1014: s->waveform_slice = color16_row_mirror; break; + case 0x0114: s->waveform_slice = color16_column; break; + case 0x0014: s->waveform_slice = color16_row; break; + case 0x1105: s->waveform_slice = acolor_column_mirror; break; + case 0x1005: s->waveform_slice = acolor_row_mirror; break; + case 0x0105: s->waveform_slice = acolor_column; break; + case 0x0005: s->waveform_slice = acolor_row; break; + case 0x1115: s->waveform_slice = acolor16_column_mirror; break; + case 0x1015: s->waveform_slice = acolor16_row_mirror; break; + case 0x0115: s->waveform_slice = acolor16_column; break; + case 0x0015: s->waveform_slice = acolor16_row; break; + case 0x1106: s->waveform_slice = xflat_column_mirror; break; + case 0x1006: s->waveform_slice = xflat_row_mirror; break; + case 0x0106: s->waveform_slice = xflat_column; break; + case 0x0006: s->waveform_slice = xflat_row; break; + case 0x1116: s->waveform_slice = xflat16_column_mirror; break; + case 0x1016: s->waveform_slice = xflat16_row_mirror; break; + case 0x0116: s->waveform_slice = xflat16_column; break; + case 0x0016: s->waveform_slice = xflat16_row; break; } + s->grat_yuva_color[0] = 255; + s->grat_yuva_color[2] = s->graticule == 2 ? 255 : 0; + s->grat_yuva_color[3] = 255; + switch (s->filter) { case LOWPASS: case COLOR: case ACOLOR: case CHROMA: case AFLAT: + case XFLAT: case FLAT: if (s->graticule && s->mode == 1) - s->graticulef = s->bits > 8 ? graticule16_green_column : graticule_green_column; + s->graticulef = s->bits > 8 ? graticule16_column : graticule_column; else if (s->graticule && s->mode == 0) - s->graticulef = s->bits > 8 ? graticule16_green_row : graticule_green_row; + s->graticulef = s->bits > 8 ? graticule16_row : graticule_row; break; } @@ -2611,6 +2929,7 @@ static int config_input(AVFilterLink *inlink) break; } break; + case XFLAT: case AFLAT: switch (s->scale) { case DIGITAL: @@ -2784,6 +3103,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) for (k = 0, i = 0; k < s->ncomp; k++) { if ((1 << k) & s->pcomp) { + const int plane = s->desc->comp[k].plane; + ThreadData td; int offset_y; int offset_x; @@ -2794,7 +3115,45 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) offset_y = s->mode ? i++ * s->size * !!s->display : 0; offset_x = s->mode ? 0 : i++ * s->size * !!s->display; } - s->waveform(s, in, out, k, s->intensity, offset_y, offset_x, s->mode, s->mirror); + + td.in = in; + td.out = out; + td.component = k; + td.offset_y = offset_y; + td.offset_x = offset_x; + ctx->internal->execute(ctx, s->waveform_slice, &td, NULL, ff_filter_get_nb_threads(ctx)); + switch (s->filter) { + case ACOLOR: + case CHROMA: + case COLOR: + case LOWPASS: + if (s->bits <= 8) + envelope(s, out, plane, plane, s->mode ? offset_x : offset_y); + else + envelope16(s, out, plane, plane, s->mode ? offset_x : offset_y); + break; + case FLAT: + if (s->bits <= 8) { + envelope(s, out, plane, plane, s->mode ? offset_x : offset_y); + envelope(s, out, plane, (plane + 1) % s->ncomp, s->mode ? offset_x : offset_y); + } else { + envelope16(s, out, plane, plane, s->mode ? offset_x : offset_y); + envelope16(s, out, plane, (plane + 1) % s->ncomp, s->mode ? offset_x : offset_y); + } + break; + case AFLAT: + case XFLAT: + if (s->bits <= 8) { + envelope(s, out, plane, (plane + 0) % s->ncomp, s->mode ? offset_x : offset_y); + envelope(s, out, plane, (plane + 1) % s->ncomp, s->mode ? offset_x : offset_y); + envelope(s, out, plane, (plane + 2) % s->ncomp, s->mode ? offset_x : offset_y); + } else { + envelope16(s, out, plane, (plane + 0) % s->ncomp, s->mode ? offset_x : offset_y); + envelope16(s, out, plane, (plane + 1) % s->ncomp, s->mode ? offset_x : offset_y); + envelope16(s, out, plane, (plane + 2) % s->ncomp, s->mode ? offset_x : offset_y); + } + break; + } } } s->graticulef(s, out); @@ -2838,4 +3197,5 @@ AVFilter ff_vf_waveform = { .uninit = uninit, .inputs = inputs, .outputs = outputs, + .flags = AVFILTER_FLAG_SLICE_THREADS, };