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

avcodec/apedec: Only clear the needed buffer space, instead of all
by Michael Niedermayer 29 Oct '19

29 Oct '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sun Oct 27 23:26:52 2019 +0100| [f17ea0200178a4dae446a6bec2f68312f41714a0] | committer: Michael Niedermayer avcodec/apedec: Only clear the needed buffer space, instead of all Fixes: Timeout (15sec -> 0.4sec) Fixes: 18396/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-5730080487112704 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f17ea0200178a4dae… --- libavcodec/apedec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index 75c6a96437..2dd197a7f2 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -1516,7 +1516,7 @@ static int ape_decode_frame(AVCodecContext *avctx, void *data, av_fast_malloc(&s->decoded_buffer, &s->decoded_size, decoded_buffer_size); if (!s->decoded_buffer) return AVERROR(ENOMEM); - memset(s->decoded_buffer, 0, s->decoded_size); + memset(s->decoded_buffer, 0, decoded_buffer_size); s->decoded[0] = s->decoded_buffer; s->decoded[1] = s->decoded_buffer + FFALIGN(blockstodecode, 8);

1 0

avfilter/asrc_anoisesrc: change color variable to int
by Limin Wang 29 Oct '19

29 Oct '19

ffmpeg | branch: master | Limin Wang <lance.lmwang(a)gmail.com> | Sat Oct 26 21:23:24 2019 +0800| [e1c4ce4761fc5cbc904bca8e802fdf65211a6a0a] | committer: Michael Niedermayer avfilter/asrc_anoisesrc: change color variable to int Or it'll cause invalid color and s->filter is NULL. Please reproduce it with below command on big endian system: $ ./ffmpeg -f lavfi -i "anoisesrc=d=60:c=1:r=48000" -f s16le -c:a pcm_s16le -f null - Segmentation fault (core dumped) Signed-off-by: Limin Wang <lance.lmwang(a)gmail.com> Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1c4ce4761fc5cbc9… --- libavfilter/asrc_anoisesrc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/asrc_anoisesrc.c b/libavfilter/asrc_anoisesrc.c index 78f0af4fde..cedadde6c9 100644 --- a/libavfilter/asrc_anoisesrc.c +++ b/libavfilter/asrc_anoisesrc.c @@ -30,7 +30,7 @@ typedef struct ANoiseSrcContext { int sample_rate; double amplitude; int64_t duration; - int64_t color; + int color; int64_t seed; int nb_samples;

1 0

avcodec/libvorbisdec: Fix insufficient input checks leading to out of array reads
by Michael Niedermayer 29 Oct '19

29 Oct '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sat Oct 26 23:58:02 2019 +0200| [069be4aa5ddce4479b18896d80a852b144e680df] | committer: Michael Niedermayer avcodec/libvorbisdec: Fix insufficient input checks leading to out of array reads Fixes: 16144/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBVORBIS_fuzzer-5638618940440576 Fixes: out of array read 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=069be4aa5ddce4479… --- libavcodec/libvorbisdec.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libavcodec/libvorbisdec.c b/libavcodec/libvorbisdec.c index 89cbbb41b6..3c53b8fdaf 100644 --- a/libavcodec/libvorbisdec.c +++ b/libavcodec/libvorbisdec.c @@ -64,22 +64,25 @@ static int oggvorbis_decode_init(AVCodecContext *avccontext) { } } else if(*p == 2) { unsigned int offset = 1; + unsigned int sizesum = 1; p++; for(i=0; i<2; i++) { hsizes[i] = 0; - while((*p == 0xFF) && (offset < avccontext->extradata_size)) { + while((*p == 0xFF) && (sizesum < avccontext->extradata_size)) { hsizes[i] += 0xFF; offset++; + sizesum += 1 + 0xFF; p++; } - if(offset >= avccontext->extradata_size - 1) { + hsizes[i] += *p; + offset++; + sizesum += 1 + *p; + if(sizesum > avccontext->extradata_size) { av_log(avccontext, AV_LOG_ERROR, "vorbis header sizes damaged\n"); ret = AVERROR_INVALIDDATA; goto error; } - hsizes[i] += *p; - offset++; p++; } hsizes[2] = avccontext->extradata_size - hsizes[0]-hsizes[1]-offset;

1 0

avcodec/g723_1dec: fix invalid shift with negative sid_gain
by Michael Niedermayer 29 Oct '19

