RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vf_transpose: switch to filter_frame 

Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-11-28 21:46:23 +01:00
parent 2c3b665379
commit afded1816b
1 changed files with 37 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
libavfilter/vf_transpose.c
View File

@ -165,106 +165,84 @@ static AVFilterBufferRef *get_video_buffer(AVFilterLink *inlink, int perms, int
ff_default_get_video_buffer(inlink, perms, w, h); ff_default_get_video_buffer(inlink, perms, w, h);
} }
static int start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref) static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *in)
{ {
TransContext *trans = inlink->dst->priv; TransContext *trans = inlink->dst->priv;
AVFilterLink *outlink = inlink->dst->outputs[0]; AVFilterLink *outlink = inlink->dst->outputs[0];
AVFilterBufferRef *buf_out; AVFilterBufferRef *out;
int plane;
if (trans->passthrough) if (trans->passthrough)
return ff_null_start_frame(inlink, picref); return ff_filter_frame(outlink, in);
outlink->out_buf = ff_get_video_buffer(outlink, AV_PERM_WRITE, out = ff_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h);
outlink->w, outlink->h); if (!out) {
if (!outlink->out_buf) avfilter_unref_bufferp(&in);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
outlink->out_buf->pts = picref->pts;
if (picref->video->sample_aspect_ratio.num == 0) {
outlink->out_buf->video->sample_aspect_ratio = picref->video->sample_aspect_ratio;
} else {
outlink->out_buf->video->sample_aspect_ratio.num = picref->video->sample_aspect_ratio.den;
outlink->out_buf->video->sample_aspect_ratio.den = picref->video->sample_aspect_ratio.num;
} }
buf_out = avfilter_ref_buffer(outlink->out_buf, ~0); out->pts = in->pts;
if (!buf_out)
return AVERROR(ENOMEM);
return ff_start_frame(outlink, buf_out);
}
static int end_frame(AVFilterLink *inlink) if (in->video->sample_aspect_ratio.num == 0) {
{ out->video->sample_aspect_ratio = in->video->sample_aspect_ratio;
TransContext *trans = inlink->dst->priv; } else {
AVFilterBufferRef *inpic = inlink->cur_buf; out->video->sample_aspect_ratio.num = in->video->sample_aspect_ratio.den;
AVFilterBufferRef *outpic = inlink->dst->outputs[0]->out_buf; out->video->sample_aspect_ratio.den = in->video->sample_aspect_ratio.num;
AVFilterLink *outlink = inlink->dst->outputs[0]; }
int plane, ret;
if (trans->passthrough) for (plane = 0; out->data[plane]; plane++) {
return ff_null_end_frame(inlink);
for (plane = 0; outpic->data[plane]; plane++) {
int hsub = plane == 1 || plane == 2 ? trans->hsub : 0; int hsub = plane == 1 || plane == 2 ? trans->hsub : 0;
int vsub = plane == 1 || plane == 2 ? trans->vsub : 0; int vsub = plane == 1 || plane == 2 ? trans->vsub : 0;
int pixstep = trans->pixsteps[plane]; int pixstep = trans->pixsteps[plane];
int inh = inpic->video->h>>vsub; int inh = in->video->h>>vsub;
int outw = outpic->video->w>>hsub; int outw = out->video->w>>hsub;
int outh = outpic->video->h>>vsub; int outh = out->video->h>>vsub;
uint8_t *out, *in; uint8_t *dst, *src;
int outlinesize, inlinesize; int dstlinesize, srclinesize;
int x, y; int x, y;
out = outpic->data[plane]; outlinesize = outpic->linesize[plane]; dst = out->data[plane];
in = inpic ->data[plane]; inlinesize = inpic ->linesize[plane]; dstlinesize = out->linesize[plane];
src = in->data[plane];
srclinesize = in->linesize[plane];
if (trans->dir&1) { if (trans->dir&1) {
in += inpic->linesize[plane] * (inh-1); src += in->linesize[plane] * (inh-1);
inlinesize *= -1; srclinesize *= -1;
} }
if (trans->dir&2) { if (trans->dir&2) {
out += outpic->linesize[plane] * (outh-1); dst += out->linesize[plane] * (outh-1);
outlinesize *= -1; dstlinesize *= -1;
} }
for (y = 0; y < outh; y++) { for (y = 0; y < outh; y++) {
switch (pixstep) { switch (pixstep) {
case 1: case 1:
for (x = 0; x < outw; x++) for (x = 0; x < outw; x++)
out[x] = in[x*inlinesize + y]; dst[x] = src[x*srclinesize + y];
break; break;
case 2: case 2:
for (x = 0; x < outw; x++) for (x = 0; x < outw; x++)
*((uint16_t *)(out + 2*x)) = *((uint16_t *)(in + x*inlinesize + y*2)); *((uint16_t *)(dst + 2*x)) = *((uint16_t *)(src + x*srclinesize + y*2));
break; break;
case 3: case 3:
for (x = 0; x < outw; x++) { for (x = 0; x < outw; x++) {
int32_t v = AV_RB24(in + x*inlinesize + y*3); int32_t v = AV_RB24(src + x*srclinesize + y*3);
AV_WB24(out + 3*x, v); AV_WB24(dst + 3*x, v);
} }
break; break;
case 4: case 4:
for (x = 0; x < outw; x++) for (x = 0; x < outw; x++)
*((uint32_t *)(out + 4*x)) = *((uint32_t *)(in + x*inlinesize + y*4)); *((uint32_t *)(dst + 4*x)) = *((uint32_t *)(src + x*srclinesize + y*4));
break; break;
} }
out += outlinesize; dst += dstlinesize;
} }
} }
if ((ret = ff_draw_slice(outlink, 0, outpic->video->h, 1)) < 0 || avfilter_unref_bufferp(&in);
(ret = ff_end_frame(outlink)) < 0) return ff_filter_frame(outlink, out);
return ret;
return 0;
}
static int draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir)
{
TransContext *trans = inlink->dst->priv;
return trans->passthrough ? ff_null_draw_slice(inlink, y, h, slice_dir) : 0;
} }
static const AVFilterPad avfilter_vf_transpose_inputs[] = { static const AVFilterPad avfilter_vf_transpose_inputs[] = {
@ -272,9 +250,7 @@ static const AVFilterPad avfilter_vf_transpose_inputs[] = {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.get_video_buffer= get_video_buffer, .get_video_buffer= get_video_buffer,
.start_frame = start_frame, .filter_frame = filter_frame,
.draw_slice = draw_slice,
.end_frame = end_frame,
.min_perms = AV_PERM_READ, .min_perms = AV_PERM_READ,
}, },
{ NULL } { NULL }