if (!s->frames)
return AVERROR(ENOMEM);
+ s->items = av_calloc(s->nb_inputs, sizeof(*s->items));
+ if (!s->items)
+ return AVERROR(ENOMEM);
+
if (!strcmp(ctx->filter->name, "xstack")) {
- s->items = av_calloc(s->nb_inputs, sizeof(*s->items));
- if (!s->items)
- return AVERROR(ENOMEM);
+ if (!s->layout) {
+ if (s->nb_inputs == 2) {
+ s->layout = av_strdup("0_0|w0_0");
+ if (!s->layout)
+ return AVERROR(ENOMEM);
+ } else {
+ av_log(ctx, AV_LOG_ERROR, "No layout specified.\n");
+ return AVERROR(EINVAL);
+ }
+ }
}
for (i = 0; i < s->nb_inputs; i++) {
return 0;
}
+static int process_slice(AVFilterContext *ctx, void *arg, int job, int nb_jobs)
+{
+ StackContext *s = ctx->priv;
+ AVFrame *out = arg;
+ AVFrame **in = s->frames;
+ const int start = (s->nb_inputs * job ) / nb_jobs;
+ const int end = (s->nb_inputs * (job+1)) / nb_jobs;
+
+ for (int i = start; i < end; i++) {
+ StackItem *item = &s->items[i];
+
+ for (int p = 0; p < s->nb_planes; p++) {
+ av_image_copy_plane(out->data[p] + out->linesize[p] * item->y[p] + item->x[p],
+ out->linesize[p],
+ in[i]->data[p],
+ in[i]->linesize[p],
+ item->linesize[p], item->height[p]);
+ }
+ }
+
+ return 0;
+}
+
static int process_frame(FFFrameSync *fs)
{
AVFilterContext *ctx = fs->parent;
StackContext *s = fs->opaque;
AVFrame **in = s->frames;
AVFrame *out;
- int i, p, ret, offset[4] = { 0 };
+ int i, ret;
for (i = 0; i < s->nb_inputs; i++) {
if ((ret = ff_framesync_get_frame(&s->fs, i, &in[i], 0)) < 0)
out->pts = av_rescale_q(s->fs.pts, s->fs.time_base, outlink->time_base);
out->sample_aspect_ratio = outlink->sample_aspect_ratio;
- for (i = 0; i < s->nb_inputs; i++) {
- AVFilterLink *inlink = ctx->inputs[i];
- int linesize[4];
- int height[4];
-
- if (s->is_horizontal || s->is_vertical) {
- if ((ret = av_image_fill_linesizes(linesize, inlink->format, inlink->w)) < 0) {
- av_frame_free(&out);
- return ret;
- }
-
- height[1] = height[2] = AV_CEIL_RSHIFT(inlink->h, s->desc->log2_chroma_h);
- height[0] = height[3] = inlink->h;
- }
-
- for (p = 0; p < s->nb_planes; p++) {
- if (s->is_vertical) {
- av_image_copy_plane(out->data[p] + offset[p] * out->linesize[p],
- out->linesize[p],
- in[i]->data[p],
- in[i]->linesize[p],
- linesize[p], height[p]);
- offset[p] += height[p];
- } else if (s->is_horizontal) {
- av_image_copy_plane(out->data[p] + offset[p],
- out->linesize[p],
- in[i]->data[p],
- in[i]->linesize[p],
- linesize[p], height[p]);
- offset[p] += linesize[p];
- } else {
- StackItem *item = &s->items[i];
-
- av_image_copy_plane(out->data[p] + out->linesize[p] * item->y[p] + item->x[p],
- out->linesize[p],
- in[i]->data[p],
- in[i]->linesize[p],
- item->linesize[p], item->height[p]);
- }
- }
- }
+ ctx->internal->execute(ctx, process_slice, out, NULL, FFMIN(s->nb_inputs, ff_filter_get_nb_threads(ctx)));
return ff_filter_frame(outlink, out);
}
return AVERROR_BUG;
if (s->is_vertical) {
- for (i = 1; i < s->nb_inputs; i++) {
+ for (i = 0; i < s->nb_inputs; i++) {
+ AVFilterLink *inlink = ctx->inputs[i];
+ StackItem *item = &s->items[i];
+
if (ctx->inputs[i]->w != width) {
av_log(ctx, AV_LOG_ERROR, "Input %d width %d does not match input %d width %d.\n", i, ctx->inputs[i]->w, 0, width);
return AVERROR(EINVAL);
}
- height += ctx->inputs[i]->h;
+
+ if ((ret = av_image_fill_linesizes(item->linesize, inlink->format, inlink->w)) < 0) {
+ return ret;
+ }
+
+ item->height[1] = item->height[2] = AV_CEIL_RSHIFT(inlink->h, s->desc->log2_chroma_h);
+ item->height[0] = item->height[3] = inlink->h;
+
+ if (i) {
+ item->y[1] = item->y[2] = AV_CEIL_RSHIFT(height, s->desc->log2_chroma_h);
+ item->y[0] = item->y[3] = height;
+
+ height += ctx->inputs[i]->h;
+ }
}
} else if (s->is_horizontal) {
- for (i = 1; i < s->nb_inputs; i++) {
+ for (i = 0; i < s->nb_inputs; i++) {
+ AVFilterLink *inlink = ctx->inputs[i];
+ StackItem *item = &s->items[i];
+
if (ctx->inputs[i]->h != height) {
av_log(ctx, AV_LOG_ERROR, "Input %d height %d does not match input %d height %d.\n", i, ctx->inputs[i]->h, 0, height);
return AVERROR(EINVAL);
}
- width += ctx->inputs[i]->w;
+
+ if ((ret = av_image_fill_linesizes(item->linesize, inlink->format, inlink->w)) < 0) {
+ return ret;
+ }
+
+ item->height[1] = item->height[2] = AV_CEIL_RSHIFT(inlink->h, s->desc->log2_chroma_h);
+ item->height[0] = item->height[3] = inlink->h;
+
+ if (i) {
+ if ((ret = av_image_fill_linesizes(item->x, inlink->format, width)) < 0) {
+ return ret;
+ }
+
+ width += ctx->inputs[i]->w;
+ }
}
} else {
char *arg, *p = s->layout, *saveptr = NULL;
outlink->frame_rate = frame_rate;
outlink->sample_aspect_ratio = sar;
+ for (i = 1; i < s->nb_inputs; i++) {
+ AVFilterLink *inlink = ctx->inputs[i];
+ if (outlink->frame_rate.num != inlink->frame_rate.num ||
+ outlink->frame_rate.den != inlink->frame_rate.den) {
+ av_log(ctx, AV_LOG_VERBOSE,
+ "Video inputs have different frame rates, output will be VFR\n");
+ outlink->frame_rate = av_make_q(1, 0);
+ break;
+ }
+ }
+
if ((ret = ff_framesync_init(&s->fs, ctx, s->nb_inputs)) < 0)
return ret;
.init = init,
.uninit = uninit,
.activate = activate,
- .flags = AVFILTER_FLAG_DYNAMIC_INPUTS,
+ .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_SLICE_THREADS,
};
#endif /* CONFIG_HSTACK_FILTER */
.init = init,
.uninit = uninit,
.activate = activate,
- .flags = AVFILTER_FLAG_DYNAMIC_INPUTS,
+ .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_SLICE_THREADS,
};
#endif /* CONFIG_VSTACK_FILTER */
static const AVOption xstack_options[] = {
{ "inputs", "set number of inputs", OFFSET(nb_inputs), AV_OPT_TYPE_INT, {.i64=2}, 2, INT_MAX, .flags = FLAGS },
- { "layout", "set custom layout", OFFSET(layout), AV_OPT_TYPE_STRING, {.str="0_0|w0_0"}, 0, 0, .flags = FLAGS },
+ { "layout", "set custom layout", OFFSET(layout), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, .flags = FLAGS },
{ "shortest", "force termination when the shortest input terminates", OFFSET(shortest), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, .flags = FLAGS },
{ NULL },
};
.init = init,
.uninit = uninit,
.activate = activate,
- .flags = AVFILTER_FLAG_DYNAMIC_INPUTS,
+ .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_SLICE_THREADS,
};
#endif /* CONFIG_XSTACK_FILTER */
projects / ffmpeg / blobdiff