May 2018 - ffmpeg-cvslog - lists.ffmpeg.org

avdevice/decklink_dec: unref packets on avpacket_queue_put error
by Marton Balint 01 May '18

01 May '18

ffmpeg | branch: release/4.0 | Marton Balint <cus(a)passwd.hu> | Sun Apr 22 23:09:05 2018 +0200| [d89eea3455862a97963ac0701c51d9a1bdd21f19] | committer: Marton Balint avdevice/decklink_dec: unref packets on avpacket_queue_put error Signed-off-by: Marton Balint <cus(a)passwd.hu> (cherry picked from commit 649087fa83a50e04a4ddd7f2f5f740a18ac28902) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d89eea3455862a979… --- libavdevice/decklink_dec.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index e97a4402ea..57004d7b06 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -467,16 +467,19 @@ static int avpacket_queue_put(AVPacketQueue *q, AVPacket *pkt) // Drop Packet if queue size is > maximum queue size if (avpacket_queue_size(q) > (uint64_t)q->max_q_size) { + av_packet_unref(pkt); av_log(q->avctx, AV_LOG_WARNING, "Decklink input buffer overrun!\n"); return -1; } /* ensure the packet is reference counted */ if (av_packet_make_refcounted(pkt) < 0) { + av_packet_unref(pkt); return -1; } pkt1 = (AVPacketList *)av_malloc(sizeof(AVPacketList)); if (!pkt1) { + av_packet_unref(pkt); return -1; } av_packet_move_ref(&pkt1->pkt, pkt);

1 0

avcodec/hnm4video: fix palette alpha
by Marton Balint 01 May '18

01 May '18

ffmpeg | branch: release/4.0 | Marton Balint <cus(a)passwd.hu> | Mon Apr 23 20:46:49 2018 +0200| [0a22e31fbbbadcd481ebc702871192c54ecf1ee9] | committer: Marton Balint avcodec/hnm4video: fix palette alpha Signed-off-by: Marton Balint <cus(a)passwd.hu> (cherry picked from commit 4c501bafc08c0260c299074d119b85ba39ab334a) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0a22e31fbbbadcd48… --- libavcodec/hnm4video.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/hnm4video.c b/libavcodec/hnm4video.c index a64dbb1746..9e1ac49ddc 100644 --- a/libavcodec/hnm4video.c +++ b/libavcodec/hnm4video.c @@ -375,6 +375,7 @@ static void hnm_update_palette(AVCodecContext *avctx, uint8_t *src, hnm->palette[writeoffset] = bytestream2_get_be24(&gb); if (!eight_bit_colors) hnm->palette[writeoffset] <<= 2; + hnm->palette[writeoffset] |= (0xFFU << 24); count--; writeoffset++; }

1 0

avcodec/anm: fix palette alpha
by Marton Balint 01 May '18

01 May '18

ffmpeg | branch: release/4.0 | Marton Balint <cus(a)passwd.hu> | Mon Apr 23 20:46:25 2018 +0200| [70a01aa4901a217a95f32486354844a9496ff849] | committer: Marton Balint avcodec/anm: fix palette alpha Signed-off-by: Marton Balint <cus(a)passwd.hu> (cherry picked from commit e894d958fce6f47cbe1e4a5e3f2c74af47057125) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=70a01aa4901a217a9… --- libavcodec/anm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/anm.c b/libavcodec/anm.c index 72684189bb..ab6a3994e9 100644 --- a/libavcodec/anm.c +++ b/libavcodec/anm.c @@ -54,7 +54,7 @@ static av_cold int decode_init(AVCodecContext *avctx) bytestream2_skipu(&s->gb, 16 * 8); for (i = 0; i < 256; i++) - s->palette[i] = bytestream2_get_le32u(&s->gb); + s->palette[i] = (0xFFU << 24) | bytestream2_get_le32u(&s->gb); return 0; }

1 0

avformat/qtpalette: parse color table according to the QuickTime file format specs
by Marton Balint 01 May '18

01 May '18

