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

avfilter/phase: avoid a memcpy per frame.

Browse Source
This commit is contained in:
Clément Bœsch 2014-05-03 22:42:54 +02:00
parent 687119aa9d
commit 8de600de55
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavfilter/vf_phase.c
View File

@ -251,13 +251,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
av_frame_copy_props(out, in); av_frame_copy_props(out, in);
if (!s->frame) { if (!s->frame) {
s->frame = in;
mode = PROGRESSIVE; mode = PROGRESSIVE;
s->frame = ff_get_video_buffer(outlink, outlink->w, outlink->h);
if (!s->frame) {
av_frame_free(&in);
av_frame_free(&out);
return AVERROR(ENOMEM);
}
} else { } else {
mode = analyze_plane(ctx, s->mode, s->frame, in); mode = analyze_plane(ctx, s->mode, s->frame, in);
} }
@ -269,7 +264,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
for (y = 0, top = 1; y < s->planeheight[plane]; y++, top ^= 1) { for (y = 0, top = 1; y < s->planeheight[plane]; y++, top ^= 1) {
memcpy(to, mode == (top ? BOTTOM_FIRST : TOP_FIRST) ? buf : from, s->linesize[plane]); memcpy(to, mode == (top ? BOTTOM_FIRST : TOP_FIRST) ? buf : from, s->linesize[plane]);
memcpy(buf, from, s->linesize[plane]);
buf += s->frame->linesize[plane]; buf += s->frame->linesize[plane];
from += in->linesize[plane]; from += in->linesize[plane];
@ -277,7 +271,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
} }
} }
av_frame_free(&in); if (in != s->frame)
av_frame_free(&s->frame);
s->frame = in;
return ff_filter_frame(outlink, out); return ff_filter_frame(outlink, out);
} }