29 Oct '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sat Oct 26 21:56:03 2019 +0200| [1850c3feaa1c7b5b63a55c61075029fa59c84e66] | committer: Michael Niedermayer avcodec/g723_1dec: fix invalid shift with negative sid_gain Fixes: left shift of negative value -1 Fixes: 18395/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_G723_1_fuzzer-5710313034350592 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1850c3feaa1c7b5b6… --- libavcodec/g723_1dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/g723_1dec.c b/libavcodec/g723_1dec.c index a7bf528470..f601d31d00 100644 --- a/libavcodec/g723_1dec.c +++ b/libavcodec/g723_1dec.c @@ -677,7 +677,7 @@ static int estimate_sid_gain(G723_1_ChannelContext *p) if (p->sid_gain < 0) t = INT32_MIN; else t = INT32_MAX; } else - t = p->sid_gain << shift; + t = p->sid_gain * (1 << shift); } else if(shift < -31) { t = (p->sid_gain < 0) ? -1 : 0; }else

1 0

avformat/dss: Remove superfluous headers
by Andreas Rheinhardt 29 Oct '19

29 Oct '19

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Sat Oct 26 06:59:57 2019 +0200| [8b28aa0767d510b84d932a94c045a693b97e8179] | committer: Michael Niedermayer avformat/dss: Remove superfluous headers Both attributes.h and bswap.h have been included from the very beginning of this muxer without there being any reason to do so. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8b28aa0767d510b84… --- libavformat/dss.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/dss.c b/libavformat/dss.c index e5b0be9deb..d7f9cafe47 100644 --- a/libavformat/dss.c +++ b/libavformat/dss.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/attributes.h" -#include "libavutil/bswap.h" #include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h"

1 0

avcodec/tiff: check the black level denominator
by James Almer 29 Oct '19

29 Oct '19

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Sat Oct 26 12:01:16 2019 -0300| [dad75924290e15996e75c335c6c30b1d8e2e48ea] | committer: James Almer avcodec/tiff: check the black level denominator Fixes ticket #8327. Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dad75924290e15996… --- libavcodec/tiff.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index f537e99b5a..636614aa28 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -1240,6 +1240,11 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) case TIFF_RATIONAL: value = ff_tget(&s->gb, TIFF_LONG, s->le); value2 = ff_tget(&s->gb, TIFF_LONG, s->le); + if (!value2) { + av_log(s->avctx, AV_LOG_ERROR, "Invalid denominator in rational\n"); + return AVERROR_INVALIDDATA; + } + break; case TIFF_STRING: if (count <= 4) { @@ -1413,6 +1418,10 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) if (type == TIFF_RATIONAL) { value = ff_tget(&s->gb, TIFF_LONG, s->le); value2 = ff_tget(&s->gb, TIFF_LONG, s->le); + if (!value2) { + av_log(s->avctx, AV_LOG_ERROR, "Invalid black level denominator\n"); + return AVERROR_INVALIDDATA; + } s->black_level = value / value2; } else

1 0

avcodec/nvenc: turn feature check failures into warnings
by hydra3333 29 Oct '19

29 Oct '19

