generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vf_hflip: switch to filter_frame

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Anton Khirnov
2012-11-28 22:39:16 +01:00
committed by Michael Niedermayer
parent dabb993c44
commit eb7e7e82e1
1 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
libavfilter/vf_hflip.c
View File

@@ -86,37 +86,34 @@ static int config_props(AVFilterLink *inlink)
return 0; return 0;
} }
static int start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref) static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *in)
{ {
AVFilterLink *outlink = inlink->dst->outputs[0]; AVFilterContext *ctx = inlink->dst;
FlipContext *flip = ctx->priv;
outlink->out_buf = AVFilterLink *outlink = ctx->outputs[0];
ff_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h); AVFilterBufferRef *out;
avfilter_copy_buffer_ref_props(outlink->out_buf, picref);
/* copy palette if required */
if (av_pix_fmt_desc_get(inlink->format)->flags & PIX_FMT_PAL)
memcpy(inlink->dst->outputs[0]->out_buf->data[1], picref->data[1], AVPALETTE_SIZE);
return ff_start_frame(outlink, avfilter_ref_buffer(outlink->out_buf, ~0));
}
static int draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir)
{
FlipContext *flip = inlink->dst->priv;
AVFilterBufferRef *inpic = inlink->cur_buf;
AVFilterBufferRef *outpic = inlink->dst->outputs[0]->out_buf;
uint8_t *inrow, *outrow; uint8_t *inrow, *outrow;
int i, j, plane, step, hsub, vsub; int i, j, plane, step, hsub, vsub;
for (plane = 0; plane < 4 && inpic->data[plane]; plane++) { out = ff_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h);
if (!out) {
avfilter_unref_bufferp(&in);
return AVERROR(ENOMEM);
}
avfilter_copy_buffer_ref_props(out, in);
/* copy palette if required */
if (av_pix_fmt_desc_get(inlink->format)->flags & PIX_FMT_PAL)
memcpy(out->data[1], in->data[1], AVPALETTE_SIZE);
for (plane = 0; plane < 4 && in->data[plane]; plane++) {
step = flip->max_step[plane]; step = flip->max_step[plane];
hsub = (plane == 1 || plane == 2) ? flip->hsub : 0; hsub = (plane == 1 || plane == 2) ? flip->hsub : 0;
vsub = (plane == 1 || plane == 2) ? flip->vsub : 0; vsub = (plane == 1 || plane == 2) ? flip->vsub : 0;
outrow = outpic->data[plane] + (y>>vsub) * outpic->linesize[plane]; outrow = out->data[plane];
inrow = inpic ->data[plane] + (y>>vsub) * inpic ->linesize[plane] + ((inlink->w >> hsub) - 1) * step; inrow = in ->data[plane] + ((inlink->w >> hsub) - 1) * step;
for (i = 0; i < h>>vsub; i++) { for (i = 0; i < in->video->h >> vsub; i++) {
switch (step) { switch (step) {
case 1: case 1:
for (j = 0; j < (inlink->w >> hsub); j++) for (j = 0; j < (inlink->w >> hsub); j++)
@@ -157,20 +154,20 @@ static int draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir)
memcpy(outrow + j*step, inrow - j*step, step); memcpy(outrow + j*step, inrow - j*step, step);
} }
inrow += inpic ->linesize[plane]; inrow += in ->linesize[plane];
outrow += outpic->linesize[plane]; outrow += out->linesize[plane];
} }
} }
return ff_draw_slice(inlink->dst->outputs[0], y, h, slice_dir); avfilter_unref_bufferp(&in);
return ff_filter_frame(outlink, out);
} }
static const AVFilterPad avfilter_vf_hflip_inputs[] = { static const AVFilterPad avfilter_vf_hflip_inputs[] = {
{ {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.start_frame = start_frame, .filter_frame = filter_frame,
.draw_slice = draw_slice,
.config_props = config_props, .config_props = config_props,
.min_perms = AV_PERM_READ, .min_perms = AV_PERM_READ,
}, },