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

avfilter/af_amix: fix filtering if specified weights are negative
by Paul B Mahol 03 Oct '19

03 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Oct 3 10:27:56 2019 +0200| [d492907e7817b9ba00c01476e61bf5fb7fae5f6a] | committer: Paul B Mahol avfilter/af_amix: fix filtering if specified weights are negative > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d492907e7817b9ba0… --- libavfilter/af_amix.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c index ec2556f920..89a1b0568f 100644 --- a/libavfilter/af_amix.c +++ b/libavfilter/af_amix.c @@ -212,21 +212,21 @@ static void calculate_scales(MixContext *s, int nb_samples) for (i = 0; i < s->nb_inputs; i++) if (s->input_state[i] & INPUT_ON) - weight_sum += s->weights[i]; + weight_sum += FFABS(s->weights[i]); for (i = 0; i < s->nb_inputs; i++) { if (s->input_state[i] & INPUT_ON) { - if (s->scale_norm[i] > weight_sum / s->weights[i]) { - s->scale_norm[i] -= ((s->weight_sum / s->weights[i]) / s->nb_inputs) * + if (s->scale_norm[i] > weight_sum / FFABS(s->weights[i])) { + s->scale_norm[i] -= ((s->weight_sum / FFABS(s->weights[i])) / s->nb_inputs) * nb_samples / (s->dropout_transition * s->sample_rate); - s->scale_norm[i] = FFMAX(s->scale_norm[i], weight_sum / s->weights[i]); + s->scale_norm[i] = FFMAX(s->scale_norm[i], weight_sum / FFABS(s->weights[i])); } } } for (i = 0; i < s->nb_inputs; i++) { if (s->input_state[i] & INPUT_ON) - s->input_scale[i] = 1.0f / s->scale_norm[i]; + s->input_scale[i] = 1.0f / s->scale_norm[i] * FFSIGN(s->weights[i]); else s->input_scale[i] = 0.0f; } @@ -270,7 +270,7 @@ static int config_output(AVFilterLink *outlink) if (!s->input_scale || !s->scale_norm) return AVERROR(ENOMEM); for (i = 0; i < s->nb_inputs; i++) - s->scale_norm[i] = s->weight_sum / s->weights[i]; + s->scale_norm[i] = s->weight_sum / FFABS(s->weights[i]); calculate_scales(s, 0); av_get_channel_layout_string(buf, sizeof(buf), -1, outlink->channel_layout); @@ -540,12 +540,12 @@ static av_cold int init(AVFilterContext *ctx) p = NULL; sscanf(arg, "%f", &last_weight); s->weights[i] = last_weight; - s->weight_sum += last_weight; + s->weight_sum += FFABS(last_weight); } for (; i < s->nb_inputs; i++) { s->weights[i] = last_weight; - s->weight_sum += last_weight; + s->weight_sum += FFABS(last_weight); } return 0;

1 0

avfilter/setpts: switch to activate
by Paul B Mahol 02 Oct '19

