X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvf_mix.c;h=d0cc7cb83071fa139477a8023dd6bba707dfb214;hb=a04ad248a05e7b613abe09b3bb067f555108d794;hp=55307a4bb5965732e6fb174f9ca91416917ae3f8;hpb=161e006cc02e991606ac1ef246afdbc1c3293867;p=ffmpeg diff --git a/libavfilter/vf_mix.c b/libavfilter/vf_mix.c index 55307a4bb59..0ca60d5522e 100644 --- a/libavfilter/vf_mix.c +++ b/libavfilter/vf_mix.c @@ -37,12 +37,14 @@ typedef struct MixContext { int nb_inputs; int duration; float *weights; + float scale; float wfactor; int tmix; int nb_frames; int depth; + int max; int nb_planes; int linesize[4]; int height[4]; @@ -53,26 +55,56 @@ typedef struct MixContext { static int query_formats(AVFilterContext *ctx) { - AVFilterFormats *pix_fmts = NULL; - int fmt, ret; - - for (fmt = 0; av_pix_fmt_desc_get(fmt); fmt++) { - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt); - if (!(desc->flags & AV_PIX_FMT_FLAG_PAL || - desc->flags & AV_PIX_FMT_FLAG_HWACCEL || - desc->flags & AV_PIX_FMT_FLAG_BITSTREAM) && - (ret = ff_add_format(&pix_fmts, fmt)) < 0) - return ret; + AVFilterFormats *formats = NULL; + int ret; + + ret = ff_formats_pixdesc_filter(&formats, 0, + AV_PIX_FMT_FLAG_BITSTREAM | + AV_PIX_FMT_FLAG_PAL | + AV_PIX_FMT_FLAG_HWACCEL); + if (ret < 0) + return ret; + return ff_set_common_formats(ctx, formats); +} + +static int parse_weights(AVFilterContext *ctx) +{ + MixContext *s = ctx->priv; + char *p, *arg, *saveptr = NULL; + int i, last = 0; + + s->wfactor = 0.f; + p = s->weights_str; + for (i = 0; i < s->nb_inputs; i++) { + if (!(arg = av_strtok(p, " |", &saveptr))) + break; + + p = NULL; + if (av_sscanf(arg, "%f", &s->weights[i]) != 1) { + av_log(ctx, AV_LOG_ERROR, "Invalid syntax for weights[%d].\n", i); + return AVERROR(EINVAL); + } + s->wfactor += s->weights[i]; + last = i; + } + + for (; i < s->nb_inputs; i++) { + s->weights[i] = s->weights[last]; + s->wfactor += s->weights[i]; + } + if (s->scale == 0) { + s->wfactor = 1 / s->wfactor; + } else { + s->wfactor = s->scale; } - return ff_set_common_formats(ctx, pix_fmts); + return 0; } static av_cold int init(AVFilterContext *ctx) { MixContext *s = ctx->priv; - char *p, *arg, *saveptr = NULL; - int i, ret; + int ret; s->tmix = !strcmp(ctx->filter->name, "tmix"); @@ -85,7 +117,7 @@ static av_cold int init(AVFilterContext *ctx) return AVERROR(ENOMEM); if (!s->tmix) { - for (i = 0; i < s->nb_inputs; i++) { + for (int i = 0; i < s->nb_inputs; i++) { AVFilterPad pad = { 0 }; pad.type = AVMEDIA_TYPE_VIDEO; @@ -100,39 +132,38 @@ static av_cold int init(AVFilterContext *ctx) } } - p = s->weights_str; - for (i = 0; i < s->nb_inputs; i++) { - if (!(arg = av_strtok(p, " ", &saveptr))) - break; - - p = NULL; - sscanf(arg, "%f", &s->weights[i]); - s->wfactor += s->weights[i]; - } - s->wfactor = 1 / s->wfactor; - - return 0; + return parse_weights(ctx); } -static void mix_frames(MixContext *s, AVFrame **in, AVFrame *out) +typedef struct ThreadData { + AVFrame **in, *out; +} ThreadData; + +static int mix_frames(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) { + MixContext *s = ctx->priv; + ThreadData *td = arg; + AVFrame **in = td->in; + AVFrame *out = td->out; int i, p, x, y; if (s->depth <= 8) { for (p = 0; p < s->nb_planes; p++) { - uint8_t *dst = out->data[p]; + const int slice_start = (s->height[p] * jobnr) / nb_jobs; + const int slice_end = (s->height[p] * (jobnr+1)) / nb_jobs; + uint8_t *dst = out->data[p] + slice_start * out->linesize[p]; - for (y = 0; y < s->height[p]; y++) { + for (y = slice_start; y < slice_end; y++) { for (x = 0; x < s->linesize[p]; x++) { int val = 0; for (i = 0; i < s->nb_inputs; i++) { - uint8_t src = in[i]->data[p][y * s->linesize[p] + x]; + uint8_t src = in[i]->data[p][y * in[i]->linesize[p] + x]; val += src * s->weights[i]; } - dst[x] = val * s->wfactor; + dst[x] = av_clip_uint8(val * s->wfactor); } dst += out->linesize[p]; @@ -140,25 +171,29 @@ static void mix_frames(MixContext *s, AVFrame **in, AVFrame *out) } } else { for (p = 0; p < s->nb_planes; p++) { - uint16_t *dst = (uint16_t *)out->data[p]; + const int slice_start = (s->height[p] * jobnr) / nb_jobs; + const int slice_end = (s->height[p] * (jobnr+1)) / nb_jobs; + uint16_t *dst = (uint16_t *)(out->data[p] + slice_start * out->linesize[p]); - for (y = 0; y < s->height[p]; y++) { + for (y = slice_start; y < slice_end; y++) { for (x = 0; x < s->linesize[p] / 2; x++) { int val = 0; for (i = 0; i < s->nb_inputs; i++) { - uint16_t src = AV_RN16(in[i]->data[p] + y * s->linesize[p] + x * 2); + uint16_t src = AV_RN16(in[i]->data[p] + y * in[i]->linesize[p] + x * 2); val += src * s->weights[i]; } - dst[x] = val * s->wfactor; + dst[x] = av_clip(val * s->wfactor, 0, s->max); } dst += out->linesize[p] / 2; } } } + + return 0; } static int process_frame(FFFrameSync *fs) @@ -168,6 +203,7 @@ static int process_frame(FFFrameSync *fs) MixContext *s = fs->opaque; AVFrame **in = s->frames; AVFrame *out; + ThreadData td; int i, ret; for (i = 0; i < s->nb_inputs; i++) { @@ -175,12 +211,22 @@ static int process_frame(FFFrameSync *fs) return ret; } + if (ctx->is_disabled) { + out = av_frame_clone(s->frames[0]); + if (!out) + return AVERROR(ENOMEM); + out->pts = av_rescale_q(s->fs.pts, s->fs.time_base, outlink->time_base); + return ff_filter_frame(outlink, out); + } + out = ff_get_video_buffer(outlink, outlink->w, outlink->h); if (!out) return AVERROR(ENOMEM); out->pts = av_rescale_q(s->fs.pts, s->fs.time_base, outlink->time_base); - mix_frames(s, in, out); + td.in = in; + td.out = out; + ctx->internal->execute(ctx, mix_frames, &td, NULL, FFMIN(s->height[0], ff_filter_get_nb_threads(ctx))); return ff_filter_frame(outlink, out); } @@ -189,8 +235,8 @@ static int config_output(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; MixContext *s = ctx->priv; - AVRational time_base = ctx->inputs[0]->time_base; AVRational frame_rate = ctx->inputs[0]->frame_rate; + AVRational sar = ctx->inputs[0]->sample_aspect_ratio; AVFilterLink *inlink = ctx->inputs[0]; int height = ctx->inputs[0]->h; int width = ctx->inputs[0]->w; @@ -211,6 +257,7 @@ static int config_output(AVFilterLink *outlink) return AVERROR_BUG; s->nb_planes = av_pix_fmt_count_planes(outlink->format); s->depth = s->desc->comp[0].depth; + s->max = (1 << s->depth) - 1; if ((ret = av_image_fill_linesizes(s->linesize, inlink->format, inlink->w)) < 0) return ret; @@ -223,8 +270,8 @@ static int config_output(AVFilterLink *outlink) outlink->w = width; outlink->h = height; - outlink->time_base = time_base; outlink->frame_rate = frame_rate; + outlink->sample_aspect_ratio = sar; if ((ret = ff_framesync_init(&s->fs, ctx, s->nb_inputs)) < 0) return ret; @@ -242,7 +289,10 @@ static int config_output(AVFilterLink *outlink) in[i].after = (s->duration == 1 || (s->duration == 2 && i == 0)) ? EXT_STOP : EXT_INFINITY; } - return ff_framesync_configure(&s->fs); + ret = ff_framesync_configure(&s->fs); + outlink->time_base = s->fs.time_base; + + return ret; } static av_cold void uninit(AVFilterContext *ctx) @@ -257,12 +307,24 @@ static av_cold void uninit(AVFilterContext *ctx) for (i = 0; i < ctx->nb_inputs; i++) av_freep(&ctx->input_pads[i].name); } else { - for (i = 0; i < s->nb_frames; i++) + for (i = 0; i < s->nb_frames && s->frames; i++) av_frame_free(&s->frames[i]); } av_freep(&s->frames); } +static int process_command(AVFilterContext *ctx, const char *cmd, const char *args, + char *res, int res_len, int flags) +{ + int ret; + + ret = ff_filter_process_command(ctx, cmd, args, res, res_len, flags); + if (ret < 0) + return ret; + + return parse_weights(ctx); +} + static int activate(AVFilterContext *ctx) { MixContext *s = ctx->priv; @@ -271,10 +333,12 @@ static int activate(AVFilterContext *ctx) #define OFFSET(x) offsetof(MixContext, x) #define FLAGS AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_FILTERING_PARAM +#define TFLAGS AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_RUNTIME_PARAM static const AVOption mix_options[] = { - { "inputs", "set number of inputs", OFFSET(nb_inputs), AV_OPT_TYPE_INT, {.i64=2}, 2, INT_MAX, .flags = FLAGS }, - { "weights", "set weight for each input", OFFSET(weights_str), AV_OPT_TYPE_STRING, {.str="1 1"}, 0, 0, .flags = FLAGS }, + { "inputs", "set number of inputs", OFFSET(nb_inputs), AV_OPT_TYPE_INT, {.i64=2}, 2, INT16_MAX, .flags = FLAGS }, + { "weights", "set weight for each input", OFFSET(weights_str), AV_OPT_TYPE_STRING, {.str="1 1"}, 0, 0, .flags = TFLAGS }, + { "scale", "set scale", OFFSET(scale), AV_OPT_TYPE_FLOAT, {.dbl=0}, 0, INT16_MAX, .flags = TFLAGS }, { "duration", "how to determine end of stream", OFFSET(duration), AV_OPT_TYPE_INT, {.i64=0}, 0, 2, .flags = FLAGS, "duration" }, { "longest", "Duration of longest input", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "duration" }, { "shortest", "Duration of shortest input", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "duration" }, @@ -294,7 +358,7 @@ static const AVFilterPad outputs[] = { #if CONFIG_MIX_FILTER AVFILTER_DEFINE_CLASS(mix); -AVFilter ff_vf_mix = { +const AVFilter ff_vf_mix = { .name = "mix", .description = NULL_IF_CONFIG_SMALL("Mix video inputs."), .priv_size = sizeof(MixContext), @@ -304,7 +368,9 @@ AVFilter ff_vf_mix = { .init = init, .uninit = uninit, .activate = activate, - .flags = AVFILTER_FLAG_DYNAMIC_INPUTS, + .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_SLICE_THREADS | + AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, + .process_command = process_command, }; #endif /* CONFIG_MIX_FILTER */ @@ -315,31 +381,46 @@ static int tmix_filter_frame(AVFilterLink *inlink, AVFrame *in) AVFilterContext *ctx = inlink->dst; AVFilterLink *outlink = ctx->outputs[0]; MixContext *s = ctx->priv; + ThreadData td; AVFrame *out; + if (s->nb_inputs == 1) + return ff_filter_frame(outlink, in); + if (s->nb_frames < s->nb_inputs) { s->frames[s->nb_frames] = in; s->nb_frames++; - return 0; + if (s->nb_frames < s->nb_inputs) + return 0; } else { av_frame_free(&s->frames[0]); memmove(&s->frames[0], &s->frames[1], sizeof(*s->frames) * (s->nb_inputs - 1)); s->frames[s->nb_inputs - 1] = in; } + if (ctx->is_disabled) { + out = av_frame_clone(s->frames[0]); + if (!out) + return AVERROR(ENOMEM); + return ff_filter_frame(outlink, out); + } + out = ff_get_video_buffer(outlink, outlink->w, outlink->h); if (!out) return AVERROR(ENOMEM); out->pts = s->frames[0]->pts; - mix_frames(s, s->frames, out); + td.out = out; + td.in = s->frames; + ctx->internal->execute(ctx, mix_frames, &td, NULL, FFMIN(s->height[0], ff_filter_get_nb_threads(ctx))); return ff_filter_frame(outlink, out); } static const AVOption tmix_options[] = { - { "frames", "set number of successive frames to mix", OFFSET(nb_inputs), AV_OPT_TYPE_INT, {.i64=3}, 2, 128, .flags = FLAGS }, - { "weights", "set weight for each frame", OFFSET(weights_str), AV_OPT_TYPE_STRING, {.str="1 1 1"}, 0, 0, .flags = FLAGS }, + { "frames", "set number of successive frames to mix", OFFSET(nb_inputs), AV_OPT_TYPE_INT, {.i64=3}, 1, 128, .flags = FLAGS }, + { "weights", "set weight for each frame", OFFSET(weights_str), AV_OPT_TYPE_STRING, {.str="1 1 1"}, 0, 0, .flags = TFLAGS }, + { "scale", "set scale", OFFSET(scale), AV_OPT_TYPE_FLOAT, {.dbl=0}, 0, INT16_MAX, .flags = TFLAGS }, { NULL }, }; @@ -354,7 +435,7 @@ static const AVFilterPad inputs[] = { AVFILTER_DEFINE_CLASS(tmix); -AVFilter ff_vf_tmix = { +const AVFilter ff_vf_tmix = { .name = "tmix", .description = NULL_IF_CONFIG_SMALL("Mix successive video frames."), .priv_size = sizeof(MixContext), @@ -364,6 +445,8 @@ AVFilter ff_vf_tmix = { .inputs = inputs, .init = init, .uninit = uninit, + .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, + .process_command = process_command, }; #endif /* CONFIG_TMIX_FILTER */