ffmpeg | branch: release/4.0 | Marton Balint <cus(a)passwd.hu> | Thu Apr 19 20:11:02 2018 +0200| [da6c519f6e531239c0cc97f0d68d7f8756c6862a] | committer: Marton Balint avformat/qtpalette: parse color table according to the QuickTime file format specs The specs says that the the first color component in the color array is not alpha, but simply 0. Fixes 0 alpha of fate-suite/cvid/catfight-cvid-pal8-partial.mov Signed-off-by: Marton Balint <cus(a)passwd.hu> (cherry picked from commit c60a824ee87ae3b15ed1cb92b780bec9b642b019) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=da6c519f6e531239c… --- libavformat/qtpalette.c | 12 ++++++------ tests/ref/lavf-fate/mov_qtrle_mace6 | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libavformat/qtpalette.c b/libavformat/qtpalette.c index 666c6b7351..6833f0cea9 100644 --- a/libavformat/qtpalette.c +++ b/libavformat/qtpalette.c @@ -49,7 +49,7 @@ int ff_get_qtpalette(int codec_id, AVIOContext *pb, uint32_t *palette) /* If the depth is 1, 2, 4, or 8 bpp, file is palettized. */ if ((bit_depth == 1 || bit_depth == 2 || bit_depth == 4 || bit_depth == 8)) { uint32_t color_count, color_start, color_end; - uint32_t a, r, g, b; + uint32_t r, g, b; /* Ignore the greyscale bit for 1-bit video and sample * descriptions containing a color table. */ @@ -94,17 +94,17 @@ int ff_get_qtpalette(int codec_id, AVIOContext *pb, uint32_t *palette) color_end = avio_rb16(pb); if ((color_start <= 255) && (color_end <= 255)) { for (i = color_start; i <= color_end; i++) { - /* each A, R, G, or B component is 16 bits; - * only use the top 8 bits */ - a = avio_r8(pb); - avio_r8(pb); + /* Each color is made of four unsigned 16 bit integers. The + * first integer is 0, the remaining integers are the red, + * the green and the blue values. We only use the top 8 bit. */ + avio_skip(pb, 2); r = avio_r8(pb); avio_r8(pb); g = avio_r8(pb); avio_r8(pb); b = avio_r8(pb); avio_r8(pb); - palette[i] = (a << 24 ) | (r << 16) | (g << 8) | (b); + palette[i] = (0xFFU << 24) | (r << 16) | (g << 8) | (b); } } } diff --git a/tests/ref/lavf-fate/mov_qtrle_mace6 b/tests/ref/lavf-fate/mov_qtrle_mace6 index 30c705ee4c..f8428aaa49 100644 --- a/tests/ref/lavf-fate/mov_qtrle_mace6 +++ b/tests/ref/lavf-fate/mov_qtrle_mace6 @@ -1,3 +1,3 @@ dcc9c4c182a5809dee9a9366f4533797 *./tests/data/lavf-fate/lavf.mov 1270387 ./tests/data/lavf-fate/lavf.mov -./tests/data/lavf-fate/lavf.mov CRC=0x5ec66f68 +./tests/data/lavf-fate/lavf.mov CRC=0x9320cd26

1 0

ffplay: Fix realloc_texture when input texture is NULL.
by Matt Oliver 01 May '18

01 May '18