02 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Mon Sep 30 13:53:59 2019 +0200| [2a546fb7d5722c306dd42c715137e5e493b0d5be] | committer: Paul B Mahol avfilter/setpts: switch to activate Also properly handle EOF timestamps. Fixes #6833. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2a546fb7d5722c306… --- libavfilter/setpts.c | 80 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 61 insertions(+), 19 deletions(-) diff --git a/libavfilter/setpts.c b/libavfilter/setpts.c index 800ba6a83f..c7c3836274 100644 --- a/libavfilter/setpts.c +++ b/libavfilter/setpts.c @@ -33,6 +33,7 @@ #include "libavutil/time.h" #include "audio.h" #include "avfilter.h" +#include "filters.h" #include "internal.h" #include "video.h" @@ -154,6 +155,28 @@ static inline char *double2int64str(char *buf, double v) return buf; } +static double eval_pts(SetPTSContext *setpts, AVFilterLink *inlink, AVFrame *frame, int64_t pts) +{ + if (isnan(setpts->var_values[VAR_STARTPTS])) { + setpts->var_values[VAR_STARTPTS] = TS2D(pts); + setpts->var_values[VAR_STARTT ] = TS2T(pts, inlink->time_base); + } + setpts->var_values[VAR_PTS ] = TS2D(pts); + setpts->var_values[VAR_T ] = TS2T(pts, inlink->time_base); + setpts->var_values[VAR_POS ] = !frame || frame->pkt_pos == -1 ? NAN : frame->pkt_pos; + setpts->var_values[VAR_RTCTIME ] = av_gettime(); + + if (frame) { + if (inlink->type == AVMEDIA_TYPE_VIDEO) { + setpts->var_values[VAR_INTERLACED] = frame->interlaced_frame; + } else if (inlink->type == AVMEDIA_TYPE_AUDIO) { + setpts->var_values[VAR_S] = frame->nb_samples; + setpts->var_values[VAR_NB_SAMPLES] = frame->nb_samples; + } + } + + return av_expr_eval(setpts->expr, setpts->var_values, NULL); +} #define d2istr(v) double2int64str((char[BUF_SIZE]){0}, v) static int filter_frame(AVFilterLink *inlink, AVFrame *frame) @@ -162,23 +185,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) int64_t in_pts = frame->pts; double d; - if (isnan(setpts->var_values[VAR_STARTPTS])) { - setpts->var_values[VAR_STARTPTS] = TS2D(frame->pts); - setpts->var_values[VAR_STARTT ] = TS2T(frame->pts, inlink->time_base); - } - setpts->var_values[VAR_PTS ] = TS2D(frame->pts); - setpts->var_values[VAR_T ] = TS2T(frame->pts, inlink->time_base); - setpts->var_values[VAR_POS ] = frame->pkt_pos == -1 ? NAN : frame->pkt_pos; - setpts->var_values[VAR_RTCTIME ] = av_gettime(); - - if (inlink->type == AVMEDIA_TYPE_VIDEO) { - setpts->var_values[VAR_INTERLACED] = frame->interlaced_frame; - } else if (inlink->type == AVMEDIA_TYPE_AUDIO) { - setpts->var_values[VAR_S] = frame->nb_samples; - setpts->var_values[VAR_NB_SAMPLES] = frame->nb_samples; - } - - d = av_expr_eval(setpts->expr, setpts->var_values, NULL); + d = eval_pts(setpts, inlink, frame, frame->pts); frame->pts = D2TS(d); av_log(inlink->dst, AV_LOG_TRACE, @@ -216,6 +223,41 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) return ff_filter_frame(inlink->dst->outputs[0], frame); } +static int activate(AVFilterContext *ctx) +{ + SetPTSContext *setpts = ctx->priv; + AVFilterLink *inlink = ctx->inputs[0]; + AVFilterLink *outlink = ctx->outputs[0]; + AVFrame *in; + int status; + int64_t pts; + int ret; + + FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); + + ret = ff_inlink_consume_frame(inlink, &in); + if (ret < 0) + return ret; + if (ret > 0) + return filter_frame(inlink, in); + + if (ff_inlink_acknowledge_status(inlink, &status, &pts)) { + double d = eval_pts(setpts, inlink, NULL, pts); + + av_log(ctx, AV_LOG_TRACE, "N:EOF PTS:%s T:%f POS:%s -> PTS:%s T:%f\n", + d2istr(setpts->var_values[VAR_PTS]), + setpts->var_values[VAR_T], + d2istr(setpts->var_values[VAR_POS]), + d2istr(d), TS2T(d, inlink->time_base)); + ff_outlink_set_status(outlink, status, D2TS(d)); + return 0; + } + + FF_FILTER_FORWARD_WANTED(outlink, inlink); + + return FFERROR_NOT_READY; +} + static av_cold void uninit(AVFilterContext *ctx) { SetPTSContext *setpts = ctx->priv; @@ -239,7 +281,6 @@ static const AVFilterPad avfilter_vf_setpts_inputs[] = { .name = "default", .type = AVMEDIA_TYPE_VIDEO, .config_props = config_input, - .filter_frame = filter_frame, }, { NULL } }; @@ -256,6 +297,7 @@ AVFilter ff_vf_setpts = { .name = "setpts", .description = NULL_IF_CONFIG_SMALL("Set PTS for the output video frame."), .init = init, + .activate = activate, .uninit = uninit, .priv_size = sizeof(SetPTSContext), @@ -276,7 +318,6 @@ static const AVFilterPad asetpts_inputs[] = { .name = "default", .type = AVMEDIA_TYPE_AUDIO, .config_props = config_input, - .filter_frame = filter_frame, }, { NULL } }; @@ -293,6 +334,7 @@ AVFilter ff_af_asetpts = { .name = "asetpts", .description = NULL_IF_CONFIG_SMALL("Set PTS for the output audio frame."), .init = init, + .activate = activate, .uninit = uninit, .priv_size = sizeof(SetPTSContext), .priv_class = &asetpts_class,

