ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-20 05:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

avfilter/vf_blend: unbreak tblend

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2015-07-18 05:00:03 +00:00
parent 5c7f708683
commit 9a829a2b6a
1 changed files with 29 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
libavfilter/vf_blend.c
View File

@ -423,35 +423,36 @@ static av_cold void uninit(AVFilterContext *ctx)
av_expr_free(b->params[i].e); av_expr_free(b->params[i].e);
} }
#if CONFIG_BLEND_FILTER
static int config_output(AVFilterLink *outlink) static int config_output(AVFilterLink *outlink)
{ {
AVFilterContext *ctx = outlink->src; AVFilterContext *ctx = outlink->src;
AVFilterLink *toplink = ctx->inputs[TOP]; AVFilterLink *toplink = ctx->inputs[TOP];
AVFilterLink *bottomlink = ctx->inputs[BOTTOM];
BlendContext *b = ctx->priv; BlendContext *b = ctx->priv;
const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(toplink->format); const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(toplink->format);
int ret, plane, is_16bit; int ret, plane, is_16bit;
if (toplink->format != bottomlink->format) { if (!b->tblend) {
av_log(ctx, AV_LOG_ERROR, "inputs must be of same pixel format\n"); AVFilterLink *bottomlink = ctx->inputs[BOTTOM];
return AVERROR(EINVAL);
} if (toplink->format != bottomlink->format) {
if (toplink->w != bottomlink->w || av_log(ctx, AV_LOG_ERROR, "inputs must be of same pixel format\n");
toplink->h != bottomlink->h || return AVERROR(EINVAL);
toplink->sample_aspect_ratio.num != bottomlink->sample_aspect_ratio.num || }
toplink->sample_aspect_ratio.den != bottomlink->sample_aspect_ratio.den) { if (toplink->w != bottomlink->w ||
av_log(ctx, AV_LOG_ERROR, "First input link %s parameters " toplink->h != bottomlink->h ||
"(size %dx%d, SAR %d:%d) do not match the corresponding " toplink->sample_aspect_ratio.num != bottomlink->sample_aspect_ratio.num ||
"second input link %s parameters (%dx%d, SAR %d:%d)\n", toplink->sample_aspect_ratio.den != bottomlink->sample_aspect_ratio.den) {
ctx->input_pads[TOP].name, toplink->w, toplink->h, av_log(ctx, AV_LOG_ERROR, "First input link %s parameters "
toplink->sample_aspect_ratio.num, "(size %dx%d, SAR %d:%d) do not match the corresponding "
toplink->sample_aspect_ratio.den, "second input link %s parameters (%dx%d, SAR %d:%d)\n",
ctx->input_pads[BOTTOM].name, bottomlink->w, bottomlink->h, ctx->input_pads[TOP].name, toplink->w, toplink->h,
bottomlink->sample_aspect_ratio.num, toplink->sample_aspect_ratio.num,
bottomlink->sample_aspect_ratio.den); toplink->sample_aspect_ratio.den,
return AVERROR(EINVAL); ctx->input_pads[BOTTOM].name, bottomlink->w, bottomlink->h,
bottomlink->sample_aspect_ratio.num,
bottomlink->sample_aspect_ratio.den);
return AVERROR(EINVAL);
}
} }
outlink->w = toplink->w; outlink->w = toplink->w;
@ -466,8 +467,10 @@ static int config_output(AVFilterLink *outlink)
is_16bit = pix_desc->comp[0].depth_minus1 == 15; is_16bit = pix_desc->comp[0].depth_minus1 == 15;
b->nb_planes = av_pix_fmt_count_planes(toplink->format); b->nb_planes = av_pix_fmt_count_planes(toplink->format);
if ((ret = ff_dualinput_init(ctx, &b->dinput)) < 0) if (b->tblend)
return ret; outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
else if ((ret = ff_dualinput_init(ctx, &b->dinput)) < 0)
return ret;
for (plane = 0; plane < FF_ARRAY_ELEMS(b->params); plane++) { for (plane = 0; plane < FF_ARRAY_ELEMS(b->params); plane++) {
FilterParams *param = &b->params[plane]; FilterParams *param = &b->params[plane];
@ -525,6 +528,8 @@ static int config_output(AVFilterLink *outlink)
return 0; return 0;
} }
#if CONFIG_BLEND_FILTER
static int request_frame(AVFilterLink *outlink) static int request_frame(AVFilterLink *outlink)
{ {
BlendContext *b = outlink->src->priv; BlendContext *b = outlink->src->priv;
@ -577,21 +582,6 @@ AVFilter ff_vf_blend = {
#if CONFIG_TBLEND_FILTER #if CONFIG_TBLEND_FILTER
static int tblend_config_output(AVFilterLink *outlink)
{
AVFilterContext *ctx = outlink->src;
AVFilterLink *inlink = ctx->inputs[0];
BlendContext *b = ctx->priv;
const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(inlink->format);
b->hsub = pix_desc->log2_chroma_w;
b->vsub = pix_desc->log2_chroma_h;
b->nb_planes = av_pix_fmt_count_planes(inlink->format);
outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
return 0;
}
static int tblend_filter_frame(AVFilterLink *inlink, AVFrame *frame) static int tblend_filter_frame(AVFilterLink *inlink, AVFrame *frame)
{ {
BlendContext *b = inlink->dst->priv; BlendContext *b = inlink->dst->priv;
@ -627,7 +617,7 @@ static const AVFilterPad tblend_outputs[] = {
{ {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.config_props = tblend_config_output, .config_props = config_output,
}, },
{ NULL } { NULL }
}; };