diff options
author | Stefano Sabatini <stefasab@gmail.com> | 2012-12-07 21:46:28 +0400 |
---|---|---|
committer | Stefano Sabatini <stefasab@gmail.com> | 2012-12-07 22:42:59 +0400 |
commit | c3ad91a3d77c97e029b42d1f0e511874342bfb92 (patch) | |
tree | b50da3a11101a195d9e3ed92914e888e29ecc859 /libavfilter/vf_alphaextract.c | |
parent | 1f467220cfd1664782b1fe210bbc9342ad460fd2 (diff) |
lavfi/alphaextract: switch to filter_frame() API
Diffstat (limited to 'libavfilter/vf_alphaextract.c')
-rw-r--r-- | libavfilter/vf_alphaextract.c | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/libavfilter/vf_alphaextract.c b/libavfilter/vf_alphaextract.c index e779c9832d..60de6ac2ba 100644 --- a/libavfilter/vf_alphaextract.c +++ b/libavfilter/vf_alphaextract.c @@ -28,6 +28,7 @@ #include "libavutil/pixfmt.h" #include "avfilter.h" #include "drawutils.h" +#include "internal.h" #include "formats.h" #include "video.h" @@ -59,16 +60,24 @@ static int config_input(AVFilterLink *inlink) return 0; } -static int draw_slice(AVFilterLink *inlink, int y0, int h, int slice_dir) +static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *cur_buf) { AlphaExtractContext *extract = inlink->dst->priv; - AVFilterBufferRef *cur_buf = inlink->cur_buf; - AVFilterBufferRef *out_buf = inlink->dst->outputs[0]->out_buf; + AVFilterLink *outlink = inlink->dst->outputs[0]; + AVFilterBufferRef *out_buf = + ff_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h); + int ret; + + if (!out_buf) { + ret = AVERROR(ENOMEM); + goto end; + } + avfilter_copy_buffer_ref_props(out_buf, cur_buf); if (extract->is_packed_rgb) { int x, y; uint8_t *pin, *pout; - for (y = y0; y < (y0 + h); y++) { + for (y = 0; y < out_buf->video->h; y++) { pin = cur_buf->data[0] + y * cur_buf->linesize[0] + extract->rgba_map[A]; pout = out_buf->data[0] + y * out_buf->linesize[0]; for (x = 0; x < out_buf->video->w; x++) { @@ -80,13 +89,18 @@ static int draw_slice(AVFilterLink *inlink, int y0, int h, int slice_dir) } else { const int linesize = FFMIN(out_buf->linesize[Y], cur_buf->linesize[A]); int y; - for (y = y0; y < (y0 + h); y++) { + for (y = 0; y < out_buf->video->h; y++) { memcpy(out_buf->data[Y] + y * out_buf->linesize[Y], cur_buf->data[A] + y * cur_buf->linesize[A], linesize); } } - return ff_draw_slice(inlink->dst->outputs[0], y0, h, slice_dir); + + ret = ff_filter_frame(outlink, out_buf); + +end: + avfilter_unref_buffer(cur_buf); + return ret; } static const AVFilterPad alphaextract_inputs[] = { @@ -94,7 +108,7 @@ static const AVFilterPad alphaextract_inputs[] = { .name = "default", .type = AVMEDIA_TYPE_VIDEO, .config_props = config_input, - .draw_slice = draw_slice, + .filter_frame = filter_frame, .min_perms = AV_PERM_READ, }, { NULL } |