[FFmpeg-cvslog] vf_fieldorder: switch to filter_frame, this filter did not support real slices
Anton Khirnov
git at videolan.org
Wed Nov 28 19:35:51 CET 2012
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed Nov 28 18:50:44 2012 +0100| [e67fdbffe588e6b5bc787457da9d5941657a0029] | committer: Michael Niedermayer
vf_fieldorder: switch to filter_frame, this filter did not support real slices
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e67fdbffe588e6b5bc787457da9d5941657a0029
---
libavfilter/vf_fieldorder.c | 116 +++++++++++--------------------------------
1 file changed, 28 insertions(+), 88 deletions(-)
diff --git a/libavfilter/vf_fieldorder.c b/libavfilter/vf_fieldorder.c
index cc47e5b..1db6e12 100644
--- a/libavfilter/vf_fieldorder.c
+++ b/libavfilter/vf_fieldorder.c
@@ -121,90 +121,39 @@ static AVFilterBufferRef *get_video_buffer(AVFilterLink *inlink, int perms, int
return ff_get_video_buffer(outlink, perms, w, h);
}
-static int start_frame(AVFilterLink *inlink, AVFilterBufferRef *inpicref)
+static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *frame)
{
- AVFilterContext *ctx = inlink->dst;
- AVFilterLink *outlink = ctx->outputs[0];
-
- AVFilterBufferRef *outpicref, *for_next_filter;
- int ret = 0;
-
- outpicref = avfilter_ref_buffer(inpicref, ~0);
- if (!outpicref)
- return AVERROR(ENOMEM);
-
- for_next_filter = avfilter_ref_buffer(outpicref, ~0);
- if (!for_next_filter) {
- avfilter_unref_bufferp(&outpicref);
- return AVERROR(ENOMEM);
- }
-
- ret = ff_start_frame(outlink, for_next_filter);
- if (ret < 0) {
- avfilter_unref_bufferp(&outpicref);
- return ret;
- }
-
- outlink->out_buf = outpicref;
- return 0;
-}
-
-static int draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir)
-{
- AVFilterContext *ctx = inlink->dst;
- FieldOrderContext *fieldorder = ctx->priv;
- AVFilterLink *outlink = ctx->outputs[0];
-
- AVFilterBufferRef *inpicref = inlink->cur_buf;
+ AVFilterContext *ctx = inlink->dst;
+ FieldOrderContext *s = ctx->priv;
+ AVFilterLink *outlink = ctx->outputs[0];
+ int h, plane, line_step, line_size, line;
+ uint8_t *data;
- /** can only currently do slices if this filter is doing nothing
- * because this filter is moving picture content, the output
- * slice will contain different video lines than the input slice
- * and that complexity will be added later */
- if ( !inpicref->video->interlaced
- || inpicref->video->top_field_first == fieldorder->dst_tff) {
- return ff_draw_slice(outlink, y, h, slice_dir);
- }
- return 0;
-}
+ if (!frame->video->interlaced ||
+ frame->video->top_field_first == s->dst_tff)
+ return ff_filter_frame(outlink, frame);
-static int end_frame(AVFilterLink *inlink)
-{
- AVFilterContext *ctx = inlink->dst;
- FieldOrderContext *fieldorder = ctx->priv;
- AVFilterLink *outlink = ctx->outputs[0];
-
- AVFilterBufferRef *inpicref = inlink->cur_buf;
- AVFilterBufferRef *outpicref = outlink->out_buf;
-
- int h, plane, line_step, line_size, line;
- uint8_t *cpy_src, *cpy_dst;
-
- if ( inpicref->video->interlaced
- && inpicref->video->top_field_first != fieldorder->dst_tff) {
av_dlog(ctx,
"picture will move %s one line\n",
- fieldorder->dst_tff ? "up" : "down");
- h = inpicref->video->h;
- for (plane = 0; plane < 4 && inpicref->data[plane]; plane++) {
- line_step = inpicref->linesize[plane];
- line_size = fieldorder->line_size[plane];
- cpy_src = inpicref->data[plane];
- cpy_dst = outpicref->data[plane];
- if (fieldorder->dst_tff) {
+ s->dst_tff ? "up" : "down");
+ h = frame->video->h;
+ for (plane = 0; plane < 4 && frame->data[plane]; plane++) {
+ line_step = frame->linesize[plane];
+ line_size = s->line_size[plane];
+ data = frame->data[plane];
+ if (s->dst_tff) {
/** Move every line up one line, working from
* the top to the bottom of the frame.
* The original top line is lost.
* The new last line is created as a copy of the
* penultimate line from that field. */
for (line = 0; line < h; line++) {
- if (1 + line < outpicref->video->h) {
- memcpy(cpy_dst, cpy_src + line_step, line_size);
+ if (1 + line < frame->video->h) {
+ memcpy(data, data + line_step, line_size);
} else {
- memcpy(cpy_dst, cpy_src - line_step - line_step, line_size);
+ memcpy(data, data - line_step - line_step, line_size);
}
- cpy_src += line_step;
- cpy_dst += line_step;
+ data += line_step;
}
} else {
/** Move every line down one line, working from
@@ -212,27 +161,20 @@ static int end_frame(AVFilterLink *inlink)
* The original bottom line is lost.
* The new first line is created as a copy of the
* second line from that field. */
- cpy_src += (h - 1) * line_step;
- cpy_dst += (h - 1) * line_step;
+ data += (h - 1) * line_step;
for (line = h - 1; line >= 0 ; line--) {
if (line > 0) {
- memcpy(cpy_dst, cpy_src - line_step, line_size);
+ memcpy(data, data - line_step, line_size);
} else {
- memcpy(cpy_dst, cpy_src + line_step + line_step, line_size);
+ memcpy(data, data + line_step + line_step, line_size);
}
- cpy_src -= line_step;
- cpy_dst -= line_step;
+ data -= line_step;
}
}
}
- outpicref->video->top_field_first = fieldorder->dst_tff;
- ff_draw_slice(outlink, 0, h, 1);
- } else {
- av_dlog(ctx,
- "not interlaced or field order already correct\n");
- }
+ frame->video->top_field_first = s->dst_tff;
- return ff_end_frame(outlink);
+ return ff_filter_frame(outlink, frame);
}
static const AVFilterPad avfilter_vf_fieldorder_inputs[] = {
@@ -240,11 +182,9 @@ static const AVFilterPad avfilter_vf_fieldorder_inputs[] = {
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
.config_props = config_input,
- .start_frame = start_frame,
.get_video_buffer = get_video_buffer,
- .draw_slice = draw_slice,
- .end_frame = end_frame,
- .min_perms = AV_PERM_READ | AV_PERM_PRESERVE,
+ .filter_frame = filter_frame,
+ .min_perms = AV_PERM_READ | AV_PERM_WRITE,
},
{ NULL }
};
More information about the ffmpeg-cvslog
mailing list