highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/avf_aphasemeter: make video output optional

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol
2016-12-28 16:52:32 +01:00
parent 7c91ee01cc
commit 49abd5dbb8
4 changed files with 131 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
libavfilter/avf_aphasemeter.c
View File

@@ -37,6 +37,7 @@
typedef struct AudioPhaseMeterContext { typedef struct AudioPhaseMeterContext {
const AVClass *class; const AVClass *class;
AVFrame *out; AVFrame *out;
int do_video;
int w, h; int w, h;
AVRational frame_rate; AVRational frame_rate;
int contrast[4]; int contrast[4];
@@ -57,6 +58,7 @@ static const AVOption aphasemeter_options[] = {
{ "gc", "set green contrast", OFFSET(contrast[1]), AV_OPT_TYPE_INT, {.i64=7}, 0, 255, FLAGS }, { "gc", "set green contrast", OFFSET(contrast[1]), AV_OPT_TYPE_INT, {.i64=7}, 0, 255, FLAGS },
{ "bc", "set blue contrast", OFFSET(contrast[2]), AV_OPT_TYPE_INT, {.i64=1}, 0, 255, FLAGS }, { "bc", "set blue contrast", OFFSET(contrast[2]), AV_OPT_TYPE_INT, {.i64=1}, 0, 255, FLAGS },
{ "mpc", "set median phase color", OFFSET(mpc_str), AV_OPT_TYPE_STRING, {.str = "none"}, 0, 0, FLAGS }, { "mpc", "set median phase color", OFFSET(mpc_str), AV_OPT_TYPE_STRING, {.str = "none"}, 0, 0, FLAGS },
{ "video", "set video output", OFFSET(do_video), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, FLAGS },
{ NULL } { NULL }
}; };
@@ -64,6 +66,7 @@ AVFILTER_DEFINE_CLASS(aphasemeter);
static int query_formats(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx)
{ {
AudioPhaseMeterContext *s = ctx->priv;
AVFilterFormats *formats = NULL; AVFilterFormats *formats = NULL;
AVFilterChannelLayouts *layout = NULL; AVFilterChannelLayouts *layout = NULL;
AVFilterLink *inlink = ctx->inputs[0]; AVFilterLink *inlink = ctx->inputs[0];
@@ -74,17 +77,24 @@ static int query_formats(AVFilterContext *ctx)
formats = ff_make_format_list(sample_fmts); formats = ff_make_format_list(sample_fmts);
if ((ret = ff_formats_ref (formats, &inlink->out_formats )) < 0 || if ((ret = ff_formats_ref (formats, &inlink->out_formats )) < 0 ||
(ret = ff_formats_ref (formats, &outlink->in_formats )) < 0 ||
(ret = ff_add_channel_layout (&layout, AV_CH_LAYOUT_STEREO )) < 0 || (ret = ff_add_channel_layout (&layout, AV_CH_LAYOUT_STEREO )) < 0 ||
(ret = ff_channel_layouts_ref (layout , &inlink->out_channel_layouts)) < 0) (ret = ff_channel_layouts_ref (layout , &inlink->out_channel_layouts)) < 0 ||
(ret = ff_channel_layouts_ref (layout , &outlink->in_channel_layouts)) < 0)
return ret; return ret;
formats = ff_all_samplerates(); formats = ff_all_samplerates();
if ((ret = ff_formats_ref(formats, &inlink->out_samplerates)) < 0) if ((ret = ff_formats_ref(formats, &inlink->out_samplerates)) < 0 ||
(ret = ff_formats_ref(formats, &outlink->in_samplerates)) < 0)
return ret; return ret;
formats = ff_make_format_list(pix_fmts); if (s->do_video) {
if ((ret = ff_formats_ref(formats, &outlink->in_formats)) < 0) AVFilterLink *outlink = ctx->outputs[1];
return ret;
formats = ff_make_format_list(pix_fmts);
if ((ret = ff_formats_ref(formats, &outlink->in_formats)) < 0)
return ret;
}
return 0; return 0;
} }
@@ -95,15 +105,17 @@ static int config_input(AVFilterLink *inlink)
AudioPhaseMeterContext *s = ctx->priv; AudioPhaseMeterContext *s = ctx->priv;
int nb_samples; int nb_samples;
nb_samples = FFMAX(1024, ((double)inlink->sample_rate / av_q2d(s->frame_rate)) + 0.5); if (s->do_video) {
inlink->partial_buf_size = nb_samples = FFMAX(1024, ((double)inlink->sample_rate / av_q2d(s->frame_rate)) + 0.5);
inlink->min_samples = inlink->partial_buf_size =
inlink->max_samples = nb_samples; inlink->min_samples =
inlink->max_samples = nb_samples;
}
return 0; return 0;
} }
static int config_output(AVFilterLink *outlink) static int config_video_output(AVFilterLink *outlink)
{ {
AVFilterContext *ctx = outlink->src; AVFilterContext *ctx = outlink->src;
AudioPhaseMeterContext *s = ctx->priv; AudioPhaseMeterContext *s = ctx->priv;
@@ -131,8 +143,9 @@ static inline int get_x(float phase, int w)
static int filter_frame(AVFilterLink *inlink, AVFrame *in) static int filter_frame(AVFilterLink *inlink, AVFrame *in)
{ {
AVFilterContext *ctx = inlink->dst; AVFilterContext *ctx = inlink->dst;
AVFilterLink *outlink = ctx->outputs[0];
AudioPhaseMeterContext *s = ctx->priv; AudioPhaseMeterContext *s = ctx->priv;
AVFilterLink *outlink = s->do_video ? ctx->outputs[1] : NULL;
AVFilterLink *aoutlink = ctx->outputs[0];
AVDictionary **metadata; AVDictionary **metadata;
const int rc = s->contrast[0]; const int rc = s->contrast[0];
const int gc = s->contrast[1]; const int gc = s->contrast[1];
@@ -142,8 +155,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
uint8_t *dst; uint8_t *dst;
int i; int i;
if (!s->out || s->out->width != outlink->w || if (s->do_video && (!s->out || s->out->width != outlink->w ||
s->out->height != outlink->h) { s->out->height != outlink->h)) {
av_frame_free(&s->out); av_frame_free(&s->out);
s->out = ff_get_video_buffer(outlink, outlink->w, outlink->h); s->out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
if (!s->out) { if (!s->out) {
@@ -154,7 +167,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
out = s->out; out = s->out;
for (i = 0; i < outlink->h; i++) for (i = 0; i < outlink->h; i++)
memset(out->data[0] + i * out->linesize[0], 0, outlink->w * 4); memset(out->data[0] + i * out->linesize[0], 0, outlink->w * 4);
} else { } else if (s->do_video) {
out = s->out; out = s->out;
for (i = outlink->h - 1; i >= 10; i--) for (i = outlink->h - 1; i >= 10; i--)
memmove(out->data[0] + (i ) * out->linesize[0], memmove(out->data[0] + (i ) * out->linesize[0],
@@ -163,7 +176,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
for (i = 0; i < outlink->w; i++) for (i = 0; i < outlink->w; i++)
AV_WL32(out->data[0] + i * 4, 0); AV_WL32(out->data[0] + i * 4, 0);
} }
s->out->pts = in->pts;
for (i = 0; i < in->nb_samples; i++) { for (i = 0; i < in->nb_samples; i++) {
const float *src = (float *)in->data[0] + i * 2; const float *src = (float *)in->data[0] + i * 2;
@@ -171,24 +183,28 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
const float phase = isnan(f) ? 1 : f; const float phase = isnan(f) ? 1 : f;
const int x = get_x(phase, s->w); const int x = get_x(phase, s->w);
dst = out->data[0] + x * 4; if (s->do_video) {
dst[0] = FFMIN(255, dst[0] + rc); dst = out->data[0] + x * 4;
dst[1] = FFMIN(255, dst[1] + gc); dst[0] = FFMIN(255, dst[0] + rc);
dst[2] = FFMIN(255, dst[2] + bc); dst[1] = FFMIN(255, dst[1] + gc);
dst[3] = 255; dst[2] = FFMIN(255, dst[2] + bc);
dst[3] = 255;
}
fphase += phase; fphase += phase;
} }
fphase /= in->nb_samples; fphase /= in->nb_samples;
if (s->draw_median_phase) { if (s->do_video) {
dst = out->data[0] + get_x(fphase, s->w) * 4; if (s->draw_median_phase) {
AV_WL32(dst, AV_RL32(s->mpc)); dst = out->data[0] + get_x(fphase, s->w) * 4;
AV_WL32(dst, AV_RL32(s->mpc));
}
for (i = 1; i < 10 && i < outlink->h; i++)
memcpy(out->data[0] + i * out->linesize[0], out->data[0], outlink->w * 4);
} }
for (i = 1; i < 10 && i < outlink->h; i++) metadata = avpriv_frame_get_metadatap(in);
memcpy(out->data[0] + i * out->linesize[0], out->data[0], outlink->w * 4);
metadata = avpriv_frame_get_metadatap(out);
if (metadata) { if (metadata) {
uint8_t value[128]; uint8_t value[128];
@@ -196,8 +212,11 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
av_dict_set(metadata, "lavfi.aphasemeter.phase", value, 0); av_dict_set(metadata, "lavfi.aphasemeter.phase", value, 0);
} }
av_frame_free(&in); if (s->do_video) {
return ff_filter_frame(outlink, av_frame_clone(s->out)); s->out->pts = in->pts;
ff_filter_frame(outlink, av_frame_clone(s->out));
}
return ff_filter_frame(aoutlink, in);
} }
static av_cold void uninit(AVFilterContext *ctx) static av_cold void uninit(AVFilterContext *ctx)
@@ -207,6 +226,33 @@ static av_cold void uninit(AVFilterContext *ctx)
av_frame_free(&s->out); av_frame_free(&s->out);
} }
static av_cold int init(AVFilterContext *ctx)
{
AudioPhaseMeterContext *s = ctx->priv;
AVFilterPad pad;
pad = (AVFilterPad){
.name = av_strdup("out0"),
.type = AVMEDIA_TYPE_AUDIO,
};
if (!pad.name)
return AVERROR(ENOMEM);
ff_insert_outpad(ctx, 0, &pad);
if (s->do_video) {
pad = (AVFilterPad){
.name = av_strdup("out1"),
.type = AVMEDIA_TYPE_VIDEO,
.config_props = config_video_output,
};
if (!pad.name)
return AVERROR(ENOMEM);
ff_insert_outpad(ctx, 1, &pad);
}
return 0;
}
static const AVFilterPad inputs[] = { static const AVFilterPad inputs[] = {
{ {
.name = "default", .name = "default",
@@ -217,22 +263,15 @@ static const AVFilterPad inputs[] = {
{ NULL } { NULL }
}; };
static const AVFilterPad outputs[] = {
{
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
.config_props = config_output,
},
{ NULL }
};
AVFilter ff_avf_aphasemeter = { AVFilter ff_avf_aphasemeter = {
.name = "aphasemeter", .name = "aphasemeter",
.description = NULL_IF_CONFIG_SMALL("Convert input audio to phase meter video output."), .description = NULL_IF_CONFIG_SMALL("Convert input audio to phase meter video output."),
.init = init,
.uninit = uninit, .uninit = uninit,
.query_formats = query_formats, .query_formats = query_formats,
.priv_size = sizeof(AudioPhaseMeterContext), .priv_size = sizeof(AudioPhaseMeterContext),
.inputs = inputs, .inputs = inputs,
.outputs = outputs, .outputs = NULL,
.priv_class = &aphasemeter_class, .priv_class = &aphasemeter_class,
.flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS,
}; };

4
tests/fate/filter-video.mak
View File

@@ -665,11 +665,11 @@ fate-filter-metadata-readvitc-thr: CMD = run $(FILTER_METADATA_COMMAND) "movie='
AVF_PHASE_METER_DEPS = FFPROBE AVDEVICE LAVFI_INDEV AMOVIE_FILTER FLAC_DEMUXER FLAC_DECODER SINE_FILTER APHASEMETER_FILTER AVF_PHASE_METER_DEPS = FFPROBE AVDEVICE LAVFI_INDEV AMOVIE_FILTER FLAC_DEMUXER FLAC_DECODER SINE_FILTER APHASEMETER_FILTER
FATE_METADATA_FILTER-$(call ALLYES, $(AVF_PHASE_METER_DEPS)) += fate-filter-metadata-avf-aphase-meter-mono FATE_METADATA_FILTER-$(call ALLYES, $(AVF_PHASE_METER_DEPS)) += fate-filter-metadata-avf-aphase-meter-mono
fate-filter-metadata-avf-aphase-meter-mono: CMD = run $(FILTER_METADATA_COMMAND) sine="frequency=1000:sample_rate=48000:duration=1,aphasemeter" fate-filter-metadata-avf-aphase-meter-mono: CMD = run $(FILTER_METADATA_COMMAND) sine="frequency=1000:sample_rate=48000:duration=1,aphasemeter=video=0"
FATE_METADATA_FILTER-$(call ALLYES, $(AVF_PHASE_METER_DEPS)) += fate-filter-metadata-avf-aphase-meter-out-of-phase FATE_METADATA_FILTER-$(call ALLYES, $(AVF_PHASE_METER_DEPS)) += fate-filter-metadata-avf-aphase-meter-out-of-phase
fate-filter-metadata-avf-aphase-meter-out-of-phase: SRC = $(TARGET_SAMPLES)/filter/out-of-phase-1000hz.flac fate-filter-metadata-avf-aphase-meter-out-of-phase: SRC = $(TARGET_SAMPLES)/filter/out-of-phase-1000hz.flac
fate-filter-metadata-avf-aphase-meter-out-of-phase: CMD = run $(FILTER_METADATA_COMMAND) "amovie='$(SRC)',aphasemeter" fate-filter-metadata-avf-aphase-meter-out-of-phase: CMD = run $(FILTER_METADATA_COMMAND) "amovie='$(SRC)',aphasemeter=video=0"
tests/data/file4560-override2rotate0.mov: TAG = GEN tests/data/file4560-override2rotate0.mov: TAG = GEN
tests/data/file4560-override2rotate0.mov: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data tests/data/file4560-override2rotate0.mov: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data

64
tests/ref/fate/filter-metadata-avf-aphase-meter-mono
View File

@@ -1,25 +1,47 @@
pkt_pts=0|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=0|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=1920|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=1024|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=3840|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=2048|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=5760|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=3072|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=7680|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=4096|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=9600|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=5120|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=11520|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=6144|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=13440|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=7168|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=8192|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=9216|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=10240|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=11264|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=12288|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=13312|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=14336|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=15360|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=15360|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=17280|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=16384|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=19200|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=17408|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=21120|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=18432|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=23040|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=19456|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=24960|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=20480|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=26880|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=21504|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=28800|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=22528|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=23552|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=24576|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=25600|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=26624|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=27648|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=28672|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=29696|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=30720|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=30720|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=32640|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=31744|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=34560|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=32768|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=36480|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=33792|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=38400|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=34816|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=40320|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=35840|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=42240|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=36864|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=44160|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=37888|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=38912|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=39936|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=40960|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=41984|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=43008|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=44032|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=45056|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=46080|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=46080|tag:lavfi.aphasemeter.phase=1.000000
pkt_pts=47104|tag:lavfi.aphasemeter.phase=1.000000

30
tests/ref/fate/filter-metadata-avf-aphase-meter-out-of-phase
View File

@@ -1,25 +1,11 @@
pkt_pts=0|tag:lavfi.aphasemeter.phase=-1.000000 pkt_pts=0|tag:lavfi.aphasemeter.phase=-1.000000
pkt_pts=1920|tag:lavfi.aphasemeter.phase=-1.000000 pkt_pts=4608|tag:lavfi.aphasemeter.phase=-1.000000
pkt_pts=3840|tag:lavfi.aphasemeter.phase=-1.000000 pkt_pts=9216|tag:lavfi.aphasemeter.phase=-1.000000
pkt_pts=5760|tag:lavfi.aphasemeter.phase=-1.000000 pkt_pts=13824|tag:lavfi.aphasemeter.phase=-1.000000
pkt_pts=7680|tag:lavfi.aphasemeter.phase=-1.000000 pkt_pts=18432|tag:lavfi.aphasemeter.phase=-1.000000
pkt_pts=9600|tag:lavfi.aphasemeter.phase=-1.000000
pkt_pts=11520|tag:lavfi.aphasemeter.phase=-1.000000
pkt_pts=13440|tag:lavfi.aphasemeter.phase=-1.000000
pkt_pts=15360|tag:lavfi.aphasemeter.phase=-1.000000
pkt_pts=17280|tag:lavfi.aphasemeter.phase=-1.000000
pkt_pts=19200|tag:lavfi.aphasemeter.phase=-1.000000
pkt_pts=21120|tag:lavfi.aphasemeter.phase=-1.000000
pkt_pts=23040|tag:lavfi.aphasemeter.phase=-1.000000 pkt_pts=23040|tag:lavfi.aphasemeter.phase=-1.000000
pkt_pts=24960|tag:lavfi.aphasemeter.phase=-1.000000 pkt_pts=27648|tag:lavfi.aphasemeter.phase=-1.000000
pkt_pts=26880|tag:lavfi.aphasemeter.phase=-1.000000 pkt_pts=32256|tag:lavfi.aphasemeter.phase=-1.000000
pkt_pts=28800|tag:lavfi.aphasemeter.phase=-1.000000 pkt_pts=36864|tag:lavfi.aphasemeter.phase=-1.000000
pkt_pts=30720|tag:lavfi.aphasemeter.phase=-1.000000 pkt_pts=41472|tag:lavfi.aphasemeter.phase=-1.000000
pkt_pts=32640|tag:lavfi.aphasemeter.phase=-1.000000
pkt_pts=34560|tag:lavfi.aphasemeter.phase=-1.000000
pkt_pts=36480|tag:lavfi.aphasemeter.phase=-1.000000
pkt_pts=38400|tag:lavfi.aphasemeter.phase=-1.000000
pkt_pts=40320|tag:lavfi.aphasemeter.phase=-1.000000
pkt_pts=42240|tag:lavfi.aphasemeter.phase=-1.000000
pkt_pts=44160|tag:lavfi.aphasemeter.phase=-1.000000
pkt_pts=46080|tag:lavfi.aphasemeter.phase=-1.000000 pkt_pts=46080|tag:lavfi.aphasemeter.phase=-1.000000