ffmpeg | branch: release/4.0 | Matt Oliver <protogonoi(a)gmail.com> | Tue Apr 10 23:01:18 2018 +1000| [29328d96b90fc20048803201b379c6c6a18661b4] | committer: Marton Balint ffplay: Fix realloc_texture when input texture is NULL. SDL_QueryTexture and SDL_DestroyTexture require that the input texture pointer be non-null. Debug builds of SDL will correctly check for this and break program execution. This patch fixes this by checking the status of the texture pointer. Signed-off-by: Matt Oliver <protogonoi(a)gmail.com> (cherry picked from commit 6be690685a8876a61f87b2b8bf30547e09030a96) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=29328d96b90fc2004… --- fftools/ffplay.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index bc9ddb8885..dcca9c26d8 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -834,10 +834,11 @@ static int realloc_texture(SDL_Texture **texture, Uint32 new_format, int new_wid { Uint32 format; int access, w, h; - if (SDL_QueryTexture(*texture, &format, &access, &w, &h) < 0 || new_width != w || new_height != h || new_format != format) { + if (!*texture || SDL_QueryTexture(*texture, &format, &access, &w, &h) < 0 || new_width != w || new_height != h || new_format != format) { void *pixels; int pitch; - SDL_DestroyTexture(*texture); + if (*texture) + SDL_DestroyTexture(*texture); if (!(*texture = SDL_CreateTexture(renderer, new_format, SDL_TEXTUREACCESS_STREAMING, new_width, new_height))) return -1; if (SDL_SetTextureBlendMode(*texture, blendmode) < 0)

1 0

avfilter/af_biquads: add slice threading
by Paul B Mahol 01 May '18

01 May '18

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue May 1 15:40:53 2018 +0200| [d176497cec95f14aed1db847b2889843ef0843dd] | committer: Paul B Mahol avfilter/af_biquads: add slice threading Helps with multi-channels audio. Otherwise use threads=1. Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d176497cec95f14ae… --- libavfilter/af_biquads.c | 52 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/libavfilter/af_biquads.c b/libavfilter/af_biquads.c index 804528040d..56d3035d77 100644 --- a/libavfilter/af_biquads.c +++ b/libavfilter/af_biquads.c @@ -416,19 +416,50 @@ static int config_output(AVFilterLink *outlink) return config_filter(outlink, 1); } +typedef struct ThreadData { + AVFrame *in, *out; +} ThreadData; + +static int filter_channel(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) +{ + AVFilterLink *inlink = ctx->inputs[0]; + ThreadData *td = arg; + AVFrame *buf = td->in; + AVFrame *out_buf = td->out; + BiquadsContext *s = ctx->priv; + const int start = (buf->channels * jobnr) / nb_jobs; + const int end = (buf->channels * (jobnr+1)) / nb_jobs; + int ch; + + for (ch = start; ch < end; ch++) { + if (!((av_channel_layout_extract_channel(inlink->channel_layout, ch) & s->channels))) { + if (buf != out_buf) + memcpy(out_buf->extended_data[ch], buf->extended_data[ch], + buf->nb_samples * s->block_align); + continue; + } + + s->filter(s, buf->extended_data[ch], out_buf->extended_data[ch], buf->nb_samples, + &s->cache[ch].i1, &s->cache[ch].i2, &s->cache[ch].o1, &s->cache[ch].o2, + s->b0, s->b1, s->b2, s->a1, s->a2, &s->cache[ch].clippings); + } + + return 0; +} + static int filter_frame(AVFilterLink *inlink, AVFrame *buf) { AVFilterContext *ctx = inlink->dst; BiquadsContext *s = ctx->priv; AVFilterLink *outlink = ctx->outputs[0]; AVFrame *out_buf; - int nb_samples = buf->nb_samples; + ThreadData td; int ch; if (av_frame_is_writable(buf)) { out_buf = buf; } else { - out_buf = ff_get_audio_buffer(outlink, nb_samples); + out_buf = ff_get_audio_buffer(outlink, buf->nb_samples); if (!out_buf) { av_frame_free(&buf); return AVERROR(ENOMEM); @@ -436,19 +467,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf) av_frame_copy_props(out_buf, buf); } - for (ch = 0; ch < buf->channels; ch++) { - if (!((av_channel_layout_extract_channel(inlink->channel_layout, ch) & s->channels))) { - if (buf != out_buf) - memcpy(out_buf->extended_data[ch], buf->extended_data[ch], nb_samples * s->block_align); - continue; - } - s->filter(s, buf->extended_data[ch], - out_buf->extended_data[ch], nb_samples, - &s->cache[ch].i1, &s->cache[ch].i2, - &s->cache[ch].o1, &s->cache[ch].o2, - s->b0, s->b1, s->b2, s->a1, s->a2, - &s->cache[ch].clippings); - } + td.in = buf; + td.out = out_buf; + ctx->internal->execute(ctx, filter_channel, &td, NULL, FFMIN(outlink->channels, ff_filter_get_nb_threads(ctx))); for (ch = 0; ch < outlink->channels; ch++) { if (s->cache[ch].clippings > 0) @@ -631,6 +652,7 @@ AVFilter ff_af_##name_ = { \ .outputs = outputs, \ .priv_class = &name_##_class, \ .process_command = process_command, \ + .flags = AVFILTER_FLAG_SLICE_THREADS, \ } #if CONFIG_EQUALIZER_FILTER

1 0

avfilter/af_biquads: change clipping detection from global to channel
by Paul B Mahol 01 May '18

01 May '18

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue May 1 15:26:20 2018 +0200| [2308a3c7e37d1b27fd27764a97a75706f53508c2] | committer: Paul B Mahol avfilter/af_biquads: change clipping detection from global to channel Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2308a3c7e37d1b27f… --- libavfilter/af_biquads.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/libavfilter/af_biquads.c b/libavfilter/af_biquads.c index 9dfc16cef6..804528040d 100644 --- a/libavfilter/af_biquads.c +++ b/libavfilter/af_biquads.c @@ -95,6 +95,7 @@ enum WidthType { typedef struct ChanCache { double i1, i2; double o1, o2; + int clippings; } ChanCache; typedef struct BiquadsContext { @@ -114,12 +115,11 @@ typedef struct BiquadsContext { double b0, b1, b2; ChanCache *cache; - int clippings; int block_align; void (*filter)(struct BiquadsContext *s, const void *ibuf, void *obuf, int len, double *i1, double *i2, double *o1, double *o2, - double b0, double b1, double b2, double a1, double a2); + double b0, double b1, double b2, double a1, double a2, int *clippings); } BiquadsContext; static av_cold int init(AVFilterContext *ctx) @@ -176,7 +176,7 @@ static void biquad_## name (BiquadsContext *s, \ double *in1, double *in2, \ double *out1, double *out2, \ double b0, double b1, double b2, \ - double a1, double a2) \ + double a1, double a2, int *clippings) \ { \ const type *ibuf = input; \ type *obuf = output; \ @@ -192,10 +192,10 @@ static void biquad_## name (BiquadsContext *s, \ o2 = i2 * b2 + i1 * b1 + ibuf[i] * b0 + o2 * a2 + o1 * a1; \ i2 = ibuf[i]; \ if (need_clipping && o2 < min) { \ - s->clippings++; \ + (*clippings)++; \ obuf[i] = min; \ } else if (need_clipping && o2 > max) { \ - s->clippings++; \ + (*clippings)++; \ obuf[i] = max; \ } else { \ obuf[i] = o2; \ @@ -204,10 +204,10 @@ static void biquad_## name (BiquadsContext *s, \ o1 = i1 * b2 + i2 * b1 + ibuf[i] * b0 + o1 * a2 + o2 * a1; \ i1 = ibuf[i]; \ if (need_clipping && o1 < min) { \ - s->clippings++; \ + (*clippings)++; \ obuf[i] = min; \ } else if (need_clipping && o1 > max) { \ - s->clippings++; \ + (*clippings)++; \ obuf[i] = max; \ } else { \ obuf[i] = o1; \ @@ -220,10 +220,10 @@ static void biquad_## name (BiquadsContext *s, \ o2 = o1; \ o1 = o0; \ if (need_clipping && o0 < min) { \ - s->clippings++; \ + (*clippings)++; \ obuf[i] = min; \ } else if (need_clipping && o0 > max) { \ - s->clippings++; \ + (*clippings)++; \ obuf[i] = max; \ } else { \ obuf[i] = o0; \ @@ -446,12 +446,16 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf) out_buf->extended_data[ch], nb_samples, &s->cache[ch].i1, &s->cache[ch].i2, &s->cache[ch].o1, &s->cache[ch].o2, - s->b0, s->b1, s->b2, s->a1, s->a2); + s->b0, s->b1, s->b2, s->a1, s->a2, + &s->cache[ch].clippings); } - if (s->clippings > 0) - av_log(ctx, AV_LOG_WARNING, "clipping %d times. Please reduce gain.\n", s->clippings); - s->clippings = 0; + for (ch = 0; ch < outlink->channels; ch++) { + if (s->cache[ch].clippings > 0) + av_log(ctx, AV_LOG_WARNING, "Channel %d clipping %d times. Please reduce gain.\n", + ch, s->cache[ch].clippings); + s->cache[ch].clippings = 0; + } if (buf != out_buf) av_frame_free(&buf);

1 0

avfilter/vf_neighbor: add slice threading
by Paul B Mahol 01 May '18

01 May '18

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue May 1 15:05:43 2018 +0200| [5bfc433a6ed9ff55ad0a6b0d7745ea74bb0f1d99] | committer: Paul B Mahol avfilter/vf_neighbor: add slice threading Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5bfc433a6ed9ff55a… --- libavfilter/vf_neighbor.c | 54 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/libavfilter/vf_neighbor.c b/libavfilter/vf_neighbor.c index 1eb89c208d..12fe4b7ab7 100644 --- a/libavfilter/vf_neighbor.c +++ b/libavfilter/vf_neighbor.c @@ -27,6 +27,10 @@ #include "internal.h" #include "video.h" +typedef struct ThreadData { + AVFrame *in, *out; +} ThreadData; + typedef struct NContext { const AVClass *class; int planeheight[4]; @@ -148,36 +152,31 @@ static int config_input(AVFilterLink *inlink) return 0; } -static int filter_frame(AVFilterLink *inlink, AVFrame *in) +static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) { - AVFilterContext *ctx = inlink->dst; - AVFilterLink *outlink = ctx->outputs[0]; NContext *s = ctx->priv; - AVFrame *out; + ThreadData *td = arg; + AVFrame *out = td->out; + AVFrame *in = td->in; int plane, y; - out = ff_get_video_buffer(outlink, outlink->w, outlink->h); - if (!out) { - av_frame_free(&in); - return AVERROR(ENOMEM); - } - av_frame_copy_props(out, 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]; + const int slice_start = (height * jobnr) / nb_jobs; + const int slice_end = (height * (jobnr+1)) / nb_jobs; + const uint8_t *src = (const uint8_t *)in->data[plane] + slice_start * stride; + uint8_t *dst = out->data[plane] + slice_start * dstride; if (!threshold) { - av_image_copy_plane(dst, dstride, src, stride, width, height); + av_image_copy_plane(dst, dstride, src, stride, width, slice_end - slice_start); continue; } - for (y = 0; y < height; y++) { + for (y = slice_start; y < slice_end; 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, @@ -201,6 +200,28 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) } } + return 0; +} + +static int filter_frame(AVFilterLink *inlink, AVFrame *in) +{ + AVFilterContext *ctx = inlink->dst; + AVFilterLink *outlink = ctx->outputs[0]; + NContext *s = ctx->priv; + ThreadData td; + AVFrame *out; + + out = ff_get_video_buffer(outlink, outlink->w, outlink->h); + if (!out) { + av_frame_free(&in); + return AVERROR(ENOMEM); + } + av_frame_copy_props(out, in); + + td.in = in; + td.out = out; + ctx->internal->execute(ctx, filter_slice, &td, NULL, FFMIN(s->planeheight[1], ff_filter_get_nb_threads(ctx))); + av_frame_free(&in); return ff_filter_frame(outlink, out); } @@ -237,7 +258,8 @@ AVFilter ff_vf_##name_ = { \ .query_formats = query_formats, \ .inputs = neighbor_inputs, \ .outputs = neighbor_outputs, \ - .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, \ + .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC| \ + AVFILTER_FLAG_SLICE_THREADS, \ } #if CONFIG_EROSION_FILTER

1 0

avfilter/vf_neighbor: simplify code little
by Paul B Mahol 01 May '18

01 May '18

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue May 1 14:50:48 2018 +0200| [ddf844d17c40fd6053f06d67d8973c302e01b61c] | committer: Paul B Mahol avfilter/vf_neighbor: simplify code little Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ddf844d17c40fd605… --- libavfilter/vf_neighbor.c | 66 +++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/libavfilter/vf_neighbor.c b/libavfilter/vf_neighbor.c index bd69c9e77f..1eb89c208d 100644 --- a/libavfilter/vf_neighbor.c +++ b/libavfilter/vf_neighbor.c @@ -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; } }

1 0

avfilter/vf_neighbor: rewrite without using temp memory
by Paul B Mahol 01 May '18

01 May '18

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue May 1 13:12:50 2018 +0200| [273edb2fe45a8f3805085f879ad4717d87247aeb] | committer: Paul B Mahol avfilter/vf_neighbor: rewrite without using temp memory Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=273edb2fe45a8f380… --- libavfilter/vf_neighbor.c | 70 ++++++++++++++++------------------------------- 1 file changed, 24 insertions(+), 46 deletions(-) diff --git a/libavfilter/vf_neighbor.c b/libavfilter/vf_neighbor.c index de4a12f048..bd69c9e77f 100644 --- a/libavfilter/vf_neighbor.c +++ b/libavfilter/vf_neighbor.c @@ -34,7 +34,6 @@ typedef struct NContext { int nb_planes; int threshold[4]; int coordinates; - uint8_t *buffer; void (*filter)(uint8_t *dst, const uint8_t *p1, int width, int threshold, const uint8_t *coordinates[], int coord); @@ -52,25 +51,6 @@ static int query_formats(AVFilterContext *ctx) return ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); } -static av_cold void uninit(AVFilterContext *ctx) -{ - NContext *s = ctx->priv; - - av_freep(&s->buffer); -} - -static inline void line_copy8(uint8_t *line, const uint8_t *srcp, int width, int mergin) -{ - int i; - - memcpy(line, srcp, width); - - for (i = mergin; i > 0; i--) { - line[-i] = line[i]; - line[width - 1 + i] = line[width - 1 - i]; - } -} - static void erosion(uint8_t *dst, const uint8_t *p1, int width, int threshold, const uint8_t *coordinates[], int coord) { @@ -155,9 +135,6 @@ static int config_input(AVFilterLink *inlink) s->planeheight[0] = s->planeheight[3] = inlink->h; s->nb_planes = av_pix_fmt_count_planes(inlink->format); - s->buffer = av_malloc(3 * (s->planewidth[0] + 32)); - if (!s->buffer) - return AVERROR(ENOMEM); if (!strcmp(ctx->filter->name, "erosion")) s->filter = erosion; @@ -190,32 +167,34 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) const int threshold = s->threshold[plane]; 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]; - int stride = in->linesize[plane]; - int height = s->planeheight[plane]; - int width = s->planewidth[plane]; - uint8_t *p0 = s->buffer + 16; - uint8_t *p1 = p0 + s->planewidth[0]; - uint8_t *p2 = p1 + s->planewidth[0]; - uint8_t *orig = p0, *end = p2; - - line_copy8(p0, src + stride, width, 1); - line_copy8(p1, src, width, 1); + const int height = s->planeheight[plane]; + const int width = s->planewidth[plane]; for (y = 0; y < height; y++) { - const uint8_t *coordinates[] = { p0 - 1, p0, p0 + 1, - p1 - 1, p1 + 1, - p2 - 1, p2, p2 + 1}; - src += stride * (y < height - 1 ? 1 : -1); - line_copy8(p2, src, width, 1); - - s->filter(dst, p1, width, threshold, coordinates, s->coordinates); - - p0 = p1; - p1 = p2; - p2 = (p2 == end) ? orig: p2 + s->planewidth[0]; - dst += out->linesize[plane]; + 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], @@ -257,7 +236,6 @@ AVFilter ff_vf_##name_ = { \ .description = NULL_IF_CONFIG_SMALL(description_), \ .priv_size = sizeof(NContext), \ .priv_class = &name_##_class, \ - .uninit = uninit, \ .query_formats = query_formats, \ .inputs = neighbor_inputs, \ .outputs = neighbor_outputs, \

1 0