int ncomp;
int pcomp;
const uint8_t *bg_color;
+ float fintensity;
int intensity;
int mirror;
int display;
int envelope;
int estart[4];
int eend[4];
- int *emax[4];
- int *emin[4];
+ int *emax[4][4];
+ int *emin[4][4];
+ int *peak;
int filter;
+ int bits;
+ int max;
int size;
void (*waveform)(struct WaveformContext *s, AVFrame *in, AVFrame *out,
int component, int intensity, int offset, int column);
{ "m", "set mode", OFFSET(mode), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, FLAGS, "mode" },
{ "row", NULL, 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "mode" },
{ "column", NULL, 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "mode" },
- { "intensity", "set intensity", OFFSET(intensity), AV_OPT_TYPE_INT, {.i64=10}, 1, 255, FLAGS },
- { "i", "set intensity", OFFSET(intensity), AV_OPT_TYPE_INT, {.i64=10}, 1, 255, FLAGS },
+ { "intensity", "set intensity", OFFSET(fintensity), AV_OPT_TYPE_FLOAT, {.dbl=0.04}, 0, 1, FLAGS },
+ { "i", "set intensity", OFFSET(fintensity), AV_OPT_TYPE_FLOAT, {.dbl=0.04}, 0, 1, FLAGS },
{ "mirror", "set mirroring", OFFSET(mirror), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, FLAGS },
{ "r", "set mirroring", OFFSET(mirror), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, FLAGS },
{ "display", "set display mode", OFFSET(display), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, FLAGS, "display" },
static const enum AVPixelFormat lowpass_pix_fmts[] = {
AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP,
+ AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10,
AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P,
AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P,
AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P,
AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P,
AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA420P,
AV_PIX_FMT_GRAY8,
+ AV_PIX_FMT_YUV444P9, AV_PIX_FMT_YUV422P9, AV_PIX_FMT_YUV420P9,
+ AV_PIX_FMT_YUVA444P9, AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA420P9,
+ AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV420P10,
+ AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA420P10,
AV_PIX_FMT_NONE
};
static const enum AVPixelFormat color_pix_fmts[] = {
AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP,
- AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_NONE
+ AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10,
+ AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVJ444P,
+ AV_PIX_FMT_YUV444P9, AV_PIX_FMT_YUV444P10,
+ AV_PIX_FMT_NONE
};
static int query_formats(AVFilterContext *ctx)
return ff_set_common_formats(ctx, fmts_list);
}
-static void envelope_instant(WaveformContext *s, AVFrame *out, int plane)
+static void envelope_instant16(WaveformContext *s, AVFrame *out, int plane, int component)
{
- const int dst_linesize = out->linesize[plane];
- const uint8_t bg = s->bg_color[plane];
- const int is_chroma = (plane == 1 || plane == 2);
+ const int dst_linesize = out->linesize[component] / 2;
+ const int bg = s->bg_color[component] * (s->max / 256);
+ const int limit = s->max - 1;
+ const int is_chroma = (component == 1 || component == 2);
+ const int shift_w = (is_chroma ? s->desc->log2_chroma_w : 0);
+ const int shift_h = (is_chroma ? s->desc->log2_chroma_h : 0);
+ const int dst_h = FF_CEIL_RSHIFT(out->height, shift_h);
+ const int dst_w = FF_CEIL_RSHIFT(out->width, shift_w);
+ const int start = s->estart[plane];
+ const int end = s->eend[plane];
+ uint16_t *dst;
+ int x, y;
+
+ if (s->mode) {
+ for (x = 0; x < dst_w; x++) {
+ for (y = start; y < end; y++) {
+ dst = (uint16_t *)out->data[component] + y * dst_linesize + x;
+ if (dst[0] != bg) {
+ dst[0] = limit;
+ break;
+ }
+ }
+ for (y = end - 1; y >= start; y--) {
+ dst = (uint16_t *)out->data[component] + y * dst_linesize + x;
+ if (dst[0] != bg) {
+ dst[0] = limit;
+ break;
+ }
+ }
+ }
+ } else {
+ for (y = 0; y < dst_h; y++) {
+ dst = (uint16_t *)out->data[component] + y * dst_linesize;
+ for (x = start; x < end; x++) {
+ if (dst[x] != bg) {
+ dst[x] = limit;
+ break;
+ }
+ }
+ for (x = end - 1; x >= start; x--) {
+ if (dst[x] != bg) {
+ dst[x] = limit;
+ break;
+ }
+ }
+ }
+ }
+}
+
+static void envelope_instant(WaveformContext *s, AVFrame *out, int plane, int component)
+{
+ const int dst_linesize = out->linesize[component];
+ const uint8_t bg = s->bg_color[component];
+ const int is_chroma = (component == 1 || component == 2);
const int shift_w = (is_chroma ? s->desc->log2_chroma_w : 0);
const int shift_h = (is_chroma ? s->desc->log2_chroma_h : 0);
const int dst_h = FF_CEIL_RSHIFT(out->height, shift_h);
if (s->mode) {
for (x = 0; x < dst_w; x++) {
for (y = start; y < end; y++) {
- dst = out->data[plane] + y * dst_linesize + x;
+ dst = out->data[component] + y * dst_linesize + x;
if (dst[0] != bg) {
dst[0] = 255;
break;
}
}
for (y = end - 1; y >= start; y--) {
- dst = out->data[plane] + y * dst_linesize + x;
+ dst = out->data[component] + y * dst_linesize + x;
if (dst[0] != bg) {
dst[0] = 255;
break;
}
} else {
for (y = 0; y < dst_h; y++) {
- dst = out->data[plane] + y * dst_linesize;
+ dst = out->data[component] + y * dst_linesize;
for (x = start; x < end; x++) {
if (dst[x] != bg) {
dst[x] = 255;
}
}
-static void envelope_peak(WaveformContext *s, AVFrame *out, int plane)
+static void envelope_peak16(WaveformContext *s, AVFrame *out, int plane, int component)
{
- const int dst_linesize = out->linesize[plane];
- const uint8_t bg = s->bg_color[plane];
- const int is_chroma = (plane == 1 || plane == 2);
+ const int dst_linesize = out->linesize[component] / 2;
+ const int bg = s->bg_color[component] * (s->max / 256);
+ const int limit = s->max - 1;
+ const int is_chroma = (component == 1 || component == 2);
const int shift_w = (is_chroma ? s->desc->log2_chroma_w : 0);
const int shift_h = (is_chroma ? s->desc->log2_chroma_h : 0);
const int dst_h = FF_CEIL_RSHIFT(out->height, shift_h);
const int dst_w = FF_CEIL_RSHIFT(out->width, shift_w);
const int start = s->estart[plane];
const int end = s->eend[plane];
- int *emax = s->emax[plane];
- int *emin = s->emin[plane];
+ int *emax = s->emax[plane][component];
+ int *emin = s->emin[plane][component];
+ uint16_t *dst;
+ int x, y;
+
+ if (s->mode) {
+ for (x = 0; x < dst_w; x++) {
+ for (y = start; y < end && y < emin[x]; y++) {
+ dst = (uint16_t *)out->data[component] + y * dst_linesize + x;
+ if (dst[0] != bg) {
+ emin[x] = y;
+ break;
+ }
+ }
+ for (y = end - 1; y >= start && y >= emax[x]; y--) {
+ dst = (uint16_t *)out->data[component] + y * dst_linesize + x;
+ if (dst[0] != bg) {
+ emax[x] = y;
+ break;
+ }
+ }
+ }
+
+ if (s->envelope == 3)
+ envelope_instant16(s, out, plane, component);
+
+ for (x = 0; x < dst_w; x++) {
+ dst = (uint16_t *)out->data[component] + emin[x] * dst_linesize + x;
+ dst[0] = limit;
+ dst = (uint16_t *)out->data[component] + emax[x] * dst_linesize + x;
+ dst[0] = limit;
+ }
+ } else {
+ for (y = 0; y < dst_h; y++) {
+ dst = (uint16_t *)out->data[component] + y * dst_linesize;
+ for (x = start; x < end && x < emin[y]; x++) {
+ if (dst[x] != bg) {
+ emin[y] = x;
+ break;
+ }
+ }
+ for (x = end - 1; x >= start && x >= emax[y]; x--) {
+ if (dst[x] != bg) {
+ emax[y] = x;
+ break;
+ }
+ }
+ }
+
+ if (s->envelope == 3)
+ envelope_instant16(s, out, plane, component);
+
+ for (y = 0; y < dst_h; y++) {
+ dst = (uint16_t *)out->data[component] + y * dst_linesize + emin[y];
+ dst[0] = limit;
+ dst = (uint16_t *)out->data[component] + y * dst_linesize + emax[y];
+ dst[0] = limit;
+ }
+ }
+}
+
+static void envelope_peak(WaveformContext *s, AVFrame *out, int plane, int component)
+{
+ const int dst_linesize = out->linesize[component];
+ const int bg = s->bg_color[component];
+ const int is_chroma = (component == 1 || component == 2);
+ const int shift_w = (is_chroma ? s->desc->log2_chroma_w : 0);
+ const int shift_h = (is_chroma ? s->desc->log2_chroma_h : 0);
+ const int dst_h = FF_CEIL_RSHIFT(out->height, shift_h);
+ const int dst_w = FF_CEIL_RSHIFT(out->width, shift_w);
+ const int start = s->estart[plane];
+ const int end = s->eend[plane];
+ int *emax = s->emax[plane][component];
+ int *emin = s->emin[plane][component];
uint8_t *dst;
int x, y;
if (s->mode) {
for (x = 0; x < dst_w; x++) {
for (y = start; y < end && y < emin[x]; y++) {
- dst = out->data[plane] + y * dst_linesize + x;
+ dst = out->data[component] + y * dst_linesize + x;
if (dst[0] != bg) {
emin[x] = y;
break;
}
}
for (y = end - 1; y >= start && y >= emax[x]; y--) {
- dst = out->data[plane] + y * dst_linesize + x;
+ dst = out->data[component] + y * dst_linesize + x;
if (dst[0] != bg) {
emax[x] = y;
break;
}
if (s->envelope == 3)
- envelope_instant(s, out, plane);
+ envelope_instant(s, out, plane, component);
for (x = 0; x < dst_w; x++) {
- dst = out->data[plane] + emin[x] * dst_linesize + x;
+ dst = out->data[component] + emin[x] * dst_linesize + x;
dst[0] = 255;
- dst = out->data[plane] + emax[x] * dst_linesize + x;
+ dst = out->data[component] + emax[x] * dst_linesize + x;
dst[0] = 255;
}
} else {
for (y = 0; y < dst_h; y++) {
- dst = out->data[plane] + y * dst_linesize;
+ dst = out->data[component] + y * dst_linesize;
for (x = start; x < end && x < emin[y]; x++) {
if (dst[x] != bg) {
emin[y] = x;
}
if (s->envelope == 3)
- envelope_instant(s, out, plane);
+ envelope_instant(s, out, plane, component);
for (y = 0; y < dst_h; y++) {
- dst = out->data[plane] + y * dst_linesize + emin[y];
+ dst = out->data[component] + y * dst_linesize + emin[y];
dst[0] = 255;
- dst = out->data[plane] + y * dst_linesize + emax[y];
+ dst = out->data[component] + y * dst_linesize + emax[y];
dst[0] = 255;
}
}
}
-static void envelope(WaveformContext *s, AVFrame *out, int plane)
+static void envelope16(WaveformContext *s, AVFrame *out, int plane, int component)
+{
+ if (s->envelope == 0) {
+ return;
+ } else if (s->envelope == 1) {
+ envelope_instant16(s, out, plane, component);
+ } else {
+ envelope_peak16(s, out, plane, component);
+ }
+}
+
+static void envelope(WaveformContext *s, AVFrame *out, int plane, int component)
{
if (s->envelope == 0) {
return;
} else if (s->envelope == 1) {
- envelope_instant(s, out, plane);
+ envelope_instant(s, out, plane, component);
} else {
- envelope_peak(s, out, plane);
+ envelope_peak(s, out, plane, component);
}
}
+static void update16(uint16_t *target, int max, int intensity, int limit)
+{
+ if (*target <= max)
+ *target += intensity;
+ else
+ *target = limit;
+}
+
static void update(uint8_t *target, int max, int intensity)
{
if (*target <= max)
*target = 255;
}
+static void lowpass16(WaveformContext *s, AVFrame *in, AVFrame *out,
+ int component, int intensity, int offset, int column)
+{
+ const int plane = s->desc->comp[component].plane;
+ const int mirror = s->mirror;
+ const int is_chroma = (component == 1 || component == 2);
+ const int shift_w = (is_chroma ? s->desc->log2_chroma_w : 0);
+ const int shift_h = (is_chroma ? s->desc->log2_chroma_h : 0);
+ const int src_linesize = in->linesize[plane] / 2;
+ const int dst_linesize = out->linesize[plane] / 2;
+ const int dst_signed_linesize = dst_linesize * (mirror == 1 ? -1 : 1);
+ const int limit = s->max - 1;
+ const int max = limit - intensity;
+ const int src_h = FF_CEIL_RSHIFT(in->height, shift_h);
+ const int src_w = FF_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] + (column ? (offset >> shift_h) * dst_linesize : offset >> shift_w);
+ uint16_t * const dst_bottom_line = dst_data + dst_linesize * ((s->size >> shift_h) - 1);
+ uint16_t * const dst_line = (mirror ? dst_bottom_line : dst_data);
+ const uint16_t *p;
+ int y;
+
+ if (!column && mirror)
+ dst_data += s->size >> shift_w;
+
+ for (y = 0; y < src_h; y++) {
+ const uint16_t *src_data_end = src_data + src_w;
+ uint16_t *dst = dst_line;
+
+ for (p = src_data; p < src_data_end; p++) {
+ uint16_t *target;
+ int v = FFMIN(*p, limit);
+
+ if (column) {
+ target = dst++ + dst_signed_linesize * (v >> shift_h);
+ } else {
+ if (mirror)
+ target = dst_data - (v >> shift_w) - 1;
+ else
+ target = dst_data + (v >> shift_w);
+ }
+ update16(target, max, intensity, limit);
+ }
+ src_data += src_linesize;
+ dst_data += dst_linesize;
+ }
+
+ envelope16(s, out, plane, plane);
+}
+
static void lowpass(WaveformContext *s, AVFrame *in, AVFrame *out,
int component, int intensity, int offset, int column)
{
dst_data += dst_linesize;
}
- envelope(s, out, plane);
+ envelope(s, out, plane, plane);
}
static void flat(WaveformContext *s, AVFrame *in, AVFrame *out,
if (mirror) {
d0_data += s->size - 1;
- d1_data += s->size;
+ d1_data += s->size - 1;
}
for (y = 0; y < src_h; y++) {
for (p = c0 - c1; p < c0 + c1; p++) {
if (mirror)
- target = d1_data - p - 1;
+ target = d1_data - p;
else
target = d1_data + p;
d1_data += d1_linesize;
}
}
+
+ envelope(s, out, plane, plane);
+ envelope(s, out, plane, (plane + 1) % s->ncomp);
}
static void aflat(WaveformContext *s, AVFrame *in, AVFrame *out,
d2_data += d2_linesize;
}
}
+
+ envelope(s, out, plane, (plane + 0) % s->ncomp);
+ envelope(s, out, plane, (plane + 1) % s->ncomp);
+ envelope(s, out, plane, (plane + 2) % s->ncomp);
}
static void chroma(WaveformContext *s, AVFrame *in, AVFrame *out,
dst_data += dst_linesize;
}
}
+
+ envelope(s, out, plane, (plane + 0) % s->ncomp);
}
static void achroma(WaveformContext *s, AVFrame *in, AVFrame *out,
d2_data += d2_linesize;
}
}
+
+ envelope(s, out, plane, (plane + 1) % s->ncomp);
+ envelope(s, out, plane, (plane + 2) % s->ncomp);
+}
+
+static void color16(WaveformContext *s, AVFrame *in, AVFrame *out,
+ int component, int intensity, int offset, int column)
+{
+ const int plane = s->desc->comp[component].plane;
+ const int mirror = s->mirror;
+ 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 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 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 src_h = in->height;
+ const int src_w = in->width;
+ int x, y;
+
+ if (s->mode) {
+ 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);
+ uint16_t *d0_data = (uint16_t *)out->data[plane] + offset * d0_linesize;
+ uint16_t *d1_data = (uint16_t *)out->data[(plane + 1) % s->ncomp] + offset * d1_linesize;
+ uint16_t *d2_data = (uint16_t *)out->data[(plane + 2) % s->ncomp] + offset * d2_linesize;
+ 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++) {
+ for (x = 0; x < src_w; x++) {
+ const int c0 = FFMIN(c0_data[x], limit);
+ const int c1 = c1_data[x];
+ const int c2 = c2_data[x];
+
+ *(d0 + d0_signed_linesize * c0 + x) = c0;
+ *(d1 + d1_signed_linesize * c0 + x) = c1;
+ *(d2 + d2_signed_linesize * c0 + x) = c2;
+ }
+
+ c0_data += c0_linesize;
+ c1_data += c1_linesize;
+ c2_data += c2_linesize;
+ d0_data += d0_linesize;
+ d1_data += d1_linesize;
+ d2_data += d2_linesize;
+ }
+ } else {
+ uint16_t *d0_data = (uint16_t *)out->data[plane] + offset;
+ uint16_t *d1_data = (uint16_t *)out->data[(plane + 1) % s->ncomp] + offset;
+ uint16_t *d2_data = (uint16_t *)out->data[(plane + 2) % s->ncomp] + offset;
+
+ 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], limit);
+ const int c1 = c1_data[x];
+ const int c2 = c2_data[x];
+
+ if (mirror) {
+ *(d0_data - c0) = c0;
+ *(d1_data - c0) = c1;
+ *(d2_data - c0) = c2;
+ } else {
+ *(d0_data + c0) = c0;
+ *(d1_data + c0) = c1;
+ *(d2_data + c0) = c2;
+ }
+ }
+
+ c0_data += c0_linesize;
+ c1_data += c1_linesize;
+ c2_data += c2_linesize;
+ d0_data += d0_linesize;
+ d1_data += d1_linesize;
+ d2_data += d2_linesize;
+ }
+ }
+
+ envelope16(s, out, plane, plane);
}
static void color(WaveformContext *s, AVFrame *in, AVFrame *out,
d2_data += d2_linesize;
}
}
+
+ envelope(s, out, plane, plane);
}
static const uint8_t black_yuva_color[4] = { 0, 127, 127, 255 };
s->desc = av_pix_fmt_desc_get(inlink->format);
s->ncomp = s->desc->nb_components;
+ s->bits = s->desc->comp[0].depth_minus1 + 1;
+ s->max = 1 << s->bits;
+ s->intensity = s->fintensity * (s->max - 1);
switch (s->filter) {
case LOWPASS:
s->size = 256;
- s->waveform = lowpass; break;
+ s->waveform = s->bits > 8 ? lowpass16 : lowpass; break;
case FLAT:
s->size = 256 * 3;
s->waveform = flat; break;
s->waveform = achroma; break;
case COLOR:
s->size = 256;
- s->waveform = color; break;
+ s->waveform = s->bits > 8 ? color16 : color; break;
}
+ s->size = s->size << (s->bits - 8);
+
switch (inlink->format) {
case AV_PIX_FMT_GBRAP:
case AV_PIX_FMT_GBRP:
+ case AV_PIX_FMT_GBRP9:
+ case AV_PIX_FMT_GBRP10:
s->bg_color = black_gbrp_color;
break;
default:
AVFilterContext *ctx = outlink->src;
AVFilterLink *inlink = ctx->inputs[0];
WaveformContext *s = ctx->priv;
- int comp = 0, i, j = 0, p, size, shift;
+ int comp = 0, i, j = 0, k, p, size, shift;
for (i = 0; i < s->ncomp; i++) {
if ((1 << i) & s->pcomp)
comp++;
}
- for (p = 0; p < 4; p++) {
- av_freep(&s->emax[p]);
- av_freep(&s->emin[p]);
- }
+ av_freep(&s->peak);
if (s->mode) {
outlink->h = s->size * FFMAX(comp * s->display, 1);
- size = inlink->w * sizeof(int);
+ size = inlink->w;
} else {
outlink->w = s->size * FFMAX(comp * s->display, 1);
- size = inlink->h * sizeof(int);
+ size = inlink->h;
}
+ s->peak = av_malloc_array(size, 32 * sizeof(*s->peak));
+ if (!s->peak)
+ return AVERROR(ENOMEM);
+
for (p = 0; p < 4; p++) {
const int is_chroma = (p == 1 || p == 2);
const int shift_w = (is_chroma ? s->desc->log2_chroma_w : 0);
shift = s->mode ? shift_h : shift_w;
- s->emax[plane] = av_malloc(size);
- s->emin[plane] = av_malloc(size);
-
- if (!s->emin[plane] || !s->emax[plane])
- return AVERROR(ENOMEM);
+ for (k = 0; k < 4; k++) {
+ s->emax[plane][k] = s->peak + size * (plane * 4 + k + 0);
+ s->emin[plane][k] = s->peak + size * (plane * 4 + k + 16);
+ }
offset = j++ * s->size * s->display;
s->estart[plane] = offset >> shift;
s->eend[plane] = (offset + s->size - 1) >> shift;
- for (i = 0; i < size / sizeof(int); i++) {
- s->emax[plane][i] = s->estart[plane];
- s->emin[plane][i] = s->eend[plane];
+ for (i = 0; i < size; i++) {
+ for (k = 0; k < 4; k++) {
+ s->emax[plane][k][i] = s->estart[plane];
+ s->emin[plane][k][i] = s->eend[plane];
+ }
}
}
WaveformContext *s = ctx->priv;
AVFilterLink *outlink = ctx->outputs[0];
AVFrame *out;
- int i, k;
+ int i, j, k;
out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
if (!out) {
const int is_chroma = (k == 1 || k == 2);
const int dst_h = FF_CEIL_RSHIFT(outlink->h, (is_chroma ? s->desc->log2_chroma_h : 0));
const int dst_w = FF_CEIL_RSHIFT(outlink->w, (is_chroma ? s->desc->log2_chroma_w : 0));
- for (i = 0; i < dst_h ; i++)
- memset(out->data[s->desc->comp[k].plane] +
- i * out->linesize[s->desc->comp[k].plane],
- s->bg_color[k], dst_w);
+ if (s->bits <= 8) {
+ for (i = 0; i < dst_h ; i++)
+ memset(out->data[s->desc->comp[k].plane] +
+ i * out->linesize[s->desc->comp[k].plane],
+ s->bg_color[k], dst_w);
+ } else {
+ const int mult = s->size / 256;
+ uint16_t *dst = (uint16_t *)out->data[s->desc->comp[k].plane];
+
+ for (i = 0; i < dst_h ; i++) {
+ for (j = 0; j < dst_w; j++)
+ dst[j] = s->bg_color[k] * mult;
+ dst += out->linesize[s->desc->comp[k].plane] / 2;
+ }
+ }
}
for (k = 0, i = 0; k < s->ncomp; k++) {
static av_cold void uninit(AVFilterContext *ctx)
{
WaveformContext *s = ctx->priv;
- int p;
- for (p = 0; p < 4; p++) {
- av_freep(&s->emax[p]);
- av_freep(&s->emin[p]);
- }
+ av_freep(&s->peak);
}
static const AVFilterPad inputs[] = {
projects / ffmpeg / blobdiff