Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/vf_neighbor: simplify code little

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
pull/298/head
Paul B Mahol 7 years ago
parent 273edb2fe4
commit ddf844d17c
1 changed files with 32 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 66
      libavfilter/vf_neighbor.c

66
libavfilter/vf_neighbor.c
Unescape View File

@ -165,41 +165,39 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
for (plane = 0; plane < s->nb_planes; plane++) {
const int threshold = s->threshold[plane];
const int stride = in->linesize[plane];
const int dstride = out->linesize[plane];
const uint8_t *src = in->data[plane];
uint8_t *dst = out->data[plane];
const int height = s->planeheight[plane];
const int width = s->planewidth[plane];
if (!threshold) {
av_image_copy_plane(dst, dstride, src, stride, width, height);
continue;
}
if (threshold) {
const int stride = in->linesize[plane];
const int dstride = out->linesize[plane];
const uint8_t *src = in->data[plane];
uint8_t *dst = out->data[plane];
const int height = s->planeheight[plane];
const int width = s->planewidth[plane];
for (y = 0; y < height; y++) {
const int nh = y > 0;
const int ph = y < height - 1;
const uint8_t *coordinates[] = { src - nh * stride, src + 1 - nh * stride, src + 2 - nh * stride,
src, src + 2,
src + ph * stride, src + 1 + ph * stride, src + 2 + ph * stride};
const uint8_t *coordinateslb[] = { src - nh * stride, src - nh * stride, src + 1 - nh * stride,
src, src + 1,
src + ph * stride, src + ph * stride, src + 1 + ph * stride};
const uint8_t *coordinatesrb[] = { src + width - 2 - nh * stride, src + width - 1 - nh * stride, src + width - 1 - nh * stride,
src + width - 2, src + width - 1,
src + width - 2 + ph * stride, src + width - 1 + ph * stride, src + width - 1 + ph * stride};
s->filter(dst, src, 1, threshold, coordinateslb, s->coordinates);
s->filter(dst + 1, src + 1, width - 2, threshold, coordinates, s->coordinates);
s->filter(dst + width - 1, src + width - 1, 1, threshold, coordinatesrb, s->coordinates);
src += stride;
dst += dstride;
}
} else {
av_image_copy_plane(out->data[plane], out->linesize[plane],
in->data[plane], in->linesize[plane],
s->planewidth[plane], s->planeheight[plane]);
for (y = 0; y < height; y++) {
const int nh = y > 0;
const int ph = y < height - 1;
const uint8_t *coordinates[] = { src - nh * stride, src + 1 - nh * stride, src + 2 - nh * stride,
src, src + 2,
src + ph * stride, src + 1 + ph * stride, src + 2 + ph * stride};
const uint8_t *coordinateslb[] = { src - nh * stride, src - nh * stride, src + 1 - nh * stride,
src, src + 1,
src + ph * stride, src + ph * stride, src + 1 + ph * stride};
const uint8_t *coordinatesrb[] = { src + width - 2 - nh * stride, src + width - 1 - nh * stride, src + width - 1 - nh * stride,
src + width - 2, src + width - 1,
src + width - 2 + ph * stride, src + width - 1 + ph * stride, src + width - 1 + ph * stride};
s->filter(dst, src, 1, threshold, coordinateslb, s->coordinates);
s->filter(dst + 1, src + 1, width - 2, threshold, coordinates, s->coordinates);
s->filter(dst + width - 1, src + width - 1, 1, threshold, coordinatesrb, s->coordinates);
src += stride;
dst += dstride;
}
}

Write Preview
Loading…
Cancel
Save