January 2020 - ffmpeg-cvslog - lists.ffmpeg.org

avformat/hlsenc: fix hls_ts_options with mpegts
by Marton Balint 31 Jan '20

31 Jan '20

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Mon Dec 23 01:27:38 2019 +0100| [73aab08d9d4d32c4b1378a39440454548fcf0f87] | committer: Marton Balint avformat/hlsenc: fix hls_ts_options with mpegts Was broken since cdbf8847ea97a985dfd55432e1384bb7fe5d2d3b. Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=73aab08d9d4d32c4b… --- libavformat/hlsenc.c | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 2b3d3742d9..87b861d437 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -764,6 +764,7 @@ static int hls_mux_init(AVFormatContext *s, VariantStream *vs) AVFormatContext *oc; AVFormatContext *vtt_oc = NULL; int byterange_mode = (hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size > 0); + int remaining_options; int i, ret; ret = avformat_alloc_output_context2(&vs->avf, vs->oformat, NULL, NULL); @@ -852,21 +853,25 @@ static int hls_mux_init(AVFormatContext *s, VariantStream *vs) return ret; } + av_dict_copy(&options, hls->format_options, 0); if (hls->segment_type == SEGMENT_TYPE_FMP4) { - int remaining_options; - - av_dict_copy(&options, hls->format_options, 0); av_dict_set(&options, "fflags", "-autobsf", 0); av_dict_set(&options, "movflags", "+frag_custom+dash+delay_moov", AV_DICT_APPEND); - ret = avformat_init_output(oc, &options); - remaining_options = av_dict_count(options); - av_dict_free(&options); - if (ret < 0) - return ret; - if (remaining_options) { - av_log(s, AV_LOG_ERROR, "Some of the provided format options are not recognized\n"); - return AVERROR(EINVAL); - } + } else { + /* We only require one PAT/PMT per segment. */ + char period[21]; + snprintf(period, sizeof(period), "%d", (INT_MAX / 2) - 1); + av_dict_set(&options, "sdt_period", period, 0); + av_dict_set(&options, "pat_period", period, 0); + } + ret = avformat_init_output(oc, &options); + remaining_options = av_dict_count(options); + av_dict_free(&options); + if (ret < 0) + return ret; + if (remaining_options) { + av_log(s, AV_LOG_ERROR, "Some of the provided format options are not recognized\n"); + return AVERROR(EINVAL); } avio_flush(oc->pb); return 0; @@ -1683,15 +1688,8 @@ static int hls_start(AVFormatContext *s, VariantStream *vs) } } if (c->segment_type != SEGMENT_TYPE_FMP4) { - /* We only require one PAT/PMT per segment. */ if (oc->oformat->priv_class && oc->priv_data) { - char period[21]; - - snprintf(period, sizeof(period), "%d", (INT_MAX / 2) - 1); - av_opt_set(oc->priv_data, "mpegts_flags", "resend_headers", 0); - av_opt_set(oc->priv_data, "sdt_period", period, 0); - av_opt_set(oc->priv_data, "pat_period", period, 0); } if (c->flags & HLS_SINGLE_FILE) { set_http_options(s, &options, c);

1 0

avfilter/vf_geq: use per-thread AVExpr for expression evaluation
by Marton Balint 31 Jan '20

31 Jan '20

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Sat Dec 28 14:50:12 2019 +0100| [c044ac2071fd1ba2b184a35427c98fc5338a9d27] | committer: Marton Balint avfilter/vf_geq: use per-thread AVExpr for expression evaluation There was no consensus about separating AVExprState from AVExpr so here is a minimal patch using the existing AVExpr to fix ticket #7528. Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c044ac2071fd1ba2b… --- doc/filters.texi | 5 +++++ libavfilter/vf_geq.c | 26 +++++++++++++++----------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index a3cc92200d..a2ef7d0113 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -11468,6 +11468,11 @@ Default is bilinear. For functions, if @var{x} and @var{y} are outside the area, the value will be automatically clipped to the closer edge. +Please note that this filter can use multiple threads in which case each slice +will have its own expression state. If you want to use only a single expression +state because your expressions depend on previous state then you should limit +the number of filter threads to 1. + @subsection Examples @itemize diff --git a/libavfilter/vf_geq.c b/libavfilter/vf_geq.c index 23c989b248..c6f76a6963 100644 --- a/libavfilter/vf_geq.c +++ b/libavfilter/vf_geq.c @@ -33,6 +33,7 @@ #include "libavutil/pixdesc.h" #include "internal.h" +#define MAX_NB_THREADS 32 #define NB_PLANES 4 enum InterpolationMethods { @@ -46,7 +47,7 @@ enum { VAR_X, VAR_Y, VAR_W, VAR_H, VAR_N, VAR_ typedef struct GEQContext { const AVClass *class; - AVExpr *e[NB_PLANES]; ///< expressions for each plane + AVExpr *e[NB_PLANES][MAX_NB_THREADS]; ///< expressions for each plane and thread char *expr_str[4+3]; ///< expression strings for each plane AVFrame *picref; ///< current input buffer uint8_t *dst; ///< reference pointer to the 8bits output @@ -288,12 +289,14 @@ static av_cold int geq_init(AVFilterContext *ctx) NULL }; int counter[10] = {0}; - ret = av_expr_parse(&geq->e[plane], geq->expr_str[plane < 3 && geq->is_rgb ? plane+4 : plane], var_names, - NULL, NULL, func2_names, func2, 0, ctx); - if (ret < 0) - break; + for (int i = 0; i < MAX_NB_THREADS; i++) { + ret = av_expr_parse(&geq->e[plane][i], geq->expr_str[plane < 3 && geq->is_rgb ? plane+4 : plane], var_names, + NULL, NULL, func2_names, func2, 0, ctx); + if (ret < 0) + goto end; + } - av_expr_count_func(geq->e[plane], counter, FF_ARRAY_ELEMS(counter), 2); + av_expr_count_func(geq->e[plane][0], counter, FF_ARRAY_ELEMS(counter), 2); geq->needs_sum[plane] = counter[5] + counter[6] + counter[7] + counter[8] + counter[9]; } @@ -391,7 +394,7 @@ static int slice_geq_filter(AVFilterContext *ctx, void *arg, int jobnr, int nb_j for (x = 0; x < width; x++) { values[VAR_X] = x; - ptr[x] = av_expr_eval(geq->e[plane], values, geq); + ptr[x] = av_expr_eval(geq->e[plane][jobnr], values, geq); } ptr += linesize; } @@ -401,7 +404,7 @@ static int slice_geq_filter(AVFilterContext *ctx, void *arg, int jobnr, int nb_j values[VAR_Y] = y; for (x = 0; x < width; x++) { values[VAR_X] = x; - ptr16[x] = av_expr_eval(geq->e[plane], values, geq); + ptr16[x] = av_expr_eval(geq->e[plane][jobnr], values, geq); } ptr16 += linesize/2; } @@ -414,7 +417,7 @@ static int geq_filter_frame(AVFilterLink *inlink, AVFrame *in) { int plane; AVFilterContext *ctx = inlink->dst; - const int nb_threads = ff_filter_get_nb_threads(ctx); + const int nb_threads = FFMIN(MAX_NB_THREADS, ff_filter_get_nb_threads(ctx)); GEQContext *geq = ctx->priv; AVFilterLink *outlink = inlink->dst->outputs[0]; AVFrame *out; @@ -464,8 +467,9 @@ static av_cold void geq_uninit(AVFilterContext *ctx) int i; GEQContext *geq = ctx->priv; - for (i = 0; i < FF_ARRAY_ELEMS(geq->e); i++) - av_expr_free(geq->e[i]); + for (i = 0; i < NB_PLANES; i++) + for (int j = 0; j < MAX_NB_THREADS; j++) + av_expr_free(geq->e[i][j]); for (i = 0; i < NB_PLANES; i++) av_freep(&geq->pixel_sums); }

1 0

avcodec/avdct: Clear IDCTDSPContext context
by Michael Niedermayer 31 Jan '20

31 Jan '20

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Jan 27 21:54:22 2020 +0100| [b82825eba837f7cbb24c1d66e93285d029307417] | committer: Michael Niedermayer avcodec/avdct: Clear IDCTDSPContext context Fixes use of uninitialized variable and segfault Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Reviewed-by: James Almer <jamrial(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b82825eba837f7cbb… --- libavcodec/avdct.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/avdct.c b/libavcodec/avdct.c index 47e5f7134e..7c761cf39a 100644 --- a/libavcodec/avdct.c +++ b/libavcodec/avdct.c @@ -100,7 +100,7 @@ int avcodec_dct_init(AVDCT *dsp) #if CONFIG_IDCTDSP { - IDCTDSPContext idsp; + IDCTDSPContext idsp = {0}; ff_idctdsp_init(&idsp, avctx); COPY(idsp, idct); COPY(idsp, idct_permutation);

1 0

MAINTAINERS: Add patchwork maintainer
by Michael Niedermayer 31 Jan '20

31 Jan '20

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Jan 27 21:54:21 2020 +0100| [c2d4762922fa67ab84a6bc81871efdfa9776dbd6] | committer: Michael Niedermayer MAINTAINERS: Add patchwork maintainer Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c2d4762922fa67ab8… --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index bd4ed499ac..dfa9439ab8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -53,6 +53,7 @@ Communication website Deby Barbara Lepage fate.ffmpeg.org Timothy Gu Trac bug tracker Alexander Strasser, Michael Niedermayer, Carl Eugen Hoyos +Patchwork Andriy Gelman mailing lists Baptiste Coudurier Google+ Paul B Mahol, Michael Niedermayer, Alexander Strasser Twitter Lou Logan, Reynaldo H. Verdejo Pinochet

1 0

dashenc: check pts to prevent division by zero error
by Alfred E. Heggestad 31 Jan '20

31 Jan '20

ffmpeg | branch: master | Alfred E. Heggestad <alfred.heggestad(a)gmail.com> | Thu Jan 30 10:58:01 2020 +0100| [d550a2856079dfbb600fd36f6baf5f136c743c98] | committer: James Almer dashenc: check pts to prevent division by zero error this usecase will cause a division by zero trap: 1. dashenc has received one frame 2. os->max_pts and os->start_pts have same value 3. delta between max_pts and start_pts is 0 4. av_rescale_q(0, x, y) returns 0 5. this value is used as denominator in division 6. Bang! -> segfault this fix checks that max_pts > start_pts. the fix has been tested and works. Signed-off-by: Alfred E. Heggestad <alfred.heggestad(a)gmail.com> Reviewed-by: Jeyapal, Karthick <kjeyapal(a)akamai.com> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d550a2856079dfbb6… --- libavformat/dashenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index f555f208a7..3b651b9514 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -1883,7 +1883,7 @@ static int dash_flush(AVFormatContext *s, int final, int stream) st->time_base, AV_TIME_BASE_Q)); - if (!os->muxer_overhead) + if (!os->muxer_overhead && os->max_pts > os->start_pts) os->muxer_overhead = ((int64_t) (range_length - os->total_pkt_size) * 8 * AV_TIME_BASE) / av_rescale_q(os->max_pts - os->start_pts,

1 0

avfilter/vf_xfade: add smooth transitions
by Paul B Mahol 31 Jan '20

31 Jan '20

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Jan 31 13:14:13 2020 +0100| [53b4128ea0271d725a1c556efee65ac04322d250] | committer: Paul B Mahol avfilter/vf_xfade: add smooth transitions > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=53b4128ea0271d725… --- doc/filters.texi | 4 ++ libavfilter/vf_xfade.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+) diff --git a/doc/filters.texi b/doc/filters.texi index 2c9486ae58..a3cc92200d 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -20065,6 +20065,10 @@ Set one of available transition effects: @item fadeblack @item fadewhite @item radial +@item smoothleft +@item smoothright +@item smoothup +@item smoothdown @end table Default transition effect is fade. diff --git a/libavfilter/vf_xfade.c b/libavfilter/vf_xfade.c index 7b8420c3f5..6ada72390f 100644 --- a/libavfilter/vf_xfade.c +++ b/libavfilter/vf_xfade.c @@ -46,6 +46,10 @@ enum XFadeTransitions { FADEBLACK, FADEWHITE, RADIAL, + SMOOTHLEFT, + SMOOTHRIGHT, + SMOOTHUP, + SMOOTHDOWN, NB_TRANSITIONS, }; @@ -143,6 +147,10 @@ static const AVOption xfade_options[] = { { "fadeblack", "fadeblack transition", 0, AV_OPT_TYPE_CONST, {.i64=FADEBLACK}, 0, 0, FLAGS, "transition" }, { "fadewhite", "fadewhite transition", 0, AV_OPT_TYPE_CONST, {.i64=FADEWHITE}, 0, 0, FLAGS, "transition" }, { "radial", "radial transition", 0, AV_OPT_TYPE_CONST, {.i64=RADIAL}, 0, 0, FLAGS, "transition" }, + { "smoothleft", "smoothleft transition", 0, AV_OPT_TYPE_CONST, {.i64=SMOOTHLEFT}, 0, 0, FLAGS, "transition" }, + { "smoothright","smoothright transition", 0, AV_OPT_TYPE_CONST, {.i64=SMOOTHRIGHT},0, 0, FLAGS, "transition" }, + { "smoothup", "smoothup transition", 0, AV_OPT_TYPE_CONST, {.i64=SMOOTHUP}, 0, 0, FLAGS, "transition" }, + { "smoothdown", "smoothdown transition", 0, AV_OPT_TYPE_CONST, {.i64=SMOOTHDOWN}, 0, 0, FLAGS, "transition" }, { "duration", "set cross fade duration", OFFSET(duration), AV_OPT_TYPE_DURATION, {.i64=1000000}, 0, 60000000, FLAGS }, { "offset", "set cross fade start relative to first input stream", OFFSET(offset), AV_OPT_TYPE_DURATION, {.i64=0}, INT64_MIN, INT64_MAX, FLAGS }, { "expr", "set expression for custom transition", OFFSET(custom_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS }, @@ -679,6 +687,116 @@ static void radial##name##_transition(AVFilterContext *ctx, RADIAL_TRANSITION(8, uint8_t, 1) RADIAL_TRANSITION(16, uint16_t, 2) +#define SMOOTHLEFT_TRANSITION(name, type, div) \ +static void smoothleft##name##_transition(AVFilterContext *ctx, \ + const AVFrame *a, const AVFrame *b, AVFrame *out, \ + float progress, \ + int slice_start, int slice_end, int jobnr) \ +{ \ + XFadeContext *s = ctx->priv; \ + const int width = out->width; \ + const float w = width; \ + \ + for (int y = slice_start; y < slice_end; y++) { \ + for (int x = 0; x < width; x++) { \ + const float smooth = 1.f + x / w - progress * 2.f; \ + \ + for (int p = 0; p < s->nb_planes; p++) { \ + const type *xf0 = (const type *)(a->data[p] + y * a->linesize[p]); \ + const type *xf1 = (const type *)(b->data[p] + y * b->linesize[p]); \ + type *dst = (type *)(out->data[p] + y * out->linesize[p]); \ + \ + dst[x] = mix(xf1[x], xf0[x], smoothstep(0.f, 1.f, smooth)); \ + } \ + } \ + } \ +} + +SMOOTHLEFT_TRANSITION(8, uint8_t, 1) +SMOOTHLEFT_TRANSITION(16, uint16_t, 2) + +#define SMOOTHRIGHT_TRANSITION(name, type, div) \ +static void smoothright##name##_transition(AVFilterContext *ctx, \ + const AVFrame *a, const AVFrame *b, AVFrame *out, \ + float progress, \ + int slice_start, int slice_end, int jobnr) \ +{ \ + XFadeContext *s = ctx->priv; \ + const int width = out->width; \ + const float w = width; \ + \ + for (int y = slice_start; y < slice_end; y++) { \ + for (int x = 0; x < width; x++) { \ + const float smooth = 1.f + (w - 1 - x) / w - progress * 2.f; \ + \ + for (int p = 0; p < s->nb_planes; p++) { \ + const type *xf0 = (const type *)(a->data[p] + y * a->linesize[p]); \ + const type *xf1 = (const type *)(b->data[p] + y * b->linesize[p]); \ + type *dst = (type *)(out->data[p] + y * out->linesize[p]); \ + \ + dst[x] = mix(xf1[x], xf0[x], smoothstep(0.f, 1.f, smooth)); \ + } \ + } \ + } \ +} + +SMOOTHRIGHT_TRANSITION(8, uint8_t, 1) +SMOOTHRIGHT_TRANSITION(16, uint16_t, 2) + +#define SMOOTHUP_TRANSITION(name, type, div) \ +static void smoothup##name##_transition(AVFilterContext *ctx, \ + const AVFrame *a, const AVFrame *b, AVFrame *out, \ + float progress, \ + int slice_start, int slice_end, int jobnr) \ +{ \ + XFadeContext *s = ctx->priv; \ + const int width = out->width; \ + const float h = out->height; \ + \ + for (int y = slice_start; y < slice_end; y++) { \ + const float smooth = 1.f + y / h - progress * 2.f; \ + for (int x = 0; x < width; x++) { \ + for (int p = 0; p < s->nb_planes; p++) { \ + const type *xf0 = (const type *)(a->data[p] + y * a->linesize[p]); \ + const type *xf1 = (const type *)(b->data[p] + y * b->linesize[p]); \ + type *dst = (type *)(out->data[p] + y * out->linesize[p]); \ + \ + dst[x] = mix(xf1[x], xf0[x], smoothstep(0.f, 1.f, smooth)); \ + } \ + } \ + } \ +} + +SMOOTHUP_TRANSITION(8, uint8_t, 1) +SMOOTHUP_TRANSITION(16, uint16_t, 2) + +#define SMOOTHDOWN_TRANSITION(name, type, div) \ +static void smoothdown##name##_transition(AVFilterContext *ctx, \ + const AVFrame *a, const AVFrame *b, AVFrame *out, \ + float progress, \ + int slice_start, int slice_end, int jobnr) \ +{ \ + XFadeContext *s = ctx->priv; \ + const int width = out->width; \ + const float h = out->height; \ + \ + for (int y = slice_start; y < slice_end; y++) { \ + const float smooth = 1.f + (h - 1 - y) / h - progress * 2.f; \ + for (int x = 0; x < width; x++) { \ + for (int p = 0; p < s->nb_planes; p++) { \ + const type *xf0 = (const type *)(a->data[p] + y * a->linesize[p]); \ + const type *xf1 = (const type *)(b->data[p] + y * b->linesize[p]); \ + type *dst = (type *)(out->data[p] + y * out->linesize[p]); \ + \ + dst[x] = mix(xf1[x], xf0[x], smoothstep(0.f, 1.f, smooth)); \ + } \ + } \ + } \ +} + +SMOOTHDOWN_TRANSITION(8, uint8_t, 1) +SMOOTHDOWN_TRANSITION(16, uint16_t, 2) + static inline double getpix(void *priv, double x, double y, int plane, int nb) { XFadeContext *s = priv; @@ -785,6 +903,10 @@ static int config_output(AVFilterLink *outlink) case FADEBLACK: s->transitionf = s->depth <= 8 ? fadeblack8_transition : fadeblack16_transition; break; case FADEWHITE: s->transitionf = s->depth <= 8 ? fadewhite8_transition : fadewhite16_transition; break; case RADIAL: s->transitionf = s->depth <= 8 ? radial8_transition : radial16_transition; break; + case SMOOTHLEFT: s->transitionf = s->depth <= 8 ? smoothleft8_transition : smoothleft16_transition; break; + case SMOOTHRIGHT:s->transitionf = s->depth <= 8 ? smoothright8_transition: smoothright16_transition;break; + case SMOOTHUP: s->transitionf = s->depth <= 8 ? smoothup8_transition : smoothup16_transition; break; + case SMOOTHDOWN: s->transitionf = s->depth <= 8 ? smoothdown8_transition : smoothdown16_transition; break; } if (s->transition == CUSTOM) {

1 0

doc/filters: improve xfade description and add one example
by Paul B Mahol 31 Jan '20

31 Jan '20

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Jan 31 10:17:05 2020 +0100| [113bae5985c08b243376237b563ed067d568b9c9] | committer: Paul B Mahol doc/filters: improve xfade description and add one example > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=113bae5985c08b243… --- doc/filters.texi | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 13403fd96c..2c9486ae58 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -20073,8 +20073,8 @@ Set cross fade duration in seconds. Default duration is 1 second. @item offset -Set cross fade start relative to first input stream. -Default offset it 0. +Set cross fade start relative to first input stream in seconds. +Default offset is 0. @item expr Set expression for custom transition effect. @@ -20118,6 +20118,17 @@ first/second/third/fourth component of second input. @end table @end table +@subsection Examples + +@itemize +@item +Cross fade from one input video to another input video, with fade transition and duration of transition +of 2 seconds starting at offset of 5 seconds: +@example +ffmpeg -i first.mp4 -i second.mp4 -filter_complex xfade=transition=fade:duration=2:offset=5 output.mp4 +@end example +@end itemize + @section xstack Stack video inputs into custom layout.

1 0

avfilter/vf_drawtext: do not overread text if the last UTF8 sequence is invalid
by Marton Balint 30 Jan '20

30 Jan '20

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Wed Jan 29 23:55:25 2020 +0100| [62d92a878d89e35695e839f40065f2e936032f89] | committer: Marton Balint avfilter/vf_drawtext: do not overread text if the last UTF8 sequence is invalid Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=62d92a878d89e3569… --- libavfilter/vf_drawtext.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index ed10175af0..b58556e0f1 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -1225,7 +1225,7 @@ static int draw_glyphs(DrawTextContext *s, AVFrame *frame, for (i = 0, p = text; *p; i++) { FT_Bitmap bitmap; Glyph dummy = { 0 }; - GET_UTF8(code, *p++, code = 0xfffd; goto continue_on_invalid;); + GET_UTF8(code, *p ? *p++ : 0, code = 0xfffd; goto continue_on_invalid;); continue_on_invalid: /* skip new line chars, just go to new line */ @@ -1364,7 +1364,7 @@ static int draw_text(AVFilterContext *ctx, AVFrame *frame, /* load and cache glyphs */ for (i = 0, p = text; *p; i++) { - GET_UTF8(code, *p++, code = 0xfffd; goto continue_on_invalid;); + GET_UTF8(code, *p ? *p++ : 0, code = 0xfffd; goto continue_on_invalid;); continue_on_invalid: /* get glyph */ @@ -1388,7 +1388,7 @@ continue_on_invalid: /* compute and save position for each glyph */ glyph = NULL; for (i = 0, p = text; *p; i++) { - GET_UTF8(code, *p++, code = 0xfffd; goto continue_on_invalid2;); + GET_UTF8(code, *p ? *p++ : 0, code = 0xfffd; goto continue_on_invalid2;); continue_on_invalid2: /* skip the \n in the sequence \r\n */

1 0

avfilter/vf_drawtext: use replacement chars for invalid UTF8 sequences
by Marton Balint 30 Jan '20

30 Jan '20

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Wed Jan 29 23:29:04 2020 +0100| [5ac8389cfa09e9fd42d076c714be30365a2a8557] | committer: Marton Balint avfilter/vf_drawtext: use replacement chars for invalid UTF8 sequences continue is explicitly disallowed for GET_UTF8, so let's fix that as well. Fixes crash with invalid UTF8 sequences. Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5ac8389cfa09e9fd4… --- libavfilter/vf_drawtext.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index aea17b6793..ed10175af0 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -1225,7 +1225,8 @@ static int draw_glyphs(DrawTextContext *s, AVFrame *frame, for (i = 0, p = text; *p; i++) { FT_Bitmap bitmap; Glyph dummy = { 0 }; - GET_UTF8(code, *p++, continue;); + GET_UTF8(code, *p++, code = 0xfffd; goto continue_on_invalid;); +continue_on_invalid: /* skip new line chars, just go to new line */ if (code == '\n' || code == '\r' || code == '\t') @@ -1363,7 +1364,8 @@ static int draw_text(AVFilterContext *ctx, AVFrame *frame, /* load and cache glyphs */ for (i = 0, p = text; *p; i++) { - GET_UTF8(code, *p++, continue;); + GET_UTF8(code, *p++, code = 0xfffd; goto continue_on_invalid;); +continue_on_invalid: /* get glyph */ dummy.code = code; @@ -1386,7 +1388,8 @@ static int draw_text(AVFilterContext *ctx, AVFrame *frame, /* compute and save position for each glyph */ glyph = NULL; for (i = 0, p = text; *p; i++) { - GET_UTF8(code, *p++, continue;); + GET_UTF8(code, *p++, code = 0xfffd; goto continue_on_invalid2;); +continue_on_invalid2: /* skip the \n in the sequence \r\n */ if (prev_code == '\r' && code == '\n')

1 0

avutil/common: warn about possible move of the data pointer after the last 0 byte in GET_UTF8
by Marton Balint 30 Jan '20

30 Jan '20

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Wed Jan 29 23:56:07 2020 +0100| [6026384047ab8e895d416aab4e2531bd87c0c01d] | committer: Marton Balint avutil/common: warn about possible move of the data pointer after the last 0 byte in GET_UTF8 Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6026384047ab8e895… --- libavutil/common.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavutil/common.h b/libavutil/common.h index e6f076a13c..142ff9abe7 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -373,7 +373,9 @@ static av_always_inline av_const int av_parity_c(uint32_t v) * @param GET_BYTE Expression reading one byte from the input. * Evaluated up to 7 times (4 for the currently * assigned Unicode range). With a memory buffer - * input, this could be *ptr++. + * input, this could be *ptr++, or if you want to make sure + * that *ptr stops at the end of a NULL terminated string then + * *ptr ? *ptr++ : 0 * @param ERROR Expression to be evaluated on invalid input, * typically a goto statement. *

1 0