1 0

avcodec/g2meet: Check for end of input in jpg_decode_block()
by Michael Niedermayer 02 Oct '19

02 Oct '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Sep 9 20:30:32 2019 +0200| [61dd2e07be7ca636e1d3d868f90dde1b10985f4c] | committer: Michael Niedermayer avcodec/g2meet: Check for end of input in jpg_decode_block() Fixes: Timeout (100sec -> 0.7sec) Fixes: 8668/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_G2M_fuzzer-5174143888130048 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61dd2e07be7ca636e… --- libavcodec/g2meet.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 19e1c130ce..731d29a5d4 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -244,6 +244,9 @@ static int jpg_decode_block(JPGContext *c, GetBitContext *gb, const int is_chroma = !!plane; const uint8_t *qmat = is_chroma ? chroma_quant : luma_quant; + if (get_bits_left(gb) < 1) + return AVERROR_INVALIDDATA; + c->bdsp.clear_block(block); dc = get_vlc2(gb, c->dc_vlc[is_chroma].table, 9, 3); if (dc < 0)

1 0

avcodec/g2meet: Check if adjusted pixel was on the stack
by Michael Niedermayer 02 Oct '19

02 Oct '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Sep 9 20:05:09 2019 +0200| [9c84c162e9f9f000ef47d4fcd07354805f38d455] | committer: Michael Niedermayer avcodec/g2meet: Check if adjusted pixel was on the stack This basically checks if a pixel that was coded with prediction and residual could have been stored using a previous case. This avoids basically a string of 0 symbols stored in less than 50 bytes to hit a O(n²) codepath. Fixes: Timeout (too slow to wait -> immediately) Fixes: 8668/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_G2M_fuzzer-4895946310680576 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9c84c162e9f9f000e… --- libavcodec/g2meet.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index a1dec8d823..19e1c130ce 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -854,6 +854,9 @@ static int epic_decode_tile(ePICContext *dc, uint8_t *out, int tile_height, uint32_t ref_pix = curr_row[x - 1]; if (!x || !epic_decode_from_cache(dc, ref_pix, &pix)) { pix = epic_decode_pixel_pred(dc, x, y, curr_row, above_row); + if (is_pixel_on_stack(dc, pix)) + return AVERROR_INVALIDDATA; + if (x) { int ret = epic_add_pixel_to_cache(&dc->hash, ref_pix,

1 0

avfilter/vf_elbg: stop leaking frame on error
by Paul B Mahol 02 Oct '19

02 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Oct 2 10:54:45 2019 +0200| [9847380f5f5a3850ecc9f32fa310a7e5e3f703f7] | committer: Paul B Mahol avfilter/vf_elbg: stop leaking frame on error > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9847380f5f5a3850e… --- libavfilter/vf_elbg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_elbg.c b/libavfilter/vf_elbg.c index 396af82f77..b59da9ec85 100644 --- a/libavfilter/vf_elbg.c +++ b/libavfilter/vf_elbg.c @@ -178,8 +178,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) AVFrame *out = ff_get_video_buffer(outlink, outlink->w, outlink->h); uint32_t *pal; - if (!out) + if (!out) { + av_frame_free(&frame); return AVERROR(ENOMEM); + } out->pts = frame->pts; av_frame_free(&frame); pal = (uint32_t *)out->data[1];

1 0

avformat/electronicarts: If no packet has been read at the end do not treat it as if theres a packet
by Michael Niedermayer 01 Oct '19

