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

lavfi/field: switch to filter_frame API

Browse Source
This commit is contained in:
Stefano Sabatini
2012-12-06 13:50:27 +01:00
parent 3942294fd5
commit c3fa6add58
1 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libavfilter/vf_field.c
View File

@@ -82,33 +82,21 @@ static int config_props_output(AVFilterLink *outlink)
return 0; return 0;
} }
static int start_frame(AVFilterLink *inlink, AVFilterBufferRef *inpicref) static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *inpicref)
{ {
FieldContext *field = inlink->dst->priv; FieldContext *field = inlink->dst->priv;
AVFilterBufferRef *outpicref = avfilter_ref_buffer(inpicref, ~0);
AVFilterLink *outlink = inlink->dst->outputs[0]; AVFilterLink *outlink = inlink->dst->outputs[0];
int i; int i;
if (!outpicref) inpicref->video->h = outlink->h;
return AVERROR(ENOMEM); inpicref->video->interlaced = 0;
outpicref->video->h = outlink->h;
outpicref->video->interlaced = 0;
for (i = 0; i < field->nb_planes; i++) { for (i = 0; i < field->nb_planes; i++) {
if (field->type == FIELD_TYPE_BOTTOM) if (field->type == FIELD_TYPE_BOTTOM)
outpicref->data[i] = inpicref->data[i] + inpicref->linesize[i]; inpicref->data[i] = inpicref->data[i] + inpicref->linesize[i];
outpicref->linesize[i] = 2 * inpicref->linesize[i]; inpicref->linesize[i] = 2 * inpicref->linesize[i];
} }
return ff_start_frame(outlink, outpicref); return ff_filter_frame(outlink, inpicref);
}
static int draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir)
{
FieldContext *field = inlink->dst->priv;
int y1 = (y + (field->type == FIELD_TYPE_TOP)) / 2;
int h1 = (h + (field->type == FIELD_TYPE_TOP)) / 2;
return ff_draw_slice(inlink->dst->outputs[0], y1, h1, slice_dir);
} }
static const AVFilterPad field_inputs[] = { static const AVFilterPad field_inputs[] = {
@@ -116,9 +104,7 @@ static const AVFilterPad field_inputs[] = {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.get_video_buffer = ff_null_get_video_buffer, .get_video_buffer = ff_null_get_video_buffer,
.start_frame = start_frame, .filter_frame = filter_frame,
.draw_slice = draw_slice,
.end_frame = ff_null_end_frame,
}, },
{ NULL } { NULL }
}; };