November 2021 - ffmpeg-cvslog

avfilter/af_atilt: use ff_filter_execute()
by Limin Wang 11 Nov '21

11 Nov '21

ffmpeg | branch: master | Limin Wang <lance.lmwang(a)gmail.com> | Fri Nov 5 20:32:15 2021 +0800| [afcf226b337584f5028265b361d8a5a930696a31] | committer: Paul B Mahol avfilter/af_atilt: use ff_filter_execute() Signed-off-by: Limin Wang <lance.lmwang(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=afcf226b337584f50… --- libavfilter/af_atilt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/af_atilt.c b/libavfilter/af_atilt.c index a1ce030feb..a6f7782af5 100644 --- a/libavfilter/af_atilt.c +++ b/libavfilter/af_atilt.c @@ -196,7 +196,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) } td.in = in; td.out = out; - ctx->internal->execute(ctx, s->filter_channels, &td, NULL, FFMIN(inlink->channels, + ff_filter_execute(ctx, s->filter_channels, &td, NULL, FFMIN(inlink->channels, ff_filter_get_nb_threads(ctx))); if (out != in)

1 0

avutil/opt: handle whole range of int64_t in av_opt_get_int
by Zhao Zhili 11 Nov '21

11 Nov '21

ffmpeg | branch: master | Zhao Zhili <quinkblack(a)foxmail.com> | Wed Nov 10 23:36:15 2021 +0800| [9fd2b39428165c2319106e82a3c1ca1bba11aa54] | committer: Michael Niedermayer avutil/opt: handle whole range of int64_t in av_opt_get_int Make get_int/set_int symetric. The int64_t to double to int64_t conversion is unprecise for large value. Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9fd2b39428165c231… --- libavutil/opt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index c7001dbcd3..cfda31ea2f 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -920,7 +920,10 @@ int av_opt_get_int(void *obj, const char *name, int search_flags, int64_t *out_v if ((ret = get_number(obj, name, NULL, &num, &den, &intnum, search_flags)) < 0) return ret; - *out_val = num * intnum / den; + if (num == den) + *out_val = intnum; + else + *out_val = num * intnum / den; return 0; }

1 0

fftools/ffmpeg_opt: Fix copyinkf option name in warning message
by Andreas Rheinhardt 10 Nov '21

10 Nov '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon Nov 8 18:53:41 2021 +0100| [44c65c6cc0ba3a08834b7c4d83cb5f56321f914d] | committer: Andreas Rheinhardt fftools/ffmpeg_opt: Fix copyinkf option name in warning message Reviewed-by: Jan Ekström <jeebjp(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=44c65c6cc0ba3a088… --- fftools/ffmpeg_opt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 7aff43d917..ab4c63a362 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -79,7 +79,7 @@ static const char *const opt_name_inter_matrices[] = {"inter_matrix", static const char *const opt_name_chroma_intra_matrices[] = {"chroma_intra_matrix", NULL}; static const char *const opt_name_top_field_first[] = {"top", NULL}; static const char *const opt_name_presets[] = {"pre", "apre", "vpre", "spre", NULL}; -static const char *const opt_name_copy_initial_nonkeyframes[] = {"copyinkfr", NULL}; +static const char *const opt_name_copy_initial_nonkeyframes[] = {"copyinkf", NULL}; static const char *const opt_name_copy_prior_start[] = {"copypriorss", NULL}; static const char *const opt_name_filters[] = {"filter", "af", "vf", NULL}; static const char *const opt_name_filter_scripts[] = {"filter_script", NULL};

1 0

avformat/hls_sample_encryption: Fix precedence
by Andreas Rheinhardt 09 Nov '21

09 Nov '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sun Nov 7 08:35:08 2021 +0100| [945b2dcc631a891fcc8c911891fd6730a40b8248] | committer: Andreas Rheinhardt avformat/hls_sample_encryption: Fix precedence Fixes Coverity ticket #1492869. Reviewed-by: Steven Liu <lingjiujianke(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=945b2dcc631a891fc… --- libavformat/hls_sample_encryption.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hls_sample_encryption.c b/libavformat/hls_sample_encryption.c index 396fe97921..38795c7fb0 100644 --- a/libavformat/hls_sample_encryption.c +++ b/libavformat/hls_sample_encryption.c @@ -268,7 +268,7 @@ static int get_next_adts_frame(CodecParserContext *ctx, AudioFrame *frame) /* Find next sync word 0xFFF */ while (ctx->buf_ptr < ctx->buf_end - 1) { - if (*ctx->buf_ptr == 0xFF && *(ctx->buf_ptr + 1) & 0xF0 == 0xF0) + if (*ctx->buf_ptr == 0xFF && (*(ctx->buf_ptr + 1) & 0xF0) == 0xF0) break; ctx->buf_ptr++; }

1 0

avcodec/speexdec: Remove dead code
by Andreas Rheinhardt 09 Nov '21

09 Nov '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sun Nov 7 08:28:28 2021 +0100| [ddd701fbbf71a85711bbb1fc52f5de86cdca1261] | committer: Andreas Rheinhardt avcodec/speexdec: Remove dead code Fixes Coverity issue #1492840. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ddd701fbbf71a8571… --- libavcodec/speexdec.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c index 4c50f54f27..90e95f0785 100644 --- a/libavcodec/speexdec.c +++ b/libavcodec/speexdec.c @@ -1221,7 +1221,7 @@ static int sb_decode(AVCodecContext *avctx, void *ptr_st, float low_pi_gain[NB_NB_SUBFRAMES]; float low_exc_rms[NB_NB_SUBFRAMES]; float interp_qlsp[NB_ORDER]; - int ret, wideband, dtx = 0; + int ret, wideband; float *low_innov_alias; float qlsp[NB_ORDER]; float ak[NB_ORDER]; @@ -1254,11 +1254,6 @@ static int sb_decode(AVCodecContext *avctx, void *ptr_st, /* If null mode (no transmission), just set a couple things to zero */ if (st->submodes[st->submodeID] == NULL) { - if (dtx) { - //sb_decode_lost(st, out, 1); - return 0; - } - for (int i = 0; i < st->frame_size; i++) out[st->frame_size + i] = 1e-15f;

1 0

avcodec/libx264: Simplify copying packet data
by Andreas Rheinhardt 09 Nov '21

09 Nov '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sun Nov 7 15:18:41 2021 +0100| [b59138b6819b97544fd2fc40a27fdac0d75b2287] | committer: Andreas Rheinhardt avcodec/libx264: Simplify copying packet data x264.h: "the payloads of all output NALs are guaranteed to be sequential in memory." Therefore we can omit the loop. Reviewed-by: James Almer <jamrial(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b59138b6819b97544… --- libavcodec/libx264.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 4fe02dd11c..5f62c7b1d8 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -139,7 +139,6 @@ static int encode_nals(AVCodecContext *ctx, AVPacket *pkt, X264Context *x4 = ctx->priv_data; uint8_t *p; uint64_t size = x4->sei_size; - int i; int ret; if (!nnal) @@ -165,14 +164,14 @@ static int encode_nals(AVCodecContext *ctx, AVPacket *pkt, if (x4->sei_size > 0) { memcpy(p, x4->sei, x4->sei_size); p += x4->sei_size; + size -= x4->sei_size; x4->sei_size = 0; av_freep(&x4->sei); } - for (i = 0; i < nnal; i++){ - memcpy(p, nals[i].p_payload, nals[i].i_payload); - p += nals[i].i_payload; - } + /* x264 guarantees the payloads of the NALs + * to be sequential in memory. */ + memcpy(p, nals[0].p_payload, size); return 1; }

1 0

avcodec/libx264: Remove always-false checks
by Andreas Rheinhardt 09 Nov '21

09 Nov '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sun Nov 7 14:56:01 2021 +0100| [19ed9236db8796104c5a4f3343596172b01ebd1b] | committer: Andreas Rheinhardt avcodec/libx264: Remove always-false checks Always false since this encoder was switched to encode2 and ff_alloc_packet() in 06484d0b8a7d4d1a694ba7ab277e2ec32d6558d7 and f2b20b7a8b6fcbcd8cc669f5211e4e2ed7d8e9f3. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=19ed9236db8796104… --- libavcodec/libx264.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 8711c72131..4fe02dd11c 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -162,11 +162,7 @@ static int encode_nals(AVCodecContext *ctx, AVPacket *pkt, p = pkt->data; /* Write the SEI as part of the first frame. */ - if (x4->sei_size > 0 && nnal > 0) { - if (x4->sei_size > size) { - av_log(ctx, AV_LOG_ERROR, "Error: nal buffer is too small\n"); - return -1; - } + if (x4->sei_size > 0) { memcpy(p, x4->sei, x4->sei_size); p += x4->sei_size; x4->sei_size = 0;

1 0

avcodec/libx264: Check for overflow if necessary
by Andreas Rheinhardt 09 Nov '21

09 Nov '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sun Nov 7 14:50:27 2021 +0100| [6f1130be7880dc9e5e7c812f377dc3e480580704] | committer: Andreas Rheinhardt avcodec/libx264: Check for overflow if necessary Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6f1130be7880dc9e5… --- libavcodec/libx264.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 0766b4a950..8711c72131 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -138,13 +138,23 @@ static int encode_nals(AVCodecContext *ctx, AVPacket *pkt, { X264Context *x4 = ctx->priv_data; uint8_t *p; - int i, size = x4->sei_size, ret; + uint64_t size = x4->sei_size; + int i; + int ret; if (!nnal) return 0; - for (i = 0; i < nnal; i++) + for (int i = 0; i < nnal; i++) { size += nals[i].i_payload; + /* ff_get_encode_buffer() accepts an int64_t and + * so we need to make sure that no overflow happens before + * that. With 32bit ints this is automatically true. */ +#if INT_MAX > INT64_MAX / INT_MAX - 1 + if ((int64_t)size < 0) + return AVERROR(ERANGE); +#endif + } if ((ret = ff_get_encode_buffer(ctx, pkt, size, 0)) < 0) return ret;

1 0

avformat/apngenc: Use UINT16_MAX instead of USHRT_MAX
by Andreas Rheinhardt 09 Nov '21

09 Nov '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sun Nov 7 11:55:51 2021 +0100| [e5199eebb44fa5b63dcec06d38cab515eaa52b6c] | committer: Andreas Rheinhardt avformat/apngenc: Use UINT16_MAX instead of USHRT_MAX The latter needn't be 16 bits. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e5199eebb44fa5b63… --- libavformat/apngenc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/apngenc.c b/libavformat/apngenc.c index c97c475274..767074ecf3 100644 --- a/libavformat/apngenc.c +++ b/libavformat/apngenc.c @@ -91,9 +91,9 @@ static int apng_write_header(AVFormatContext *format_context) return AVERROR(EINVAL); } - if (apng->last_delay.num > USHRT_MAX || apng->last_delay.den > USHRT_MAX) { + if (apng->last_delay.num > UINT16_MAX || apng->last_delay.den > UINT16_MAX) { av_reduce(&apng->last_delay.num, &apng->last_delay.den, - apng->last_delay.num, apng->last_delay.den, USHRT_MAX); + apng->last_delay.num, apng->last_delay.den, UINT16_MAX); av_log(format_context, AV_LOG_WARNING, "Last frame delay is too precise. Reducing to %d/%d (%f).\n", apng->last_delay.num, apng->last_delay.den, (double)apng->last_delay.num / apng->last_delay.den); @@ -191,7 +191,7 @@ static int flush_packet(AVFormatContext *format_context, AVPacket *packet) if (packet) { int64_t delay_num_raw = (packet->dts - apng->prev_packet->dts) * codec_stream->time_base.num; int64_t delay_den_raw = codec_stream->time_base.den; - if (!av_reduce(&delay.num, &delay.den, delay_num_raw, delay_den_raw, USHRT_MAX) && + if (!av_reduce(&delay.num, &delay.den, delay_num_raw, delay_den_raw, UINT16_MAX) && !apng->framerate_warned) { av_log(format_context, AV_LOG_WARNING, "Frame rate is too high or specified too precisely. Unable to copy losslessly.\n"); @@ -281,9 +281,9 @@ static void apng_deinit(AVFormatContext *s) #define ENC AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { { "plays", "Number of times to play the output: 0 - infinite loop, 1 - no loop", OFFSET(plays), - AV_OPT_TYPE_INT, { .i64 = 1 }, 0, UINT_MAX, ENC }, + AV_OPT_TYPE_INT, { .i64 = 1 }, 0, UINT16_MAX, ENC }, { "final_delay", "Force delay after the last frame", OFFSET(last_delay), - AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, USHRT_MAX, ENC }, + AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, UINT16_MAX, ENC }, { NULL }, };

1 0

avcodec/videotoolboxenc: fix pixel buffer memory leak
by songyutong 09 Nov '21

09 Nov '21

ffmpeg | branch: master | songyutong <songyutong(a)kuaishou.com> | Tue Nov 9 18:51:58 2021 +0800| [8a969e1280aa7aef31de6bd3db5ce46dc123fde0] | committer: Rick Kern avcodec/videotoolboxenc: fix pixel buffer memory leak In function vtenc_populate_extradata(), there is a manually created pixel buffer that has not been released. So we should use CVPixelBufferRelease to release this pixel buffer at the end, otherwise will cause a memory leak. Signed-off-by: Rick Kern <kernrj(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a969e1280aa7aef3… --- libavcodec/videotoolboxenc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index bac36fda90..ebaa3ebdc8 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -2554,6 +2554,7 @@ static int vtenc_populate_extradata(AVCodecContext *avctx, pe_cleanup: + CVPixelBufferRelease(pix_buf); if(vtctx->session) CFRelease(vtctx->session);

1 0