October 2019 - ffmpeg-cvslog - lists.ffmpeg.org

avfilter/vf_drawbox: reduce code duplication
by Paul B Mahol 01 Oct '19

01 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Oct 1 19:22:17 2019 +0200| [027a53dc4905ecc8440f32665487c5e46d1dc500] | committer: Paul B Mahol avfilter/vf_drawbox: reduce code duplication > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=027a53dc4905ecc84… --- libavfilter/vf_drawbox.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/libavfilter/vf_drawbox.c b/libavfilter/vf_drawbox.c index c9cb63dbd1..91bfeb2414 100644 --- a/libavfilter/vf_drawbox.c +++ b/libavfilter/vf_drawbox.c @@ -208,6 +208,12 @@ fail: return ret; } +static av_pure av_always_inline int pixel_belongs_to_box(DrawBoxContext *s, int x, int y) +{ + return (y - s->y < s->thickness) || (s->y + s->h - 1 - y < s->thickness) || + (x - s->x < s->thickness) || (s->x + s->w - 1 - x < s->thickness); +} + static int filter_frame(AVFilterLink *inlink, AVFrame *frame) { DrawBoxContext *s = inlink->dst->priv; @@ -225,13 +231,11 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) if (s->invert_color) { for (x = FFMAX(xb, 0); x < xb + s->w && x < frame->width; x++) - if ((y - yb < s->thickness) || (yb + s->h - 1 - y < s->thickness) || - (x - xb < s->thickness) || (xb + s->w - 1 - x < s->thickness)) + if (pixel_belongs_to_box(s, x, y)) row[0][x] = 0xff - row[0][x]; } else { for (x = FFMAX(xb, 0); x < xb + s->w && x < frame->width; x++) { - if ((y - yb < s->thickness) || (yb + s->h - 1 - y < s->thickness) || - (x - xb < s->thickness) || (xb + s->w - 1 - x < s->thickness)) { + if (pixel_belongs_to_box(s, x, y)) { row[0][x ] = s->yuv_color[Y]; row[1][x >> s->hsub] = s->yuv_color[U]; row[2][x >> s->hsub] = s->yuv_color[V]; @@ -250,15 +254,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) if (s->invert_color) { for (x = FFMAX(xb, 0); x < xb + s->w && x < frame->width; x++) - if ((y - yb < s->thickness) || (yb + s->h - 1 - y < s->thickness) || - (x - xb < s->thickness) || (xb + s->w - 1 - x < s->thickness)) + if (pixel_belongs_to_box(s, x, y)) row[0][x] = 0xff - row[0][x]; } else { for (x = FFMAX(xb, 0); x < xb + s->w && x < frame->width; x++) { double alpha = (double)s->yuv_color[A] / 255; - if ((y - yb < s->thickness) || (yb + s->h - 1 - y < s->thickness) || - (x - xb < s->thickness) || (xb + s->w - 1 - x < s->thickness)) { + if (pixel_belongs_to_box(s, x, y)) { row[0][x ] = (1 - alpha) * row[0][x ] + alpha * s->yuv_color[Y]; row[1][x >> s->hsub] = (1 - alpha) * row[1][x >> s->hsub] + alpha * s->yuv_color[U]; row[2][x >> s->hsub] = (1 - alpha) * row[2][x >> s->hsub] + alpha * s->yuv_color[V];

1 0

lavf/avio: Print https warning also for avio_find_protocol_name().
by Carl Eugen Hoyos 01 Oct '19

01 Oct '19

ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg(a)gmail.com> | Wed Sep 25 11:32:57 2019 +0200| [a650e8c8e957d81959282d9b6c1f20e87f385031] | committer: Carl Eugen Hoyos lavf/avio: Print https warning also for avio_find_protocol_name(). Helps to fix ticket #8197. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a650e8c8e957d8195… --- libavformat/avio.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index 663789ec02..c1bad312cd 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -283,6 +283,9 @@ static const struct URLProtocol *url_find_protocol(const char *filename) } } av_freep(&protocols); + if (av_strstart(filename, "https:", NULL) || av_strstart(filename, "tls:", NULL)) + av_log(NULL, AV_LOG_WARNING, "https protocol not found, recompile FFmpeg with " + "openssl, gnutls or securetransport enabled.\n"); return NULL; } @@ -297,10 +300,6 @@ int ffurl_alloc(URLContext **puc, const char *filename, int flags, return url_alloc_for_protocol(puc, p, filename, flags, int_cb); *puc = NULL; - if (av_strstart(filename, "https:", NULL) || av_strstart(filename, "tls:", NULL)) - av_log(NULL, AV_LOG_WARNING, "https protocol not found, recompile FFmpeg with " - "openssl, gnutls " - "or securetransport enabled.\n"); return AVERROR_PROTOCOL_NOT_FOUND; }

1 0

avfilter/f_streamselect: add check case when nothing is done
by Paul B Mahol 01 Oct '19

01 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Oct 1 18:46:20 2019 +0200| [3bb170e530e3f9885d68e5c684fa82346d7158f4] | committer: Paul B Mahol avfilter/f_streamselect: add check case when nothing is done Fixes #7955. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3bb170e530e3f9885… --- libavfilter/f_streamselect.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavfilter/f_streamselect.c b/libavfilter/f_streamselect.c index 923deb1a85..4b913d37f4 100644 --- a/libavfilter/f_streamselect.c +++ b/libavfilter/f_streamselect.c @@ -21,6 +21,7 @@ #include "libavutil/opt.h" #include "avfilter.h" #include "audio.h" +#include "filters.h" #include "formats.h" #include "framesync.h" #include "internal.h" @@ -53,7 +54,7 @@ static int process_frame(FFFrameSync *fs) AVFilterContext *ctx = fs->parent; StreamSelectContext *s = fs->opaque; AVFrame **in = s->frames; - int i, j, ret = 0; + int i, j, ret = 0, have_out = 0; for (i = 0; i < ctx->nb_inputs; i++) { if ((ret = ff_framesync_get_frame(&s->fs, i, &in[i], 0)) < 0) @@ -75,12 +76,15 @@ static int process_frame(FFFrameSync *fs) out->pts = av_rescale_q(s->fs.pts, s->fs.time_base, ctx->outputs[i]->time_base); s->last_pts[j] = in[j]->pts; ret = ff_filter_frame(ctx->outputs[i], out); + have_out = 1; if (ret < 0) return ret; } } } + if (!have_out) + ff_filter_set_ready(ctx, 100); return ret; }

1 0

avfilter/vsink_nullsink: cosmetics
by Paul B Mahol 01 Oct '19

01 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Oct 1 14:57:41 2019 +0200| [f66458cfc757f394bf83c2c8532176f73cb30056] | committer: Paul B Mahol avfilter/vsink_nullsink: cosmetics > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f66458cfc757f394b… --- libavfilter/vsink_nullsink.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavfilter/vsink_nullsink.c b/libavfilter/vsink_nullsink.c index 281721bc55..060a5a371f 100644 --- a/libavfilter/vsink_nullsink.c +++ b/libavfilter/vsink_nullsink.c @@ -38,9 +38,7 @@ static const AVFilterPad avfilter_vsink_nullsink_inputs[] = { AVFilter ff_vsink_nullsink = { .name = "nullsink", .description = NULL_IF_CONFIG_SMALL("Do absolutely nothing with the input video."), - - .priv_size = 0, - - .inputs = avfilter_vsink_nullsink_inputs, - .outputs = NULL, + .priv_size = 0, + .inputs = avfilter_vsink_nullsink_inputs, + .outputs = NULL, };

1 0

avfilter/copy: add forgotten check
by Paul B Mahol 01 Oct '19

01 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Oct 1 14:55:43 2019 +0200| [94b155e49bdefcfe3117759e55bb1d40e655eb9e] | committer: Paul B Mahol avfilter/copy: add forgotten check > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=94b155e49bdefcfe3… --- libavfilter/af_acopy.c | 4 +++- libavfilter/vf_copy.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libavfilter/af_acopy.c b/libavfilter/af_acopy.c index a7caec6ae9..2d915019db 100644 --- a/libavfilter/af_acopy.c +++ b/libavfilter/af_acopy.c @@ -26,8 +26,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) AVFrame *out = ff_get_audio_buffer(outlink, in->nb_samples); int ret; - if (!out) + if (!out) { ret = AVERROR(ENOMEM); + goto fail; + } ret = av_frame_copy_props(out, in); if (ret < 0) diff --git a/libavfilter/vf_copy.c b/libavfilter/vf_copy.c index a59e024e87..e82feb4f0e 100644 --- a/libavfilter/vf_copy.c +++ b/libavfilter/vf_copy.c @@ -50,8 +50,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) AVFrame *out = ff_get_video_buffer(outlink, in->width, in->height); int ret; - if (!out) + if (!out) { ret = AVERROR(ENOMEM); + goto fail; + } ret = av_frame_copy_props(out, in); if (ret < 0)

1 0

avfilter/asink_anullsink: cosmetics
by Paul B Mahol 01 Oct '19

01 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Oct 1 14:38:58 2019 +0200| [9cee8975c3fe49c22ce450863d195a462e2be06a] | committer: Paul B Mahol avfilter/asink_anullsink: cosmetics > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9cee8975c3fe49c22… --- libavfilter/asink_anullsink.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavfilter/asink_anullsink.c b/libavfilter/asink_anullsink.c index 9b53d3fbc2..c10a348475 100644 --- a/libavfilter/asink_anullsink.c +++ b/libavfilter/asink_anullsink.c @@ -40,9 +40,7 @@ static const AVFilterPad avfilter_asink_anullsink_inputs[] = { AVFilter ff_asink_anullsink = { .name = "anullsink", .description = NULL_IF_CONFIG_SMALL("Do absolutely nothing with the input audio."), - - .priv_size = 0, - - .inputs = avfilter_asink_anullsink_inputs, - .outputs = NULL, + .priv_size = 0, + .inputs = avfilter_asink_anullsink_inputs, + .outputs = NULL, };

1 0

avfilter/vf_copy: check for error cases and handle them
by Paul B Mahol 01 Oct '19

01 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Oct 1 13:45:29 2019 +0200| [a9500441a71805da13389d4a56188c90f6bc013e] | committer: Paul B Mahol avfilter/vf_copy: check for error cases and handle them > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a9500441a71805da1… --- libavfilter/vf_copy.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/libavfilter/vf_copy.c b/libavfilter/vf_copy.c index b0159cff00..a59e024e87 100644 --- a/libavfilter/vf_copy.c +++ b/libavfilter/vf_copy.c @@ -48,15 +48,23 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) { AVFilterLink *outlink = inlink->dst->outputs[0]; AVFrame *out = ff_get_video_buffer(outlink, in->width, in->height); + int ret; - if (!out) { - av_frame_free(&in); - return AVERROR(ENOMEM); - } - av_frame_copy_props(out, in); - av_frame_copy(out, in); + if (!out) + ret = AVERROR(ENOMEM); + + ret = av_frame_copy_props(out, in); + if (ret < 0) + goto fail; + ret = av_frame_copy(out, in); + if (ret < 0) + goto fail; av_frame_free(&in); return ff_filter_frame(outlink, out); +fail: + av_frame_free(&in); + av_frame_free(&out); + return ret; } static const AVFilterPad avfilter_vf_copy_inputs[] = {

1 0

avfilter/af_acopy: check for error cases and handle them
by Paul B Mahol 01 Oct '19

01 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Oct 1 13:42:18 2019 +0200| [c9473229c9ecffaedbeb3a1d9fe3dbf2d8aee054] | committer: Paul B Mahol avfilter/af_acopy: check for error cases and handle them > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c9473229c9ecffaed… --- libavfilter/af_acopy.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/libavfilter/af_acopy.c b/libavfilter/af_acopy.c index d849060966..a7caec6ae9 100644 --- a/libavfilter/af_acopy.c +++ b/libavfilter/af_acopy.c @@ -24,15 +24,23 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) { AVFilterLink *outlink = inlink->dst->outputs[0]; AVFrame *out = ff_get_audio_buffer(outlink, in->nb_samples); + int ret; - if (!out) { - av_frame_free(&in); - return AVERROR(ENOMEM); - } - av_frame_copy_props(out, in); - av_frame_copy(out, in); + if (!out) + ret = AVERROR(ENOMEM); + + ret = av_frame_copy_props(out, in); + if (ret < 0) + goto fail; + ret = av_frame_copy(out, in); + if (ret < 0) + goto fail; av_frame_free(&in); return ff_filter_frame(outlink, out); +fail: + av_frame_free(&in); + av_frame_free(&out); + return ret; } static const AVFilterPad acopy_inputs[] = {

1 0

avfilter/vf_showpalette: fix small cosmetics issue
by Paul B Mahol 01 Oct '19

01 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Oct 1 13:24:35 2019 +0200| [835fdf48e59b57c81a634ecf8575bce5f1606572] | committer: Paul B Mahol avfilter/vf_showpalette: fix small cosmetics issue > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=835fdf48e59b57c81… --- libavfilter/vf_showpalette.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_showpalette.c b/libavfilter/vf_showpalette.c index d886ab87a7..25904a88f4 100644 --- a/libavfilter/vf_showpalette.c +++ b/libavfilter/vf_showpalette.c @@ -96,7 +96,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) int ret; AVFrame *out; AVFilterContext *ctx = inlink->dst; - const ShowPaletteContext *s= ctx->priv; + const ShowPaletteContext *s = ctx->priv; AVFilterLink *outlink = ctx->outputs[0]; out = ff_get_video_buffer(outlink, outlink->w, outlink->h);

1 0

avfilter/vf_alphamere: use the name 's' for the pointer to the private context
by Paul B Mahol 01 Oct '19

01 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Oct 1 13:17:43 2019 +0200| [5868e7f562fc49ebe8067392325b10a815e653fb] | committer: Paul B Mahol avfilter/vf_alphamere: use the name 's' for the pointer to the private context This is shorter and consistent across filters. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5868e7f562fc49ebe… --- libavfilter/vf_alphamerge.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavfilter/vf_alphamerge.c b/libavfilter/vf_alphamerge.c index c5602b6227..eb5a4d6e78 100644 --- a/libavfilter/vf_alphamerge.c +++ b/libavfilter/vf_alphamerge.c @@ -77,9 +77,9 @@ fail: static int config_input_main(AVFilterLink *inlink) { - AlphaMergeContext *merge = inlink->dst->priv; - merge->is_packed_rgb = - ff_fill_rgba_map(merge->rgba_map, inlink->format) >= 0 && + AlphaMergeContext *s = inlink->dst->priv; + s->is_packed_rgb = + ff_fill_rgba_map(s->rgba_map, inlink->format) >= 0 && inlink->format != AV_PIX_FMT_GBRAP; return 0; } @@ -109,15 +109,15 @@ static void draw_frame(AVFilterContext *ctx, AVFrame *main_buf, AVFrame *alpha_buf) { - AlphaMergeContext *merge = ctx->priv; + AlphaMergeContext *s = ctx->priv; int h = main_buf->height; - if (merge->is_packed_rgb) { + if (s->is_packed_rgb) { int x, y; uint8_t *pin, *pout; for (y = 0; y < h; y++) { pin = alpha_buf->data[0] + y * alpha_buf->linesize[0]; - pout = main_buf->data[0] + y * main_buf->linesize[0] + merge->rgba_map[A]; + pout = main_buf->data[0] + y * main_buf->linesize[0] + s->rgba_map[A]; for (x = 0; x < main_buf->width; x++) { *pout = *pin; pin += 1;

1 0