May 2019 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/gdv: Check remaining output after decode 5/6/8/
by Michael Niedermayer 31 May '19

31 May '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed May 29 01:12:39 2019 +0200| [5a6fc87443e29fceff632c6abe5fb34ee905012e] | committer: Michael Niedermayer avcodec/gdv: Check remaining output after decode 5/6/8/ Improves: Timeout (355sec -> 97sec) Improves: 14709/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_GDV_fuzzer-5704215281795072 Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a6fc87443e29fcef… --- libavcodec/gdv.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/gdv.c b/libavcodec/gdv.c index 9cf30c09e4..a5ce6b799e 100644 --- a/libavcodec/gdv.c +++ b/libavcodec/gdv.c @@ -308,7 +308,7 @@ static int decompress_5(AVCodecContext *avctx, unsigned skip) int len; int b = bytestream2_get_byte(gb); if (b == 0) { - break; + return 0; } if (b != 0xFF) { len = b; @@ -323,6 +323,8 @@ static int decompress_5(AVCodecContext *avctx, unsigned skip) lz_copy(pb, g2, off, len); } } + if (bytestream2_get_bytes_left_p(pb) > 0) + return AVERROR_INVALIDDATA; return 0; } @@ -445,6 +447,9 @@ static int decompress_68(AVCodecContext *avctx, unsigned skip, unsigned use8) } } + if (bytestream2_get_bytes_left_p(pb) > 0) + return AVERROR_INVALIDDATA; + return 0; }

1 0

tools: Add fuzzer for demuxers
by Michael Niedermayer 31 May '19