01 Oct '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Sep 30 23:42:41 2019 +0200| [c4de49edc4652e2f17c8747a6dd9b36ff362017a] | committer: Michael Niedermayer avformat/electronicarts: If no packet has been read at the end do not treat it as if theres a packet Fixes: Assertion failure Fixes: 17770/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5700606668308480 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Peter Ross <pross(a)xvid.org> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c4de49edc4652e2f1… --- libavformat/electronicarts.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c index 6dbc3e350a..c894663c29 100644 --- a/libavformat/electronicarts.c +++ b/libavformat/electronicarts.c @@ -574,11 +574,12 @@ static int ea_read_packet(AVFormatContext *s, AVPacket *pkt) EaDemuxContext *ea = s->priv_data; AVIOContext *pb = s->pb; int partial_packet = 0; + int hit_end = 0; unsigned int chunk_type, chunk_size; int ret = 0, packet_read = 0, key = 0; int av_uninit(num_samples); - while (!packet_read || partial_packet) { + while ((!packet_read && !hit_end) || partial_packet) { chunk_type = avio_rl32(pb); chunk_size = ea->big_endian ? avio_rb32(pb) : avio_rl32(pb); if (chunk_size < 8) @@ -676,7 +677,7 @@ static int ea_read_packet(AVFormatContext *s, AVPacket *pkt) } if (avio_feof(pb)) ret = AVERROR_EOF; - packet_read = 1; + hit_end = 1; break; case MVIh_TAG: @@ -737,6 +738,9 @@ get_video_packet: if (ret < 0 && partial_packet) av_packet_unref(pkt); + if (ret >= 0 && hit_end && !packet_read) + return AVERROR(EAGAIN); + return ret; }

1 0

lavc/x264: Use FF_CODEC_CAP_INIT_THREADSAFE if x264 is new.
by Carl Eugen Hoyos 01 Oct '19