ffmpeg | branch: master | hydra3333 <hydra3333(a)gmail.com> | Sat Oct 26 19:30:54 2019 -0700| [ba6b20df3f74a6092dc01023b07760da58188d82] | committer: Timo Rothenpieler avcodec/nvenc: turn feature check failures into warnings Signed-off-by: Timo Rothenpieler <timo(a)rothenpieler.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ba6b20df3f74a6092… --- libavcodec/nvenc.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index bbb43ddad8..111048d043 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -321,39 +321,39 @@ static int nvenc_check_capabilities(AVCodecContext *avctx) ret = nvenc_check_codec_support(avctx); if (ret < 0) { - av_log(avctx, AV_LOG_VERBOSE, "Codec not supported\n"); + av_log(avctx, AV_LOG_WARNING, "Codec not supported\n"); return ret; } ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_YUV444_ENCODE); if (IS_YUV444(ctx->data_pix_fmt) && ret <= 0) { - av_log(avctx, AV_LOG_VERBOSE, "YUV444P not supported\n"); + av_log(avctx, AV_LOG_WARNING, "YUV444P not supported\n"); return AVERROR(ENOSYS); } ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_LOSSLESS_ENCODE); if (ctx->preset >= PRESET_LOSSLESS_DEFAULT && ret <= 0) { - av_log(avctx, AV_LOG_VERBOSE, "Lossless encoding not supported\n"); + av_log(avctx, AV_LOG_WARNING, "Lossless encoding not supported\n"); return AVERROR(ENOSYS); } ret = nvenc_check_cap(avctx, NV_ENC_CAPS_WIDTH_MAX); if (ret < avctx->width) { - av_log(avctx, AV_LOG_VERBOSE, "Width %d exceeds %d\n", + av_log(avctx, AV_LOG_WARNING, "Width %d exceeds %d\n", avctx->width, ret); return AVERROR(ENOSYS); } ret = nvenc_check_cap(avctx, NV_ENC_CAPS_HEIGHT_MAX); if (ret < avctx->height) { - av_log(avctx, AV_LOG_VERBOSE, "Height %d exceeds %d\n", + av_log(avctx, AV_LOG_WARNING, "Height %d exceeds %d\n", avctx->height, ret); return AVERROR(ENOSYS); } ret = nvenc_check_cap(avctx, NV_ENC_CAPS_NUM_MAX_BFRAMES); if (ret < avctx->max_b_frames) { - av_log(avctx, AV_LOG_VERBOSE, "Max B-frames %d exceed %d\n", + av_log(avctx, AV_LOG_WARNING, "Max B-frames %d exceed %d\n", avctx->max_b_frames, ret); return AVERROR(ENOSYS); @@ -361,7 +361,7 @@ static int nvenc_check_capabilities(AVCodecContext *avctx) ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_FIELD_ENCODING); if (ret < 1 && avctx->flags & AV_CODEC_FLAG_INTERLACED_DCT) { - av_log(avctx, AV_LOG_VERBOSE, + av_log(avctx, AV_LOG_WARNING, "Interlaced encoding is not supported. Supported level: %d\n", ret); return AVERROR(ENOSYS); @@ -369,46 +369,46 @@ static int nvenc_check_capabilities(AVCodecContext *avctx) ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_10BIT_ENCODE); if (IS_10BIT(ctx->data_pix_fmt) && ret <= 0) { - av_log(avctx, AV_LOG_VERBOSE, "10 bit encode not supported\n"); + av_log(avctx, AV_LOG_WARNING, "10 bit encode not supported\n"); return AVERROR(ENOSYS); } ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_LOOKAHEAD); if (ctx->rc_lookahead > 0 && ret <= 0) { - av_log(avctx, AV_LOG_VERBOSE, "RC lookahead not supported\n"); + av_log(avctx, AV_LOG_WARNING, "RC lookahead not supported\n"); return AVERROR(ENOSYS); } ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_TEMPORAL_AQ); if (ctx->temporal_aq > 0 && ret <= 0) { - av_log(avctx, AV_LOG_VERBOSE, "Temporal AQ not supported\n"); + av_log(avctx, AV_LOG_WARNING, "Temporal AQ not supported\n"); return AVERROR(ENOSYS); } ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_WEIGHTED_PREDICTION); if (ctx->weighted_pred > 0 && ret <= 0) { - av_log (avctx, AV_LOG_VERBOSE, "Weighted Prediction not supported\n"); + av_log (avctx, AV_LOG_WARNING, "Weighted Prediction not supported\n"); return AVERROR(ENOSYS); } ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_CABAC); if (ctx->coder == NV_ENC_H264_ENTROPY_CODING_MODE_CABAC && ret <= 0) { - av_log(avctx, AV_LOG_VERBOSE, "CABAC entropy coding not supported\n"); + av_log(avctx, AV_LOG_WARNING, "CABAC entropy coding not supported\n"); return AVERROR(ENOSYS); } #ifdef NVENC_HAVE_BFRAME_REF_MODE ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_BFRAME_REF_MODE); if (ctx->b_ref_mode == NV_ENC_BFRAME_REF_MODE_EACH && ret != 1) { - av_log(avctx, AV_LOG_VERBOSE, "Each B frame as reference is not supported\n"); + av_log(avctx, AV_LOG_WARNING, "Each B frame as reference is not supported\n"); return AVERROR(ENOSYS); } else if (ctx->b_ref_mode != NV_ENC_BFRAME_REF_MODE_DISABLED && ret == 0) { - av_log(avctx, AV_LOG_VERBOSE, "B frames as references are not supported\n"); + av_log(avctx, AV_LOG_WARNING, "B frames as references are not supported\n"); return AVERROR(ENOSYS); } #else if (ctx->b_ref_mode != 0) { - av_log(avctx, AV_LOG_VERBOSE, "B frames as references need SDK 8.1 at build time\n"); + av_log(avctx, AV_LOG_WARNING, "B frames as references need SDK 8.1 at build time\n"); return AVERROR(ENOSYS); } #endif @@ -416,12 +416,12 @@ static int nvenc_check_capabilities(AVCodecContext *avctx) #ifdef NVENC_HAVE_MULTIPLE_REF_FRAMES ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_MULTIPLE_REF_FRAMES); if(avctx->refs != NV_ENC_NUM_REF_FRAMES_AUTOSELECT && ret <= 0) { - av_log(avctx, AV_LOG_VERBOSE, "Multiple reference frames are not supported\n"); + av_log(avctx, AV_LOG_WARNING, "Multiple reference frames are not supported by the device\n"); return AVERROR(ENOSYS); } #else if(avctx->refs != 0) { - av_log(avctx, AV_LOG_VERBOSE, "Multiple reference frames need SDK 9.1 at build time\n"); + av_log(avctx, AV_LOG_WARNING, "Multiple reference frames need SDK 9.1 at build time\n"); return AVERROR(ENOSYS); } #endif @@ -601,7 +601,7 @@ static av_cold int nvenc_setup_device(AVCodecContext *avctx) return AVERROR_EXIT; if (!dl_fn->nvenc_device_count) { - av_log(avctx, AV_LOG_FATAL, "No NVENC capable devices found\n"); + av_log(avctx, AV_LOG_FATAL, "No capable devices found\n"); return AVERROR_EXTERNAL; }