31 May '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon May 27 21:50:08 2019 +0200| [710b7ec0713307a6d26d0ca7fad1369a75a01edb] | committer: Michael Niedermayer tools: Add fuzzer for demuxers This is based on target_dec_fuzzer Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=710b7ec0713307a6d… --- Makefile | 3 + tools/Makefile | 3 + tools/target_dem_fuzzer.c | 163 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 169 insertions(+) diff --git a/Makefile b/Makefile index 48c59733b8..532372c9c4 100644 --- a/Makefile +++ b/Makefile @@ -50,6 +50,9 @@ $(TOOLS): %$(EXESUF): %.o target_dec_%_fuzzer$(EXESUF): target_dec_%_fuzzer.o $(FF_DEP_LIBS) $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH) +tools/target_dem_fuzzer$(EXESUF): tools/target_dem_fuzzer.o $(FF_DEP_LIBS) + $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH) + tools/sofa2wavs$(EXESUF): ELIBS = $(FF_EXTRALIBS) tools/uncoded_frame$(EXESUF): $(FF_DEP_LIBS) tools/uncoded_frame$(EXESUF): ELIBS = $(FF_EXTRALIBS) diff --git a/tools/Makefile b/tools/Makefile index b347caf82a..370ee35416 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -5,6 +5,9 @@ TOOLS-$(CONFIG_ZLIB) += cws2fws tools/target_dec_%_fuzzer.o: tools/target_dec_fuzzer.c $(COMPILE_C) -DFFMPEG_DECODER=$* +tools/target_dem_fuzzer.o: tools/target_dem_fuzzer.c + $(COMPILE_C) + OUTDIRS += tools clean:: diff --git a/tools/target_dem_fuzzer.c b/tools/target_dem_fuzzer.c new file mode 100644 index 0000000000..b51c766878 --- /dev/null +++ b/tools/target_dem_fuzzer.c @@ -0,0 +1,163 @@ +/* + * 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 + */ + +#include "config.h" +#include "libavutil/avassert.h" + +#include "libavcodec/avcodec.h" +#include "libavcodec/bytestream.h" +#include "libavformat/avformat.h" + + +typedef struct IOContext { + int64_t pos; + int64_t filesize; + uint8_t *fuzz; + int fuzz_size; +} IOContext; + +int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size); + +static void error(const char *err) +{ + fprintf(stderr, "%s", err); + exit(1); +} + +static int io_read(void *opaque, uint8_t *buf, int buf_size) +{ + IOContext *c = opaque; + int size = FFMIN(buf_size, c->fuzz_size); + + if (!c->fuzz_size) { + c->filesize = FFMIN(c->pos, c->filesize); + return AVERROR_EOF; + } + + memcpy(buf, c->fuzz, size); + c->fuzz += size; + c->fuzz_size -= size; + c->pos += size; + c->filesize = FFMAX(c->filesize, c->pos); + + return size; +} + +static int64_t io_seek(void *opaque, int64_t offset, int whence) +{ + IOContext *c = opaque; + + if (whence == SEEK_CUR) { + if (offset > INT64_MAX - c->pos) + return -1; + offset += c->pos; + } else if (whence == SEEK_END) { + if (offset > INT64_MAX - c->filesize) + return -1; + offset += c->filesize; + } + if (offset < 0 || offset > c->filesize) + return -1; + c->pos = offset; + return 0; +} + +// Ensure we don't loop forever +const uint32_t maxiteration = 8096; + +static const uint64_t FUZZ_TAG = 0x4741542D5A5A5546ULL; + +int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { + const uint64_t fuzz_tag = FUZZ_TAG; + uint32_t it = 0; + AVFormatContext *avfmt = avformat_alloc_context(); + AVPacket pkt; + char filename[1025] = {0}; + AVIOContext *fuzzed_pb = NULL; + uint8_t *io_buffer; + int io_buffer_size = 32768; + int64_t filesize = size; + IOContext opaque; + static int c; + int seekable = 0; + int ret; + + if (!c) { + av_register_all(); + avcodec_register_all(); + av_log_set_level(AV_LOG_PANIC); + c=1; + } + + if (!avfmt) + error("Failed avformat_alloc_context()"); + + if (size > 2048) { + GetByteContext gbc; + memcpy (filename, data + size - 1024, 1024); + bytestream2_init(&gbc, data + size - 2048, 1024); + size -= 2048; + + io_buffer_size = bytestream2_get_le32(&gbc) & 0xFFFFFFF; + seekable = bytestream2_get_byte(&gbc) & 1; + filesize = bytestream2_get_le64(&gbc) & 0x7FFFFFFFFFFFFFFF; + } + io_buffer = av_malloc(io_buffer_size); + if (!io_buffer) + error("Failed to allocate io_buffer"); + + opaque.filesize = filesize; + opaque.pos = 0; + opaque.fuzz = data; + opaque.fuzz_size= size; + fuzzed_pb = avio_alloc_context(io_buffer, io_buffer_size, 0, &opaque, + io_read, NULL, seekable ? io_seek : NULL); + if (!fuzzed_pb) + error("avio_alloc_context failed"); + + avfmt->pb = fuzzed_pb; + + ret = avformat_open_input(&avfmt, filename, NULL, NULL); + if (ret < 0) { + av_freep(&fuzzed_pb->buffer); + av_freep(&fuzzed_pb); + avformat_free_context(avfmt); + return 0; + } + + ret = avformat_find_stream_info(avfmt, NULL); + if (ret < 0) + goto end; + + av_init_packet(&pkt); + + //TODO, test seeking + + for(it = 0; it < maxiteration; it++) { + ret = av_read_frame(avfmt, &pkt); + if (ret < 0) + break; + av_packet_unref(&pkt); + } +end: + av_freep(&fuzzed_pb->buffer); + av_freep(&fuzzed_pb); + avformat_close_input(&avfmt); + + return 0; +}

1 0

lavfi/showspatial: Remove two write-only variables.
by Carl Eugen Hoyos 31 May '19

31 May '19

ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg(a)gmail.com> | Fri May 31 22:30:46 2019 +0200| [d1b4ea2f61754ed3ba524520e53024a8ca34feae] | committer: Carl Eugen Hoyos lavfi/showspatial: Remove two write-only variables. Fixes two warnings: libavfilter/avf_showspatial.c:157:26: warning: variable ‘w’ set but not used libavfilter/avf_showspatial.c:157:23: warning: variable ‘h’ set but not used > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d1b4ea2f61754ed3b… --- libavfilter/avf_showspatial.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavfilter/avf_showspatial.c b/libavfilter/avf_showspatial.c index 5a7657f845..80109a3055 100644 --- a/libavfilter/avf_showspatial.c +++ b/libavfilter/avf_showspatial.c @@ -154,16 +154,13 @@ static int config_output(AVFilterLink *outlink) AVFilterContext *ctx = outlink->src; AVFilterLink *inlink = ctx->inputs[0]; ShowSpatialContext *s = ctx->priv; - int i, fft_bits, h, w; + int i, fft_bits; float overlap; outlink->w = s->w; outlink->h = s->h; outlink->sample_aspect_ratio = (AVRational){1,1}; - h = s->h; - w = s->w; - s->buf_size = 1 << av_log2(s->win_size); s->win_size = s->buf_size; fft_bits = av_log2(s->win_size);

1 0

avfilter: add showspatial multimedia filter
by Paul B Mahol 31 May '19

31 May '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Apr 30 16:44:28 2019 +0200| [b19550367fff8d8d77e94c4c5eaac42e70c61fc5] | committer: Paul B Mahol avfilter: add showspatial multimedia filter > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b19550367fff8d8d7… --- Changelog | 1 + doc/filters.texi | 52 ++++++ libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/avf_showspatial.c | 375 ++++++++++++++++++++++++++++++++++++++++++ libavfilter/version.h | 4 +- 6 files changed, 432 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index e6b209ae0a..1facc1fc46 100644 --- a/Changelog +++ b/Changelog @@ -30,6 +30,7 @@ version <next>: - colorhold filter - xmedian filter - asr filter +- showspatial multimedia filter version 4.1: diff --git a/doc/filters.texi b/doc/filters.texi index 4fdcfe919e..60df5bf35b 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -22248,6 +22248,58 @@ Set minimum amplitude used in @code{log} amplitude scaler. @end table +@section showspatial + +Convert stereo input audio to a video output, representing the spatial relationship +between two channels. + +The filter accepts the following options: + +@table @option +@item size, s +Specify the video size for the output. For the syntax of this option, check the +@ref{video size syntax,,"Video size" section in the ffmpeg-utils manual,ffmpeg-utils}. +Default value is @code{512x512}. + +@item win_size +Set window size. Allowed range is from @var{1024} to @var{65536}. Default size is @var{4096}. + +@item win_func +Set window function. + +It accepts the following values: +@table @samp +@item rect +@item bartlett +@item hann +@item hanning +@item hamming +@item blackman +@item welch +@item flattop +@item bharris +@item bnuttall +@item bhann +@item sine +@item nuttall +@item lanczos +@item gauss +@item tukey +@item dolph +@item cauchy +@item parzen +@item poisson +@item bohman +@end table + +Default value is @code{hann}. + +@item overlap +Set ratio of overlap window. Default value is @code{0.5}. +When value is @code{1} overlap is set to recommended size for specific +window function currently used. +@end table + @anchor{showspectrum} @section showspectrum diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 9a61c25b05..a99362b3ee 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -465,6 +465,7 @@ OBJS-$(CONFIG_AVECTORSCOPE_FILTER) += avf_avectorscope.o OBJS-$(CONFIG_CONCAT_FILTER) += avf_concat.o OBJS-$(CONFIG_SHOWCQT_FILTER) += avf_showcqt.o lswsutils.o lavfutils.o OBJS-$(CONFIG_SHOWFREQS_FILTER) += avf_showfreqs.o +OBJS-$(CONFIG_SHOWSPATIAL_FILTER) += avf_showspatial.o OBJS-$(CONFIG_SHOWSPECTRUM_FILTER) += avf_showspectrum.o OBJS-$(CONFIG_SHOWSPECTRUMPIC_FILTER) += avf_showspectrum.o OBJS-$(CONFIG_SHOWVOLUME_FILTER) += avf_showvolume.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 40534738ee..858ed1cf78 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -443,6 +443,7 @@ extern AVFilter ff_avf_avectorscope; extern AVFilter ff_avf_concat; extern AVFilter ff_avf_showcqt; extern AVFilter ff_avf_showfreqs; +extern AVFilter ff_avf_showspatial; extern AVFilter ff_avf_showspectrum; extern AVFilter ff_avf_showspectrumpic; extern AVFilter ff_avf_showvolume; diff --git a/libavfilter/avf_showspatial.c b/libavfilter/avf_showspatial.c new file mode 100644 index 0000000000..5a7657f845 --- /dev/null +++ b/libavfilter/avf_showspatial.c @@ -0,0 +1,375 @@ +/* + * 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 + */ + +#include <float.h> +#include <math.h> + +#include "libavcodec/avfft.h" +#include "libavutil/audio_fifo.h" +#include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" +#include "libavutil/opt.h" +#include "libavutil/parseutils.h" +#include "audio.h" +#include "video.h" +#include "avfilter.h" +#include "filters.h" +#include "internal.h" +#include "window_func.h" + +typedef struct ShowSpatialContext { + const AVClass *class; + int w, h; + AVRational frame_rate; + FFTContext *fft[2]; ///< Fast Fourier Transform context + FFTContext *ifft[2]; ///< Inverse Fast Fourier Transform context + int fft_bits; ///< number of bits (FFT window size = 1<<fft_bits) + FFTComplex *fft_data[2]; ///< bins holder for each (displayed) channels + float *window_func_lut; ///< Window function LUT + int win_func; + int win_size; + int buf_size; + float overlap; + int consumed; + int hop_size; + AVAudioFifo *fifo; + int64_t pts; +} ShowSpatialContext; + +#define OFFSET(x) offsetof(ShowSpatialContext, x) +#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM + +static const AVOption showspatial_options[] = { + { "size", "set video size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str = "512x512"}, 0, 0, FLAGS }, + { "s", "set video size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str = "512x512"}, 0, 0, FLAGS }, + { "win_size", "set window size", OFFSET(win_size), AV_OPT_TYPE_INT, {.i64 = 4096}, 1024, 65536, FLAGS }, + { "win_func", "set window function", OFFSET(win_func), AV_OPT_TYPE_INT, {.i64 = WFUNC_HANNING}, 0, NB_WFUNC-1, FLAGS, "win_func" }, + { "rect", "Rectangular", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_RECT}, 0, 0, FLAGS, "win_func" }, + { "bartlett", "Bartlett", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_BARTLETT}, 0, 0, FLAGS, "win_func" }, + { "hann", "Hann", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_HANNING}, 0, 0, FLAGS, "win_func" }, + { "hanning", "Hanning", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_HANNING}, 0, 0, FLAGS, "win_func" }, + { "hamming", "Hamming", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_HAMMING}, 0, 0, FLAGS, "win_func" }, + { "blackman", "Blackman", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_BLACKMAN}, 0, 0, FLAGS, "win_func" }, + { "welch", "Welch", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_WELCH}, 0, 0, FLAGS, "win_func" }, + { "flattop", "Flat-top", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_FLATTOP}, 0, 0, FLAGS, "win_func" }, + { "bharris", "Blackman-Harris", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_BHARRIS}, 0, 0, FLAGS, "win_func" }, + { "bnuttall", "Blackman-Nuttall", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_BNUTTALL}, 0, 0, FLAGS, "win_func" }, + { "bhann", "Bartlett-Hann", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_BHANN}, 0, 0, FLAGS, "win_func" }, + { "sine", "Sine", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_SINE}, 0, 0, FLAGS, "win_func" }, + { "nuttall", "Nuttall", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_NUTTALL}, 0, 0, FLAGS, "win_func" }, + { "lanczos", "Lanczos", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_LANCZOS}, 0, 0, FLAGS, "win_func" }, + { "gauss", "Gauss", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_GAUSS}, 0, 0, FLAGS, "win_func" }, + { "tukey", "Tukey", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_TUKEY}, 0, 0, FLAGS, "win_func" }, + { "dolph", "Dolph-Chebyshev", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_DOLPH}, 0, 0, FLAGS, "win_func" }, + { "cauchy", "Cauchy", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_CAUCHY}, 0, 0, FLAGS, "win_func" }, + { "parzen", "Parzen", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_PARZEN}, 0, 0, FLAGS, "win_func" }, + { "poisson", "Poisson", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_POISSON}, 0, 0, FLAGS, "win_func" }, + { "bohman", "Bohman", 0, AV_OPT_TYPE_CONST, {.i64=WFUNC_BOHMAN}, 0, 0, FLAGS, "win_func" }, + { "overlap", "set window overlap", OFFSET(overlap), AV_OPT_TYPE_FLOAT, {.dbl=0.5}, 0, 1, FLAGS }, + { NULL } +}; + +AVFILTER_DEFINE_CLASS(showspatial); + +static av_cold void uninit(AVFilterContext *ctx) +{ + ShowSpatialContext *s = ctx->priv; + int i; + + for (i = 0; i < 2; i++) + av_fft_end(s->fft[i]); + for (i = 0; i < 2; i++) + av_fft_end(s->ifft[i]); + for (i = 0; i < 2; i++) + av_freep(&s->fft_data[i]); + av_freep(&s->window_func_lut); + av_audio_fifo_free(s->fifo); +} + +static int query_formats(AVFilterContext *ctx) +{ + AVFilterFormats *formats = NULL; + AVFilterChannelLayouts *layout = NULL; + AVFilterLink *inlink = ctx->inputs[0]; + AVFilterLink *outlink = ctx->outputs[0]; + static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }; + static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_GBRP, AV_PIX_FMT_NONE }; + int ret; + + formats = ff_make_format_list(sample_fmts); + if ((ret = ff_formats_ref (formats, &inlink->out_formats )) < 0 || + (ret = ff_add_channel_layout (&layout, AV_CH_LAYOUT_STEREO )) < 0 || + (ret = ff_channel_layouts_ref (layout , &inlink->out_channel_layouts)) < 0) + return ret; + + formats = ff_all_samplerates(); + if ((ret = ff_formats_ref(formats, &inlink->out_samplerates)) < 0) + return ret; + + formats = ff_make_format_list(pix_fmts); + if ((ret = ff_formats_ref(formats, &outlink->in_formats)) < 0) + return ret; + + return 0; +} + +static int run_channel_fft(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) +{ + ShowSpatialContext *s = ctx->priv; + const float *window_func_lut = s->window_func_lut; + AVFrame *fin = arg; + const int ch = jobnr; + const float *p = (float *)fin->extended_data[ch]; + + for (int n = 0; n < fin->nb_samples; n++) { + s->fft_data[ch][n].re = p[n] * window_func_lut[n]; + s->fft_data[ch][n].im = 0; + } + + av_fft_permute(s->fft[ch], s->fft_data[ch]); + av_fft_calc(s->fft[ch], s->fft_data[ch]); + + return 0; +} + +static int config_output(AVFilterLink *outlink) +{ + AVFilterContext *ctx = outlink->src; + AVFilterLink *inlink = ctx->inputs[0]; + ShowSpatialContext *s = ctx->priv; + int i, fft_bits, h, w; + float overlap; + + outlink->w = s->w; + outlink->h = s->h; + outlink->sample_aspect_ratio = (AVRational){1,1}; + + h = s->h; + w = s->w; + + s->buf_size = 1 << av_log2(s->win_size); + s->win_size = s->buf_size; + fft_bits = av_log2(s->win_size); + + /* (re-)configuration if the video output changed (or first init) */ + if (fft_bits != s->fft_bits) { + s->fft_bits = fft_bits; + + /* FFT buffers: x2 for each channel buffer. + * Note: we use free and malloc instead of a realloc-like function to + * make sure the buffer is aligned in memory for the FFT functions. */ + for (i = 0; i < 2; i++) { + av_fft_end(s->fft[i]); + av_freep(&s->fft_data[i]); + } + for (i = 0; i < 2; i++) { + s->fft[i] = av_fft_init(fft_bits, 0); + if (!s->fft[i]) { + av_log(ctx, AV_LOG_ERROR, "Unable to create FFT context. " + "The window size might be too high.\n"); + return AVERROR(EINVAL); + } + } + + for (i = 0; i < 2; i++) { + s->fft_data[i] = av_calloc(s->buf_size, sizeof(**s->fft_data)); + if (!s->fft_data[i]) + return AVERROR(ENOMEM); + } + + /* pre-calc windowing function */ + s->window_func_lut = + av_realloc_f(s->window_func_lut, s->win_size, + sizeof(*s->window_func_lut)); + if (!s->window_func_lut) + return AVERROR(ENOMEM); + generate_window_func(s->window_func_lut, s->win_size, s->win_func, &overlap); + if (s->overlap == 1) + s->overlap = overlap; + + s->hop_size = (1.f - s->overlap) * s->win_size; + if (s->hop_size < 1) { + av_log(ctx, AV_LOG_ERROR, "overlap %f too big\n", s->overlap); + return AVERROR(EINVAL); + } + } + + outlink->time_base = av_inv_q(outlink->frame_rate); + + av_audio_fifo_free(s->fifo); + s->fifo = av_audio_fifo_alloc(inlink->format, inlink->channels, s->win_size); + if (!s->fifo) + return AVERROR(ENOMEM); + return 0; +} + +#define RE(y, ch) s->fft_data[ch][y].re +#define IM(y, ch) s->fft_data[ch][y].im + +static void draw_dot(uint8_t *dst, int linesize, int value) +{ + dst[0] = value; + dst[1] = value; + dst[-1] = value; + dst[linesize] = value; + dst[-linesize] = value; +} + +static int draw_spatial(AVFilterLink *inlink, AVFrame *insamples) +{ + AVFilterContext *ctx = inlink->dst; + AVFilterLink *outlink = ctx->outputs[0]; + ShowSpatialContext *s = ctx->priv; + AVFrame *outpicref; + int h = s->h - 2; + int w = s->w - 2; + int z = s->win_size / 2; + + outpicref = ff_get_video_buffer(outlink, outlink->w, outlink->h); + if (!outpicref) + return AVERROR(ENOMEM); + + outpicref->sample_aspect_ratio = (AVRational){1,1}; + for (int i = 0; i < outlink->h; i++) { + memset(outpicref->data[0] + i * outpicref->linesize[0], 0, outlink->w); + memset(outpicref->data[1] + i * outpicref->linesize[1], 0, outlink->w); + memset(outpicref->data[2] + i * outpicref->linesize[2], 0, outlink->w); + } + + for (int j = 0; j < z; j++) { + const int idx = z - 1 - j; + float l = hypotf(RE(idx, 0), IM(idx, 0)); + float r = hypotf(RE(idx, 1), IM(idx, 1)); + float sum = l + r; + float lp = atan2f(IM(idx, 0), RE(idx, 0)); + float rp = atan2f(IM(idx, 1), RE(idx, 1)); + float diffp = ((rp - lp) / (2.f * M_PI) + 1.f) * 0.5f; + float diff = (sum < 0.000001f ? 0.f : (r - l) / sum) * 0.5f + 0.5f; + float cr = av_clipf(cbrtf(l / sum), 0, 1) * 255.f; + float cb = av_clipf(cbrtf(r / sum), 0, 1) * 255.f; + float cg; + int x, y; + + cg = diffp * 255.f; + x = av_clip(w * diff, 0, w - 2) + 1; + y = av_clip(h * diffp, 0, h - 2) + 1; + + draw_dot(outpicref->data[0] + outpicref->linesize[0] * y + x, outpicref->linesize[0], cg); + draw_dot(outpicref->data[1] + outpicref->linesize[1] * y + x, outpicref->linesize[1], cb); + draw_dot(outpicref->data[2] + outpicref->linesize[2] * y + x, outpicref->linesize[2], cr); + } + + outpicref->pts = av_rescale_q(insamples->pts, inlink->time_base, outlink->time_base); + + return ff_filter_frame(outlink, outpicref); +} + +static int spatial_activate(AVFilterContext *ctx) +{ + AVFilterLink *inlink = ctx->inputs[0]; + AVFilterLink *outlink = ctx->outputs[0]; + ShowSpatialContext *s = ctx->priv; + int ret; + + FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); + + if (av_audio_fifo_size(s->fifo) < s->win_size) { + AVFrame *frame = NULL; + + ret = ff_inlink_consume_frame(inlink, &frame); + if (ret < 0) + return ret; + if (ret > 0) { + s->pts = frame->pts; + s->consumed = 0; + + av_audio_fifo_write(s->fifo, (void **)frame->extended_data, frame->nb_samples); + av_frame_free(&frame); + } + } + + if (av_audio_fifo_size(s->fifo) >= s->win_size) { + AVFrame *fin = ff_get_audio_buffer(inlink, s->win_size); + if (!fin) + return AVERROR(ENOMEM); + + fin->pts = s->pts + s->consumed; + s->consumed += s->hop_size; + ret = av_audio_fifo_peek(s->fifo, (void **)fin->extended_data, + FFMIN(s->win_size, av_audio_fifo_size(s->fifo))); + if (ret < 0) { + av_frame_free(&fin); + return ret; + } + + av_assert0(fin->nb_samples == s->win_size); + + ctx->internal->execute(ctx, run_channel_fft, fin, NULL, 2); + + ret = draw_spatial(inlink, fin); + + av_frame_free(&fin); + av_audio_fifo_drain(s->fifo, s->hop_size); + if (ret <= 0) + return ret; + } + + FF_FILTER_FORWARD_STATUS(inlink, outlink); + if (ff_outlink_frame_wanted(outlink) && av_audio_fifo_size(s->fifo) < s->win_size) { + ff_inlink_request_frame(inlink); + return 0; + } + + if (av_audio_fifo_size(s->fifo) >= s->win_size) { + ff_filter_set_ready(ctx, 10); + return 0; + } + return FFERROR_NOT_READY; +} + +static const AVFilterPad showspatial_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_AUDIO, + }, + { NULL } +}; + +static const AVFilterPad showspatial_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = config_output, + }, + { NULL } +}; + +AVFilter ff_avf_showspatial = { + .name = "showspatial", + .description = NULL_IF_CONFIG_SMALL("Convert input audio to a spatial video output."), + .uninit = uninit, + .query_formats = query_formats, + .priv_size = sizeof(ShowSpatialContext), + .inputs = showspatial_inputs, + .outputs = showspatial_outputs, + .activate = spatial_activate, + .priv_class = &showspatial_class, + .flags = AVFILTER_FLAG_SLICE_THREADS, +}; diff --git a/libavfilter/version.h b/libavfilter/version.h index 86103810f9..91a5a1604e 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,8 +30,8 @@ #include "libavutil/version.h" #define LIBAVFILTER_VERSION_MAJOR 7 -#define LIBAVFILTER_VERSION_MINOR 54 -#define LIBAVFILTER_VERSION_MICRO 101 +#define LIBAVFILTER_VERSION_MINOR 55 +#define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \

1 0

avcodec/tiff: Recognize DNG/CinemaDNG images
by Nick Renieris 30 May '19

30 May '19

ffmpeg | branch: master | Nick Renieris <velocityra(a)gmail.com> | Thu May 30 13:42:42 2019 +0300| [9c35285aea84be916ab19a1ed3627afaad461199] | committer: Paul B Mahol avcodec/tiff: Recognize DNG/CinemaDNG images Additionally: - Renamed TIFF_WHITE_LEVEL to DNG_WHITE_LEVEL since it is specified in the DNG spec. - Added/changed some comments to be more precise in differentiating between TIFF, TIFF/EP and DNG values. Related to ticket: https://trac.ffmpeg.org/ticket/4364 Signed-off-by: Nick Renieris <velocityra(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9c35285aea84be916… --- libavcodec/tiff.c | 30 +++++++++++++++++++++++++++++- libavcodec/tiff.h | 36 +++++++++++++++++++++++++++++++----- libavformat/img2.c | 1 + 3 files changed, 61 insertions(+), 6 deletions(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 3a3f68fa94..c520d7df83 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -58,6 +58,7 @@ typedef struct TiffContext { uint16_t get_page; int get_thumbnail; + enum TiffType tiff_type; int width, height; unsigned int bpp, bppcount; uint32_t palette[256]; @@ -96,6 +97,11 @@ typedef struct TiffContext { TiffGeoTag *geotags; } TiffContext; +static void tiff_set_type(TiffContext *s, enum TiffType tiff_type) { + if (s->tiff_type < tiff_type) // Prioritize higher-valued entries + s->tiff_type = tiff_type; +} + static void free_geotags(TiffContext *const s) { int i; @@ -1095,7 +1101,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) else if (count > 1) s->sub_ifd = ff_tget(&s->gb, TIFF_LONG, s->le); /** Only get the first SubIFD */ break; - case TIFF_WHITE_LEVEL: + case DNG_WHITE_LEVEL: s->white_level = value; break; case TIFF_CFA_PATTERN_DIM: @@ -1346,6 +1352,27 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) case TIFF_SOFTWARE_NAME: ADD_METADATA(count, "software", NULL); break; + case DNG_VERSION: + if (count == 4) { + unsigned int ver[4]; + ver[0] = ff_tget(&s->gb, type, s->le); + ver[1] = ff_tget(&s->gb, type, s->le); + ver[2] = ff_tget(&s->gb, type, s->le); + ver[3] = ff_tget(&s->gb, type, s->le); + + av_log(s->avctx, AV_LOG_DEBUG, "DNG file, version %u.%u.%u.%u\n", + ver[0], ver[1], ver[2], ver[3]); + + tiff_set_type(s, TIFF_TYPE_DNG); + } + break; + case CINEMADNG_TIME_CODES: + case CINEMADNG_FRAME_RATE: + case CINEMADNG_T_STOP: + case CINEMADNG_REEL_NAME: + case CINEMADNG_CAMERA_LABEL: + tiff_set_type(s, TIFF_TYPE_CINEMADNG); + break; default: if (s->avctx->err_recognition & AV_EF_EXPLODE) { av_log(s->avctx, AV_LOG_ERROR, @@ -1402,6 +1429,7 @@ again: s->white_level = 0; s->is_bayer = 0; s->cur_page = 0; + s->tiff_type = TIFF_TYPE_TIFF; free_geotags(s); // Reset these offsets so we can tell if they were set this frame diff --git a/libavcodec/tiff.h b/libavcodec/tiff.h index 4b08650108..81913c6b1a 100644 --- a/libavcodec/tiff.h +++ b/libavcodec/tiff.h @@ -20,7 +20,7 @@ /** * @file - * TIFF tables + * TIFF constants & data structures * * For more information about the TIFF format, check the official docs at: * http://partners.adobe.com/public/developer/tiff/index.html @@ -33,7 +33,17 @@ #include <stdint.h> #include "tiff_common.h" -/** abridged list of TIFF tags */ +/** TIFF types in ascenting priority (last in the list is highest) */ +enum TiffType { + /** TIFF image based on the TIFF 6.0 or TIFF/EP (ISO 12234-2) specifications */ + TIFF_TYPE_TIFF, + /** Digital Negative (DNG) image */ + TIFF_TYPE_DNG, + /** Digital Negative (DNG) image part of an CinemaDNG image sequence */ + TIFF_TYPE_CINEMADNG, +}; + +/** abridged list of TIFF and TIFF/EP tags */ enum TiffTags { TIFF_SUBFILE = 0xfe, TIFF_WIDTH = 0x100, @@ -85,10 +95,25 @@ enum TiffTags { TIFF_GEO_KEY_DIRECTORY = 0x87AF, TIFF_GEO_DOUBLE_PARAMS = 0x87B0, TIFF_GEO_ASCII_PARAMS = 0x87B1, - TIFF_WHITE_LEVEL = 0xC61D, }; -/** list of TIFF compression types */ +/** abridged list of DNG tags */ +enum DngTags { + DNG_VERSION = 0xC612, + DNG_BACKWARD_VERSION = 0xC613, + DNG_WHITE_LEVEL = 0xC61D, +}; + +/** list of CinemaDNG tags */ +enum CinemaDngTags { + CINEMADNG_TIME_CODES = 0xC763, + CINEMADNG_FRAME_RATE = 0xC764, + CINEMADNG_T_STOP = 0xC772, + CINEMADNG_REEL_NAME = 0xC789, + CINEMADNG_CAMERA_LABEL = 0xC7A1, +}; + +/** list of TIFF, TIFF/EP and DNG compression types */ enum TiffCompr { TIFF_RAW = 1, TIFF_CCITT_RLE, @@ -151,6 +176,7 @@ enum TiffGeoTagKey { TIFF_VERTICAL_UNITS_GEOKEY = 4099 }; +/** list of TIFF, TIFF/AP and DNG PhotometricInterpretation (TIFF_PHOTOMETRIC) values */ enum TiffPhotometric { TIFF_PHOTOMETRIC_NONE = -1, TIFF_PHOTOMETRIC_WHITE_IS_ZERO, /* mono or grayscale, 0 is white */ @@ -163,7 +189,7 @@ enum TiffPhotometric { TIFF_PHOTOMETRIC_CIE_LAB = 8, /* 1976 CIE L*a*b* */ TIFF_PHOTOMETRIC_ICC_LAB, /* ICC L*a*b* */ TIFF_PHOTOMETRIC_ITU_LAB, /* ITU L*a*b* */ - TIFF_PHOTOMETRIC_CFA = 32803, /* Color Filter Array (DNG) */ + TIFF_PHOTOMETRIC_CFA = 32803, /* Color Filter Array (TIFF/AP and DNG) */ TIFF_PHOTOMETRIC_LOG_L = 32844, /* CIE Log2(L) */ TIFF_PHOTOMETRIC_LOG_LUV, /* CIE Log L*u*v* */ TIFF_PHOTOMETRIC_LINEAR_RAW = 34892, /* Linear Raw (DNG) */ diff --git a/libavformat/img2.c b/libavformat/img2.c index 8432cc0955..16bc9d2abd 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -51,6 +51,7 @@ const IdStrMap ff_img_tags[] = { { AV_CODEC_ID_TARGA, "tga" }, { AV_CODEC_ID_TIFF, "tiff" }, { AV_CODEC_ID_TIFF, "tif" }, + { AV_CODEC_ID_TIFF, "dng" }, { AV_CODEC_ID_SGI, "sgi" }, { AV_CODEC_ID_PTX, "ptx" }, { AV_CODEC_ID_PCX, "pcx" },

1 0

libavcodec/tiff: Process SubIFDs tag with multiple entries
by Nick Renieris 30 May '19

30 May '19

ffmpeg | branch: master | Nick Renieris <velocityra(a)gmail.com> | Thu May 30 13:42:41 2019 +0300| [661facb8a89a2712b67da221f0176a42382c9827] | committer: Paul B Mahol libavcodec/tiff: Process SubIFDs tag with multiple entries SubIFDs that were part of more than single-sized "SubIFDs" tags were being ignored due to existing code ignoring that case. This patch makes is so the first entry is read, which is not ideal but enough for some DNG images present in the wild to be decodeable More specifically, the first SubIFD which we would process with this patch is the main image and the second one is a second thumbnail, which is not as important to decode. In DNG images with the .tiff extension, it solves the issue where the TIFF thumbnail in IFD 0 was incorrectly parsed (related confusion: [1]). Embedded thumbnails for DNG images can still be decoded with the "-thumbnail" option. Related to ticket: https://trac.ffmpeg.org/ticket/4364 [1]: https://superuser.com/questions/546879/creating-video-from-dng-images-with-… Signed-off-by: Nick Renieris <velocityra(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=661facb8a89a2712b… --- libavcodec/tiff.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 6e15d00310..3a3f68fa94 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -1090,7 +1090,10 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) s->predictor = value; break; case TIFF_SUB_IFDS: - s->sub_ifd = value; + if (count == 1) + s->sub_ifd = value; + else if (count > 1) + s->sub_ifd = ff_tget(&s->gb, TIFF_LONG, s->le); /** Only get the first SubIFD */ break; case TIFF_WHITE_LEVEL: s->white_level = value;

1 0

avcodec/tiff: Option to decode embedded thumbnail
by Nick Renieris 30 May '19

30 May '19

ffmpeg | branch: master | Nick Renieris <velocityra(a)gmail.com> | Thu May 30 13:42:40 2019 +0300| [a7e018b05e0ec99a466b20c797785620645e5d3a] | committer: Paul B Mahol avcodec/tiff: Option to decode embedded thumbnail Adds the "-thumbnail" option, that works like the current "-subifd" option, but only for non-full-sized images. This is particularly useful for DNG images (see next commit) that have SubIFDs that are not necessarily thumbnails. Signed-off-by: Nick Renieris <velocityra(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a7e018b05e0ec99a4… --- libavcodec/tiff.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 79e6242549..6e15d00310 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -56,6 +56,7 @@ typedef struct TiffContext { int get_subimage; uint16_t get_page; + int get_thumbnail; int width, height; unsigned int bpp, bppcount; @@ -70,6 +71,7 @@ typedef struct TiffContext { int predictor; int fill_order; uint32_t res[4]; + int is_thumbnail; int is_bayer; uint8_t pattern[4]; @@ -948,6 +950,8 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) } switch (tag) { + case TIFF_SUBFILE: + s->is_thumbnail = (value != 0); case TIFF_WIDTH: s->width = value; break; @@ -1387,6 +1391,7 @@ static int decode_frame(AVCodecContext *avctx, s->le = le; // TIFF_BPP is not a required tag and defaults to 1 again: + s->is_thumbnail = 0; s->bppcount = s->bpp = 1; s->photometric = TIFF_PHOTOMETRIC_NONE; s->compr = TIFF_RAW; @@ -1408,9 +1413,14 @@ again: return ret; } - /** whether we should look for this IFD's SubIFD */ - retry_for_subifd = s->sub_ifd && s->get_subimage; - /** whether we should look for this multi-page IFD's next page */ + if (s->get_thumbnail && !s->is_thumbnail) { + av_log(avctx, AV_LOG_INFO, "No embedded thumbnail present\n"); + return AVERROR_EOF; + } + + /** whether we should process this IFD's SubIFD */ + retry_for_subifd = s->sub_ifd && (s->get_subimage || (!s->get_thumbnail && s->is_thumbnail)); + /** whether we should process this multi-page IFD's next page */ retry_for_page = s->get_page && s->cur_page + 1 < s->get_page; // get_page is 1-indexed if (retry_for_page) { @@ -1670,6 +1680,7 @@ static av_cold int tiff_end(AVCodecContext *avctx) #define OFFSET(x) offsetof(TiffContext, x) static const AVOption tiff_options[] = { { "subimage", "decode subimage instead if available", OFFSET(get_subimage), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_VIDEO_PARAM }, + { "thumbnail", "decode embedded thumbnail subimage instead if available", OFFSET(get_thumbnail), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_VIDEO_PARAM }, { "page", "page number of multi-page image to decode (starting from 1)", OFFSET(get_page), AV_OPT_TYPE_INT, {.i64=0}, 0, UINT16_MAX, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_VIDEO_PARAM }, { NULL }, };

1 0

lavf/qsvvpp: avoid the double-free when working in sys memory mode
by Linjie Fu 30 May '19

30 May '19

ffmpeg | branch: master | Linjie Fu <linjie.fu(a)intel.com> | Mon Apr 15 21:24:06 2019 +0800| [6895b350c31d8fda5bd9e4285c52de6e391e7ff4] | committer: Zhong Li lavf/qsvvpp: avoid the double-free when working in sys memory mode Currently, picref will be freed by calling av_frame_free(&picref) in submit_frame() in qsvvpp.c when working in system memory mode,and normally it is freed in filter_frame() in vf_vpp_qsv.c when working in other modes. Double free happens when working in system memory mode, remove to fix the memory issue. Reproduce: ffmpeg -init_hw_device qsv=foo -filter_hw_device foo -f rawvideo -pix_fmt nv12 -s:v 852x480 \ -i 852x480.nv12 -vf 'vpp_qsv=w=500:h=400' -f rawvideo -pix_fmt nv12 qsv.nv12 Signed-off-by: Linjie Fu <linjie.fu(a)intel.com> Signed-off-by: Zhong Li <zhong.li(a)intel.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6895b350c31d8fda5… --- libavfilter/qsvvpp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c index 06efdf5089..5cd1d5d345 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -316,7 +316,6 @@ static QSVFrame *submit_frame(QSVVPPContext *s, AVFilterLink *inlink, AVFrame *p } av_frame_copy_props(qsv_frame->frame, picref); - av_frame_free(&picref); } else qsv_frame->frame = av_frame_clone(picref);

1 0

avformat/gif: abort early if nothing was written yet
by Paul B Mahol 29 May '19

29 May '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed May 29 10:57:18 2019 +0200| [02333fe394f0c15b1e8bbd3399316578ee8c2334] | committer: Paul B Mahol avformat/gif: abort early if nothing was written yet Fixes crash when writting trailer without any previous packets. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=02333fe394f0c15b1… --- libavformat/gif.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/gif.c b/libavformat/gif.c index 7916ba1e6b..e125d386bd 100644 --- a/libavformat/gif.c +++ b/libavformat/gif.c @@ -174,6 +174,9 @@ static int gif_write_trailer(AVFormatContext *s) GIFContext *gif = s->priv_data; AVIOContext *pb = s->pb; + if (!gif->prev_pkt) + return AVERROR(EINVAL); + gif_write_packet(s, NULL); if (!gif->have_end)

1 0

avcodec/cbs_mpeg2: fix leak of extra_information_slice buffer in cbs_mpeg2_read_slice_header()
by James Almer 28 May '19

28 May '19

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed May 22 03:04:38 2019 +0200| [d903c09d9a5c641223f0810d24161520e977544a] | committer: Mark Thompson avcodec/cbs_mpeg2: fix leak of extra_information_slice buffer in cbs_mpeg2_read_slice_header() cbs_mpeg2_free_slice() calls av_buffer_unref() on extra_information_ref, meaning allocating with av_malloc() was not the intention. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d903c09d9a5c64122… --- libavcodec/cbs_mpeg2_syntax_template.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/cbs_mpeg2_syntax_template.c b/libavcodec/cbs_mpeg2_syntax_template.c index d753cdc901..e0cf716874 100644 --- a/libavcodec/cbs_mpeg2_syntax_template.c +++ b/libavcodec/cbs_mpeg2_syntax_template.c @@ -377,10 +377,11 @@ static int FUNC(slice_header)(CodedBitstreamContext *ctx, RWContext *rw, current->extra_information_length = k; if (k > 0) { *rw = start; - current->extra_information = - av_malloc(current->extra_information_length); - if (!current->extra_information) + current->extra_information_ref = + av_buffer_alloc(current->extra_information_length); + if (!current->extra_information_ref) return AVERROR(ENOMEM); + current->extra_information = current->extra_information_ref->data; for (k = 0; k < current->extra_information_length; k++) { xui(1, extra_bit_slice, bit, 1, 1, 0); xui(8, extra_information_slice[k],

1 0