01 Oct '19

ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg(a)gmail.com> | Sun Aug 25 16:12:28 2019 +0200| [87b7e141a6fda7f450aff4560b776d546af313ed] | committer: Carl Eugen Hoyos lavc/x264: Use FF_CODEC_CAP_INIT_THREADSAFE if x264 is new. Usage of strtok() was removed from x264, see also b02490a4 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=87b7e141a6fda7f45… --- libavcodec/libx264.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 8788286fae..bfd91bb900 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -1180,7 +1180,11 @@ AVCodec ff_libx264_encoder = { .priv_class = &x264_class, .defaults = x264_defaults, .init_static_data = X264_init_static, +#if X264_BUILD >= 158 + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_INIT_THREADSAFE, +#else .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, +#endif .wrapper_name = "libx264", }; #endif @@ -1207,7 +1211,11 @@ AVCodec ff_libx264rgb_encoder = { .priv_class = &rgbclass, .defaults = x264_defaults, .pix_fmts = pix_fmts_8bit_rgb, +#if X264_BUILD >= 158 + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_INIT_THREADSAFE, +#else .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, +#endif .wrapper_name = "libx264", }; #endif

1 0

lavfi/movie: Use filter thread count for decoding threads.
by Carl Eugen Hoyos 01 Oct '19

01 Oct '19

ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg(a)gmail.com> | Sun Aug 25 18:42:02 2019 +0200| [7ffa458d600eccbd2582d755af75c03bdaa9e51f] | committer: Carl Eugen Hoyos lavfi/movie: Use filter thread count for decoding threads. Fixes ticket #7542. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7ffa458d600eccbd2… --- libavfilter/src_movie.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index bcabfcc4c2..79423a894d 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -153,14 +153,14 @@ static AVStream *find_stream(void *log, AVFormatContext *avf, const char *spec) return found; } -static int open_stream(void *log, MovieStream *st) +static int open_stream(AVFilterContext *ctx, MovieStream *st) { AVCodec *codec; int ret; codec = avcodec_find_decoder(st->st->codecpar->codec_id); if (!codec) { - av_log(log, AV_LOG_ERROR, "Failed to find any codec\n"); + av_log(ctx, AV_LOG_ERROR, "Failed to find any codec\n"); return AVERROR(EINVAL); } @@ -173,9 +173,10 @@ static int open_stream(void *log, MovieStream *st) return ret; st->codec_ctx->refcounted_frames = 1; + st->codec_ctx->thread_count = ff_filter_get_nb_threads(ctx); if ((ret = avcodec_open2(st->codec_ctx, codec, NULL)) < 0) { - av_log(log, AV_LOG_ERROR, "Failed to open codec\n"); + av_log(ctx, AV_LOG_ERROR, "Failed to open codec\n"); return ret; }

1 0

cmdutils: trailing options may be ignored
by Lou Logan 01 Oct '19

01 Oct '19

ffmpeg | branch: master | Lou Logan <lou(a)lrcd.com> | Fri Sep 27 12:19:24 2019 -0800| [61b7676bd5a6ae79e4a607a600d3741c84ec6d8a] | committer: Lou Logan cmdutils: trailing options may be ignored Signed-off-by: Lou Logan <lou(a)lrcd.com> Signed-off-by: mypopy <mypopy(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61b7676bd5a6ae79e… --- fftools/cmdutils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 6f4031fbb9..84f98b7c04 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -848,8 +848,8 @@ do { \ } if (octx->cur_group.nb_opts || codec_opts || format_opts || resample_opts) - av_log(NULL, AV_LOG_WARNING, "Trailing options were found on the " - "commandline.\n"); + av_log(NULL, AV_LOG_WARNING, "Trailing option(s) found in the " + "command: may be ignored.\n"); av_log(NULL, AV_LOG_DEBUG, "Finished splitting the commandline.\n");

1 0

avfilter/vf_drawbox: implement process_command
by Paul B Mahol 01 Oct '19

01 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Oct 1 20:17:50 2019 +0200| [1b2ed0c392f12ae836ea3b8ae87a8e29ad6e967c] | committer: Paul B Mahol avfilter/vf_drawbox: implement process_command > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1b2ed0c392f12ae83… --- doc/filters.texi | 14 ++++++++++++++ libavfilter/vf_drawbox.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/doc/filters.texi b/doc/filters.texi index b00787d2e8..e46839bfec 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -8847,6 +8847,13 @@ drawbox=x=-t:y=0.5*(ih-iw/2.4)-t:w=iw+t*2:h=iw/2.4+t*2:t=2:c=red @end example @end itemize +@subsection Commands +This filter supports same commands as options. +The command accepts the same syntax of the corresponding option. + +If the specified expression is not valid, it is kept at its current +value. + @section drawgrid Draw a grid on the input image. @@ -8932,6 +8939,13 @@ drawgrid=w=iw/3:h=ih/3:t=2:c=white@@0.5 @end example @end itemize +@subsection Commands +This filter supports same commands as options. +The command accepts the same syntax of the corresponding option. + +If the specified expression is not valid, it is kept at its current +value. + @anchor{drawtext} @section drawtext diff --git a/libavfilter/vf_drawbox.c b/libavfilter/vf_drawbox.c index 91bfeb2414..e5f5351b9d 100644 --- a/libavfilter/vf_drawbox.c +++ b/libavfilter/vf_drawbox.c @@ -273,6 +273,46 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) return ff_filter_frame(inlink->dst->outputs[0], frame); } +static int process_command(AVFilterContext *ctx, const char *cmd, const char *args, char *res, int res_len, int flags) +{ + DrawBoxContext *s = ctx->priv; + int ret; + + if ( !strcmp(cmd, "w") || !strcmp(cmd, "width") + || !strcmp(cmd, "h") || !strcmp(cmd, "height") + || !strcmp(cmd, "x") || !strcmp(cmd, "y") + || !strcmp(cmd, "t") || !strcmp(cmd, "thickness") + || !strcmp(cmd, "c") || !strcmp(cmd, "color") + || !strcmp(cmd, "replace")) { + + int old_x = s->x; + int old_y = s->y; + int old_w = s->w; + int old_h = s->h; + int old_t = s->thickness; + int old_r = s->replace; + + AVFilterLink *inlink = ctx->inputs[0]; + + av_opt_set(s, cmd, args, 0); + init(ctx); + + if ((ret = config_input(inlink)) < 0) { + s->x = old_x; + s->y = old_y; + s->w = old_w; + s->h = old_h; + s->thickness = old_t; + s->replace = old_r; + return ret; + } + } else { + ret = AVERROR(ENOSYS); + } + + return ret; +} + #define OFFSET(x) offsetof(DrawBoxContext, x) #define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM @@ -323,6 +363,7 @@ AVFilter ff_vf_drawbox = { .query_formats = query_formats, .inputs = drawbox_inputs, .outputs = drawbox_outputs, + .process_command = process_command, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, }; #endif /* CONFIG_DRAWBOX_FILTER */ @@ -457,6 +498,7 @@ AVFilter ff_vf_drawgrid = { .inputs = drawgrid_inputs, .outputs = drawgrid_outputs, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, + .process_command = process_command, }; #endif /* CONFIG_DRAWGRID_FILTER */

1 0