1 0

avfilter/vf_vfrdet: also report average delta
by Paul B Mahol 29 Oct '19

29 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Oct 29 13:05:31 2019 +0100| [3420e56d9a4a2c947c638087291d5b05ca3870f8] | committer: Paul B Mahol avfilter/vf_vfrdet: also report average delta > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3420e56d9a4a2c947… --- doc/filters.texi | 4 ++-- libavfilter/vf_vfrdet.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index c4477e6677..11f715319a 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -18946,8 +18946,8 @@ This filter tries to detect if the input is variable or constant frame rate. At end it will output number of frames detected as having variable delta pts, and ones with constant delta pts. -If there was frames with variable delta, than it will also show min and max delta -encountered. +If there was frames with variable delta, than it will also show min, max and +average delta encountered. @section vibrance diff --git a/libavfilter/vf_vfrdet.c b/libavfilter/vf_vfrdet.c index 051b53babd..abfa19cdcd 100644 --- a/libavfilter/vf_vfrdet.c +++ b/libavfilter/vf_vfrdet.c @@ -29,6 +29,7 @@ typedef struct VFRDETContext { int64_t delta; int64_t min_delta; int64_t max_delta; + int64_t avg_delta; uint64_t vfr; uint64_t cfr; @@ -53,6 +54,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) s->delta = delta; s->min_delta = FFMIN(delta, s->min_delta); s->max_delta = FFMAX(delta, s->max_delta); + s->avg_delta += delta; } else { s->cfr++; } @@ -81,7 +83,7 @@ static av_cold void uninit(AVFilterContext *ctx) av_log(ctx, AV_LOG_INFO, "VFR:%f (%"PRIu64"/%"PRIu64")", s->vfr / (float)(s->vfr + s->cfr), s->vfr, s->cfr); if (s->vfr) - av_log(ctx, AV_LOG_INFO, " min: %"PRId64" max: %"PRId64")", s->min_delta, s->max_delta); + av_log(ctx, AV_LOG_INFO, " min: %"PRId64" max: %"PRId64" avg: %"PRId64, s->min_delta, s->max_delta, s->avg_delta / s->vfr); av_log(ctx, AV_LOG_INFO, "\n"); }

1 0

avfilter/vf_vfrdet: fix reporting max delta
by Paul B Mahol 29 Oct '19

