#include "libavutil/parseutils.h"
#include "libavutil/xga_font_data.h"
#include "avfilter.h"
+#include "filters.h"
#include "formats.h"
#include "audio.h"
#include "video.h"
static const char *const var_names[] = { "VOLUME", "CHANNEL", "PEAK", NULL };
enum { VAR_VOLUME, VAR_CHANNEL, VAR_PEAK, VAR_VARS_NB };
+enum DisplayScale { LINEAR, LOG, NB_DISPLAY_SCALE };
typedef struct ShowVolumeContext {
const AVClass *class;
float bgopacity;
int mode;
+ int nb_samples;
AVFrame *out;
AVExpr *c_expr;
int draw_text;
uint32_t *color_lut;
float *max;
float rms_factor;
+ int display_scale;
+
+ double draw_persistent_duration; /* in second */
+ uint8_t persistant_max_rgba[4];
+ int persistent_max_frames; /* number of frames to check max value */
+ float *max_persistent; /* max value for draw_persistent_max for each channel */
+ int *nb_frames_max_display; /* number of frame for each channel, for displaying the max value */
void (*meter)(float *src, int nb_samples, float *max, float factor);
} ShowVolumeContext;
{ "b", "set border width", OFFSET(b), AV_OPT_TYPE_INT, {.i64=1}, 0, 5, FLAGS },
{ "w", "set channel width", OFFSET(w), AV_OPT_TYPE_INT, {.i64=400}, 80, 8192, FLAGS },
{ "h", "set channel height", OFFSET(h), AV_OPT_TYPE_INT, {.i64=20}, 1, 900, FLAGS },
- { "f", "set fade", OFFSET(f), AV_OPT_TYPE_DOUBLE, {.dbl=0.95}, 0.001, 1, FLAGS },
+ { "f", "set fade", OFFSET(f), AV_OPT_TYPE_DOUBLE, {.dbl=0.95}, 0, 1, FLAGS },
{ "c", "set volume color expression", OFFSET(color), AV_OPT_TYPE_STRING, {.str="PEAK*255+floor((1-PEAK)*255)*256+0xff000000"}, 0, 0, FLAGS },
{ "t", "display channel names", OFFSET(draw_text), AV_OPT_TYPE_BOOL, {.i64=1}, 0, 1, FLAGS },
{ "v", "display volume value", OFFSET(draw_volume), AV_OPT_TYPE_BOOL, {.i64=1}, 0, 1, FLAGS },
+ { "dm", "duration for max value display", OFFSET(draw_persistent_duration), AV_OPT_TYPE_DOUBLE, {.dbl=0.}, 0, 9000, FLAGS},
+ { "dmc","set color of the max value line", OFFSET(persistant_max_rgba), AV_OPT_TYPE_COLOR, {.str = "orange"}, 0, 0, FLAGS },
{ "o", "set orientation", OFFSET(orientation), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, FLAGS, "orientation" },
{ "h", "horizontal", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "orientation" },
{ "v", "vertical", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "orientation" },
{ "m", "set mode", OFFSET(mode), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, FLAGS, "mode" },
{ "p", "peak", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "mode" },
{ "r", "rms", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "mode" },
+ { "ds", "set display scale", OFFSET(display_scale), AV_OPT_TYPE_INT, {.i64=LINEAR}, LINEAR, NB_DISPLAY_SCALE - 1, FLAGS, "display_scale" },
+ { "lin", "linear", 0, AV_OPT_TYPE_CONST, {.i64=LINEAR}, 0, 0, FLAGS, "display_scale" },
+ { "log", "log", 0, AV_OPT_TYPE_CONST, {.i64=LOG}, 0, 0, FLAGS, "display_scale" },
{ NULL }
};
int ret;
formats = ff_make_format_list(sample_fmts);
- if ((ret = ff_formats_ref(formats, &inlink->out_formats)) < 0)
+ if ((ret = ff_formats_ref(formats, &inlink->outcfg.formats)) < 0)
return ret;
layouts = ff_all_channel_counts();
- if ((ret = ff_channel_layouts_ref(layouts, &inlink->out_channel_layouts)) < 0)
+ if ((ret = ff_channel_layouts_ref(layouts, &inlink->outcfg.channel_layouts)) < 0)
return ret;
formats = ff_all_samplerates();
- if ((ret = ff_formats_ref(formats, &inlink->out_samplerates)) < 0)
+ if ((ret = ff_formats_ref(formats, &inlink->outcfg.samplerates)) < 0)
return ret;
formats = ff_make_format_list(pix_fmts);
- if ((ret = ff_formats_ref(formats, &outlink->in_formats)) < 0)
+ if ((ret = ff_formats_ref(formats, &outlink->incfg.formats)) < 0)
return ret;
return 0;
{
AVFilterContext *ctx = inlink->dst;
ShowVolumeContext *s = ctx->priv;
- int nb_samples;
- nb_samples = FFMAX(1024, ((double)inlink->sample_rate / av_q2d(s->frame_rate)) + 0.5);
- inlink->partial_buf_size =
- inlink->min_samples =
- inlink->max_samples = nb_samples;
+ s->nb_samples = FFMAX(1, av_rescale(inlink->sample_rate, s->frame_rate.den, s->frame_rate.num));
s->values = av_calloc(inlink->channels * VAR_VARS_NB, sizeof(double));
if (!s->values)
return AVERROR(ENOMEM);
default: return AVERROR_BUG;
}
+ if (s->draw_persistent_duration > 0.) {
+ s->persistent_max_frames = (int) FFMAX(av_q2d(s->frame_rate) * s->draw_persistent_duration, 1.);
+ s->max_persistent = av_calloc(inlink->channels * s->persistent_max_frames, sizeof(*s->max_persistent));
+ s->nb_frames_max_display = av_calloc(inlink->channels * s->persistent_max_frames, sizeof(*s->nb_frames_max_display));
+ }
return 0;
}
for (i = 0; txt[i]; i++) {
int char_y, mask;
- if (o) {
+ if (o) { /* vertical orientation */
for (char_y = font_height - 1; char_y >= 0; char_y--) {
uint8_t *p = pic->data[0] + (y + i * 10) * pic->linesize[0] + x * 4;
for (mask = 0x80; mask; mask >>= 1) {
p += pic->linesize[0];
}
}
- } else {
+ } else { /* horizontal orientation */
uint8_t *p = pic->data[0] + y * pic->linesize[0] + (x + i * 8) * 4;
for (char_y = 0; char_y < font_height; char_y++) {
for (mask = 0x80; mask; mask >>= 1) {
}
}
+static void clear_picture(ShowVolumeContext *s, AVFilterLink *outlink)
+{
+ int i, j;
+ const uint32_t bg = (uint32_t)(s->bgopacity * 255) << 24;
+
+ for (i = 0; i < outlink->h; i++) {
+ uint32_t *dst = (uint32_t *)(s->out->data[0] + i * s->out->linesize[0]);
+ for (j = 0; j < outlink->w; j++)
+ AV_WN32A(dst + j, bg);
+ }
+}
+
+static inline int calc_max_draw(ShowVolumeContext *s, AVFilterLink *outlink, float max)
+{
+ float max_val;
+ if (s->display_scale == LINEAR) {
+ max_val = max;
+ } else { /* log */
+ max_val = av_clipf(0.21 * log10(max) + 1, 0, 1);
+ }
+ if (s->orientation) { /* vertical */
+ return outlink->h - outlink->h * max_val;
+ } else { /* horizontal */
+ return s->w * max_val;
+ }
+}
+
+static inline void calc_persistent_max(ShowVolumeContext *s, float max, int channel)
+{
+ /* update max value for persistent max display */
+ if ((max >= s->max_persistent[channel]) || (s->nb_frames_max_display[channel] >= s->persistent_max_frames)) { /* update max value for display */
+ s->max_persistent[channel] = max;
+ s->nb_frames_max_display[channel] = 0;
+ } else {
+ s->nb_frames_max_display[channel] += 1; /* incremente display frame count */
+ }
+}
+
+static inline void draw_max_line(ShowVolumeContext *s, int max_draw, int channel)
+{
+ int k;
+ if (s->orientation) { /* vertical */
+ uint8_t *dst = s->out->data[0] + max_draw * s->out->linesize[0] + channel * (s->b + s->h) * 4;
+ for (k = 0; k < s->h; k++) {
+ memcpy(dst + k * 4, s->persistant_max_rgba, sizeof(s->persistant_max_rgba));
+ }
+ } else { /* horizontal */
+ for (k = 0; k < s->h; k++) {
+ uint8_t *dst = s->out->data[0] + (channel * s->h + channel * s->b + k) * s->out->linesize[0];
+ memcpy(dst + max_draw * 4, s->persistant_max_rgba, sizeof(s->persistant_max_rgba));
+ }
+ }
+}
+
static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
{
AVFilterContext *ctx = inlink->dst;
AVFilterLink *outlink = ctx->outputs[0];
ShowVolumeContext *s = ctx->priv;
const int step = s->step;
- int c, i, j, k;
+ int c, j, k, max_draw;
AVFrame *out;
if (!s->out || s->out->width != outlink->w ||
av_frame_free(&insamples);
return AVERROR(ENOMEM);
}
-
- for (i = 0; i < outlink->h; i++) {
- uint32_t *dst = (uint32_t *)(s->out->data[0] + i * s->out->linesize[0]);
- const uint32_t bg = (uint32_t)(s->bgopacity * 255) << 24;
-
- for (j = 0; j < outlink->w; j++)
- AV_WN32A(dst + j, bg);
- }
+ clear_picture(s, outlink);
}
s->out->pts = insamples->pts;
- for (j = 0; j < outlink->h; j++) {
- uint8_t *dst = s->out->data[0] + j * s->out->linesize[0];
- const uint32_t alpha = s->bgopacity * 255;
+ if ((s->f < 1.) && (s->f > 0.)) {
+ for (j = 0; j < outlink->h; j++) {
+ uint8_t *dst = s->out->data[0] + j * s->out->linesize[0];
+ const uint32_t alpha = s->bgopacity * 255;
- for (k = 0; k < outlink->w; k++) {
- dst[k * 4 + 0] = FFMAX(dst[k * 4 + 0] * s->f, 0);
- dst[k * 4 + 1] = FFMAX(dst[k * 4 + 1] * s->f, 0);
- dst[k * 4 + 2] = FFMAX(dst[k * 4 + 2] * s->f, 0);
- dst[k * 4 + 3] = FFMAX(dst[k * 4 + 3] * s->f, alpha);
+ for (k = 0; k < outlink->w; k++) {
+ dst[k * 4 + 0] = FFMAX(dst[k * 4 + 0] * s->f, 0);
+ dst[k * 4 + 1] = FFMAX(dst[k * 4 + 1] * s->f, 0);
+ dst[k * 4 + 2] = FFMAX(dst[k * 4 + 2] * s->f, 0);
+ dst[k * 4 + 3] = FFMAX(dst[k * 4 + 3] * s->f, alpha);
+ }
}
+ } else if (s->f == 0.) {
+ clear_picture(s, outlink);
}
- if (s->orientation) {
+ if (s->orientation) { /* vertical */
for (c = 0; c < inlink->channels; c++) {
float *src = (float *)insamples->extended_data[c];
uint32_t *lut = s->color_lut + s->w * c;
s->values[c * VAR_VARS_NB + VAR_VOLUME] = 20.0 * log10(max);
max = av_clipf(max, 0, 1);
+ max_draw = calc_max_draw(s, outlink, max);
- for (j = outlink->h - outlink->h * max; j < s->w; j++) {
+ for (j = max_draw; j < s->w; j++) {
uint8_t *dst = s->out->data[0] + j * s->out->linesize[0] + c * (s->b + s->h) * 4;
for (k = 0; k < s->h; k++) {
AV_WN32A(&dst[k * 4], lut[s->w - j - 1]);
continue;
drawtext(s->out, c * (s->h + s->b) + (s->h - 10) / 2, outlink->h - 35, channel_name, 1);
}
+
+ if (s->draw_persistent_duration > 0.) {
+ calc_persistent_max(s, max, c);
+ max_draw = FFMAX(0, calc_max_draw(s, outlink, s->max_persistent[c]) - 1);
+ draw_max_line(s, max_draw, c);
+ }
}
- } else {
+ } else { /* horizontal */
for (c = 0; c < inlink->channels; c++) {
float *src = (float *)insamples->extended_data[c];
uint32_t *lut = s->color_lut + s->w * c;
s->values[c * VAR_VARS_NB + VAR_VOLUME] = 20.0 * log10(max);
max = av_clipf(max, 0, 1);
+ max_draw = calc_max_draw(s, outlink, max);
for (j = 0; j < s->h; j++) {
uint8_t *dst = s->out->data[0] + (c * s->h + c * s->b + j) * s->out->linesize[0];
- for (k = 0; k < s->w * max; k++) {
+ for (k = 0; k < max_draw; k++) {
AV_WN32A(dst + k * 4, lut[k]);
if (k & step)
k += step;
continue;
drawtext(s->out, 2, c * (s->h + s->b) + (s->h - 8) / 2, channel_name, 0);
}
+
+ if (s->draw_persistent_duration > 0.) {
+ calc_persistent_max(s, max, c);
+ max_draw = FFMAX(0, calc_max_draw(s, outlink, s->max_persistent[c]) - 1);
+ draw_max_line(s, max_draw, c);
+ }
}
}
return AVERROR(ENOMEM);
av_frame_make_writable(out);
- for (c = 0; c < inlink->channels && s->draw_volume; c++) {
+ /* draw volume level */
+ for (c = 0; c < inlink->channels && s->h >= 8 && s->draw_volume; c++) {
char buf[16];
- if (s->orientation) {
- if (s->h >= 8) {
- snprintf(buf, sizeof(buf), "%.2f", s->values[c * VAR_VARS_NB + VAR_VOLUME]);
- drawtext(out, c * (s->h + s->b) + (s->h - 8) / 2, 2, buf, 1);
- }
- } else {
- if (s->h >= 8) {
- snprintf(buf, sizeof(buf), "%.2f", s->values[c * VAR_VARS_NB + VAR_VOLUME]);
- drawtext(out, FFMAX(0, s->w - 8 * (int)strlen(buf)), c * (s->h + s->b) + (s->h - 8) / 2, buf, 0);
- }
+
+ if (s->orientation) { /* vertical */
+ snprintf(buf, sizeof(buf), "%.2f", s->values[c * VAR_VARS_NB + VAR_VOLUME]);
+ drawtext(out, c * (s->h + s->b) + (s->h - 8) / 2, 2, buf, 1);
+ } else { /* horizontal */
+ snprintf(buf, sizeof(buf), "%.2f", s->values[c * VAR_VARS_NB + VAR_VOLUME]);
+ drawtext(out, FFMAX(0, s->w - 8 * (int)strlen(buf)), c * (s->h + s->b) + (s->h - 8) / 2, buf, 0);
}
}
return ff_filter_frame(outlink, out);
}
+static int activate(AVFilterContext *ctx)
+{
+ AVFilterLink *inlink = ctx->inputs[0];
+ AVFilterLink *outlink = ctx->outputs[0];
+ ShowVolumeContext *s = ctx->priv;
+ AVFrame *in = NULL;
+ int ret;
+
+ FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink);
+
+ ret = ff_inlink_consume_samples(inlink, s->nb_samples, s->nb_samples, &in);
+ if (ret < 0)
+ return ret;
+ if (ret > 0)
+ return filter_frame(inlink, in);
+
+ FF_FILTER_FORWARD_STATUS(inlink, outlink);
+ FF_FILTER_FORWARD_WANTED(outlink, inlink);
+
+ return FFERROR_NOT_READY;
+}
+
static av_cold void uninit(AVFilterContext *ctx)
{
ShowVolumeContext *s = ctx->priv;
.name = "default",
.type = AVMEDIA_TYPE_AUDIO,
.config_props = config_input,
- .filter_frame = filter_frame,
},
{ NULL }
};
.name = "showvolume",
.description = NULL_IF_CONFIG_SMALL("Convert input audio volume to video output."),
.init = init,
+ .activate = activate,
.uninit = uninit,
.query_formats = query_formats,
.priv_size = sizeof(ShowVolumeContext),
projects / ffmpeg / blobdiff