29 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Oct 29 12:57:58 2019 +0100| [4ce263a7fd1c8dc5625a9e0ca4ccba07c5ba90e4] | committer: Paul B Mahol avfilter/vf_vfrdet: fix reporting max delta If only first delta was big it was previously discarded. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4ce263a7fd1c8dc56… --- libavfilter/vf_vfrdet.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavfilter/vf_vfrdet.c b/libavfilter/vf_vfrdet.c index cac96e29a2..051b53babd 100644 --- a/libavfilter/vf_vfrdet.c +++ b/libavfilter/vf_vfrdet.c @@ -44,6 +44,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) if (s->delta == AV_NOPTS_VALUE) { s->delta = delta; + s->min_delta = delta; + s->max_delta = delta; } if (s->delta != delta) {

1 0

avfilter: add median filter
by Paul B Mahol 29 Oct '19

29 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Jan 15 11:32:49 2019 +0100| [1c3b70e2e078bf0901b3af5491f923818809de37] | committer: Paul B Mahol avfilter: add median filter > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1c3b70e2e078bf090… --- Changelog | 1 + doc/filters.texi | 15 +++ libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/median.h | 54 +++++++++ libavfilter/median_template.c | 159 +++++++++++++++++++++++++ libavfilter/version.h | 2 +- libavfilter/vf_median.c | 271 ++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 503 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 6fab938e0f..7c971fce63 100644 --- a/Changelog +++ b/Changelog @@ -19,6 +19,7 @@ version <next>: - bilateral filter - maskedmin and maskedmax filters - VDPAU VP9 hwaccel +- median filter version 4.2: diff --git a/doc/filters.texi b/doc/filters.texi index 5b8062d806..c4477e6677 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -12805,6 +12805,21 @@ Higher values should result in a smoother motion vector field but less optimal individual vectors. Default value is 1. @end table +@section median + +Pick median pixel from certain rectangle defined by radius. + +This filter accepts the following options: + +@table @option +@item radius +Set horizontal and vertical radius size. Default value is @code{1}. +Allowed range is integer from 1 to 127. + +@item planes +Set which planes to process. Default is @code{15}, which is all available planes. +@end table + @section mergeplanes Merge color channel components from several video streams. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index bae566d433..2080eed559 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -297,6 +297,7 @@ OBJS-$(CONFIG_MASKEDMERGE_FILTER) += vf_maskedmerge.o framesync.o OBJS-$(CONFIG_MASKEDMIN_FILTER) += vf_maskedminmax.o framesync.o OBJS-$(CONFIG_MASKFUN_FILTER) += vf_maskfun.o OBJS-$(CONFIG_MCDEINT_FILTER) += vf_mcdeint.o +OBJS-$(CONFIG_MEDIAN_FILTER) += vf_median.o OBJS-$(CONFIG_MERGEPLANES_FILTER) += vf_mergeplanes.o framesync.o OBJS-$(CONFIG_MESTIMATE_FILTER) += vf_mestimate.o motion_estimation.o OBJS-$(CONFIG_METADATA_FILTER) += f_metadata.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index d136734338..cb609067b6 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -282,6 +282,7 @@ extern AVFilter ff_vf_maskedmerge; extern AVFilter ff_vf_maskedmin; extern AVFilter ff_vf_maskfun; extern AVFilter ff_vf_mcdeint; +extern AVFilter ff_vf_median; extern AVFilter ff_vf_mergeplanes; extern AVFilter ff_vf_mestimate; extern AVFilter ff_vf_metadata; diff --git a/libavfilter/median.h b/libavfilter/median.h new file mode 100644 index 0000000000..bb07fddd5d --- /dev/null +++ b/libavfilter/median.h @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2019 Paul B Mahol + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + */ + +#ifndef AVFILTER_MEDIAN_H +#define AVFILTER_MEDIAN_H + +#include "avfilter.h" + +typedef struct MedianContext { + const AVClass *class; + + int planes; + int radius; + + int planewidth[4]; + int planeheight[4]; + int depth; + int nb_planes; + int nb_threads; + + uint16_t **coarse, **fine; + int coarse_size, fine_size; + int bins; + int t; + + void (*hadd)(uint16_t *dst, const uint16_t *src, int bins); + void (*hsub)(uint16_t *dst, const uint16_t *src, int bins); + void (*hmuladd)(uint16_t *dst, const uint16_t *src, int f, int bins); + + void (*filter_plane)(AVFilterContext *ctx, const uint8_t *ssrc, int src_linesize, + uint8_t *ddst, int dst_linesize, int width, int height, + int slice_h_start, int slice_h_end, int jobnr); +} MedianContext; + +#endif diff --git a/libavfilter/median_template.c b/libavfilter/median_template.c new file mode 100644 index 0000000000..6953a23a5b --- /dev/null +++ b/libavfilter/median_template.c @@ -0,0 +1,159 @@ +/* + * Copyright (c) 2019 Paul B Mahol + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + */ + +#include "libavutil/avassert.h" +#include "avfilter.h" +#include "formats.h" +#include "internal.h" +#include "video.h" + +#undef pixel +#if DEPTH == 8 +#define pixel uint8_t +#else +#define pixel uint16_t +#endif + +#undef htype +#define htype uint16_t + +#undef fn +#undef fn2 +#undef fn3 +#define SHIFT ((DEPTH + 1) / 2) +#define BINS (1 << SHIFT) +#define MASK (BINS - 1) +#define fn3(a,b) a##_##b +#define fn2(a,b) fn3(a,b) +#define fn(a) fn2(a, DEPTH) + +#define PICK_COARSE_BIN(x, y) (BINS * (x) + ((y) >> SHIFT)) +#define PICK_FINE_BIN(x, y, z) (BINS * ((x) * ((y) >> SHIFT) + (z)) + ((y) & MASK)) + +static void fn(filter_plane)(AVFilterContext *ctx, const uint8_t *ssrc, int src_linesize, + uint8_t *ddst, int dst_linesize, int width, int height, + int slice_h_start, int slice_h_end, int jobnr) +{ + MedianContext *s = ctx->priv; + htype *ccoarse = s->coarse[jobnr]; + htype *cfine = s->fine[jobnr]; + const int radius = s->radius; + const int t = s->t; + const pixel *src = (const pixel *)ssrc; + pixel *dst = (pixel *)ddst; + const pixel *srcp; + const pixel *p; + + src_linesize /= sizeof(pixel); + dst_linesize /= sizeof(pixel); + + memset(cfine, 0, s->fine_size * sizeof(*cfine)); + memset(ccoarse, 0, s->coarse_size * sizeof(*ccoarse)); + + srcp = src + FFMAX(0, slice_h_start - radius) * src_linesize; + if (jobnr == 0) { + for (int i = 0; i < width; i++) { + cfine[PICK_FINE_BIN(width, srcp[i], i)] += radius + 1; + ccoarse[PICK_COARSE_BIN(i, srcp[i])] += radius + 1; + } + } + + srcp = src + FFMAX(0, slice_h_start - radius - (jobnr != 0)) * src_linesize; + for (int i = 0; i < radius + (jobnr != 0) * (1 + radius); i++) { + for (int j = 0; j < width; j++) { + cfine[PICK_FINE_BIN(width, srcp[j], j)]++; + ccoarse[PICK_COARSE_BIN(j, srcp[j])]++; + } + srcp += src_linesize; + } + + srcp = src; + + for (int i = slice_h_start; i < slice_h_end; i++) { + htype coarse[BINS] = { 0 }; + htype fine[BINS][BINS] = { { 0 } }; + htype luc[BINS] = { 0 }; + + p = srcp + src_linesize * FFMAX(0, i - radius - 1); + for (int j = 0; j < width; j++) { + cfine[PICK_FINE_BIN(width, p[j], j)]--; + ccoarse[PICK_COARSE_BIN(j, p[j])]--; + } + + p = srcp + src_linesize * FFMIN(height - 1, i + radius); + for (int j = 0; j < width; j++) { + cfine[PICK_FINE_BIN(width, p[j], j)]++; + ccoarse[PICK_COARSE_BIN(j, p[j])]++; + } + + s->hmuladd(coarse, &ccoarse[0], radius, BINS); + for (int j = 0; j < radius; j++) + s->hadd(coarse, &ccoarse[BINS * j], BINS); + for (int k = 0; k < BINS; k++) + s->hmuladd(&fine[k][0], &cfine[BINS * width * k], 2 * radius + 1, BINS); + + for (int j = 0; j < width; j++) { + int sum = 0, k, b; + htype *segment; + + s->hadd(coarse, &ccoarse[BINS * FFMIN(j + radius, width - 1)], BINS); + + for (k = 0; k < BINS; k++) { + sum += coarse[k]; + if (sum > t) { + sum -= coarse[k]; + break; + } + } + av_assert0(k < BINS); + + if (luc[k] <= j - radius) { + memset(&fine[k], 0, BINS * sizeof(htype)); + for (luc[k] = j - radius; luc[k] < FFMIN(j + radius + 1, width); luc[k]++) + s->hadd(fine[k], &cfine[BINS * (width * k + luc[k])], BINS); + if (luc[k] < j + radius + 1) { + s->hmuladd(&fine[k][0], &cfine[BINS * (width * k + width - 1)], j + radius + 1 - width, BINS); + luc[k] = j + radius + 1; + } + } else { + for (; luc[k] < j + radius + 1; luc[k]++) { + s->hsub(fine[k], &cfine[BINS * (width * k + FFMAX(luc[k] - 2 * radius - 1, 0))], BINS); + s->hadd(fine[k], &cfine[BINS * (width * k + FFMIN(luc[k], width - 1))], BINS); + } + } + + s->hsub(coarse, &ccoarse[BINS * FFMAX(j - radius, 0)], BINS); + + segment = fine[k]; + for (b = 0; b < BINS; b++) { + sum += segment[b]; + if (sum > t) { + dst[j] = BINS * k + b; + break; + } + } + av_assert0(b < BINS); + } + + dst += dst_linesize; + } +} diff --git a/libavfilter/version.h b/libavfilter/version.h index 58d57ae95f..2e3ff53b20 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #define LIBAVFILTER_VERSION_MAJOR 7 -#define LIBAVFILTER_VERSION_MINOR 65 +#define LIBAVFILTER_VERSION_MINOR 66 #define LIBAVFILTER_VERSION_MICRO 100 diff --git a/libavfilter/vf_median.c b/libavfilter/vf_median.c new file mode 100644 index 0000000000..98296bcc2b --- /dev/null +++ b/libavfilter/vf_median.c @@ -0,0 +1,271 @@ +/* + * Copyright (c) 2019 Paul B Mahol + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + */ + +#include "libavutil/avassert.h" +#include "libavutil/imgutils.h" +#include "libavutil/opt.h" +#include "libavutil/pixdesc.h" +#include "avfilter.h" +#include "formats.h" +#include "internal.h" +#include "median.h" +#include "video.h" + +#define DEPTH 8 +#include "median_template.c" + +#undef DEPTH +#define DEPTH 9 +#include "median_template.c" + +#undef DEPTH +#define DEPTH 10 +#include "median_template.c" + +#undef DEPTH +#define DEPTH 12 +#include "median_template.c" + +#undef DEPTH +#define DEPTH 14 +#include "median_template.c" + +#undef DEPTH +#define DEPTH 16 +#include "median_template.c" + +#define OFFSET(x) offsetof(MedianContext, x) +#define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM + +static const AVOption median_options[] = { + { "radius", "set median radius", OFFSET(radius), AV_OPT_TYPE_INT, {.i64=1}, 1, 127, FLAGS }, + { "planes", "set planes to filter", OFFSET(planes), AV_OPT_TYPE_INT, {.i64=0xF}, 0, 0xF, FLAGS }, + { NULL } +}; + +AVFILTER_DEFINE_CLASS(median); + +static void hadd(htype *dst, const htype *src, int bins) +{ + for (int i = 0; i < bins; i++) + dst[i] += src[i]; +} + +static void hsub(htype *dst, const htype *src, int bins) +{ + for (int i = 0; i < bins; i++) + dst[i] -= src[i]; +} + +static void hmuladd(htype *dst, const htype *src, int f, int bins) +{ + for (int i = 0; i < bins; i++) + dst[i] += f * src[i]; +} + +static int query_formats(AVFilterContext *ctx) +{ + static const enum AVPixelFormat pix_fmts[] = { + AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P, + AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, + AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUV420P, + AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ420P, + AV_PIX_FMT_YUVJ411P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, + AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY9, + AV_PIX_FMT_YUV420P9, AV_PIX_FMT_YUV422P9, AV_PIX_FMT_YUV444P9, AV_PIX_FMT_GBRP9, + AV_PIX_FMT_YUVA420P9, AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA444P9, + AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10, + AV_PIX_FMT_YUV420P12, AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV444P12, AV_PIX_FMT_YUV440P12, + AV_PIX_FMT_YUV420P14, AV_PIX_FMT_YUV422P14, AV_PIX_FMT_YUV444P14, + AV_PIX_FMT_YUV420P16, AV_PIX_FMT_YUV422P16, AV_PIX_FMT_YUV444P16, + AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA444P10, + AV_PIX_FMT_YUVA420P16, AV_PIX_FMT_YUVA422P16, AV_PIX_FMT_YUVA444P16, + AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14, AV_PIX_FMT_GBRP16, + AV_PIX_FMT_GBRAP10, AV_PIX_FMT_GBRAP12, AV_PIX_FMT_GBRAP16, + AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_GRAY16, + AV_PIX_FMT_NONE + }; + + return ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); +} + +static int config_input(AVFilterLink *inlink) +{ + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); + MedianContext *s = inlink->dst->priv; + + s->depth = desc->comp[0].depth; + s->planewidth[1] = s->planewidth[2] = AV_CEIL_RSHIFT(inlink->w, desc->log2_chroma_w); + s->planewidth[0] = s->planewidth[3] = inlink->w; + s->planeheight[1] = s->planeheight[2] = AV_CEIL_RSHIFT(inlink->h, desc->log2_chroma_h); + s->planeheight[0] = s->planeheight[3] = inlink->h; + + s->nb_planes = av_pix_fmt_count_planes(inlink->format); + s->t = 2 * s->radius * s->radius + 2 * s->radius; + + for (int i = 0; i < s->nb_planes; i++) { + if (!(s->planes & (1 << i))) + continue; + + if (s->planewidth[i] < s->radius * 2 + 1) { + av_log(inlink->dst, AV_LOG_ERROR, "The %d plane width %d must be not less than %d\n", i, s->planewidth[i], s->radius * 2 + 1); + return AVERROR(EINVAL); + } + + if (s->planeheight[i] < s->radius * 2 + 1) { + av_log(inlink->dst, AV_LOG_ERROR, "The %d plane height %d must be not less than %d\n", i, s->planeheight[i], s->radius * 2 + 1); + return AVERROR(EINVAL); + } + } + + s->nb_threads = FFMAX(1, FFMIN(s->planeheight[1] / (s->radius + 1), ff_filter_get_nb_threads(inlink->dst))); + s->bins = 1 << ((s->depth + 1) / 2); + s->fine_size = s->bins * s->bins * inlink->w; + s->coarse_size = s->bins * inlink->w; + s->coarse = av_calloc(s->nb_threads, sizeof(*s->coarse)); + s->fine = av_calloc(s->nb_threads, sizeof(*s->fine)); + if (!s->coarse || !s->fine) + return AVERROR(ENOMEM); + for (int i = 0; i < s->nb_threads; i++) { + s->coarse[i] = av_malloc_array(s->coarse_size, sizeof(**s->coarse)); + s->fine[i] = av_malloc_array(s->fine_size, sizeof(**s->fine)); + if (!s->coarse[i] || !s->fine[i]) + return AVERROR(ENOMEM); + } + + s->hadd = hadd; + s->hsub = hsub; + s->hmuladd = hmuladd; + + switch (s->depth) { + case 8: s->filter_plane = filter_plane_8; break; + case 9: s->filter_plane = filter_plane_9; break; + case 10: s->filter_plane = filter_plane_10; break; + case 12: s->filter_plane = filter_plane_12; break; + case 14: s->filter_plane = filter_plane_14; break; + case 16: s->filter_plane = filter_plane_16; break; + } + + return 0; +} + +typedef struct ThreadData { + AVFrame *in, *out; +} ThreadData; + +static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) +{ + MedianContext *s = ctx->priv; + ThreadData *td = arg; + AVFrame *in = td->in; + AVFrame *out = td->out; + + for (int plane = 0; plane < s->nb_planes; plane++) { + const int h = s->planeheight[plane]; + const int w = s->planewidth[plane]; + const int slice_h_start = (h * jobnr) / nb_jobs; + const int slice_h_end = (h * (jobnr+1)) / nb_jobs; + + if (!(s->planes & (1 << plane))) { + av_image_copy_plane(out->data[plane] + slice_h_start * out->linesize[plane], + out->linesize[plane], + in->data[plane] + slice_h_start * in->linesize[plane], + in->linesize[plane], + w * ((s->depth + 7) / 8), + slice_h_end - slice_h_start); + continue; + } + + s->filter_plane(ctx, in->data[plane], + in->linesize[plane], + out->data[plane] + slice_h_start * out->linesize[plane], + out->linesize[plane], w, h, + slice_h_start, slice_h_end, jobnr); + } + + return 0; +} + +static int filter_frame(AVFilterLink *inlink, AVFrame *in) +{ + AVFilterContext *ctx = inlink->dst; + MedianContext *s = ctx->priv; + AVFilterLink *outlink = ctx->outputs[0]; + 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, s->nb_threads); + + av_frame_free(&in); + return ff_filter_frame(outlink, out); +} + +static av_cold void uninit(AVFilterContext *ctx) +{ + MedianContext *s = ctx->priv; + + for (int i = 0; i < s->nb_threads && s->coarse && s->fine; i++) { + av_freep(&s->coarse[i]); + av_freep(&s->fine[i]); + } + + av_freep(&s->coarse); + av_freep(&s->fine); +} + +static const AVFilterPad median_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = config_input, + .filter_frame = filter_frame, + }, + { NULL } +}; + +static const AVFilterPad median_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + }, + { NULL } +}; + +AVFilter ff_vf_median = { + .name = "median", + .description = NULL_IF_CONFIG_SMALL("Apply Median filter."), + .priv_size = sizeof(MedianContext), + .priv_class = &median_class, + .uninit = uninit, + .query_formats = query_formats, + .inputs = median_inputs, + .outputs = median_outputs, + .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, +};

1 0