January 2021 - ffmpeg-cvslog - lists.ffmpeg.org

avformat/rtpdec: Avoid allocations of small dynamic buffers
by Andreas Rheinhardt 31 Jan '21

31 Jan '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Wed Jan 27 15:57:19 2021 +0100| [ad2cc0e2f41f3be59e8c7c1a0ab5c813d7073643] | committer: Andreas Rheinhardt avformat/rtpdec: Avoid allocations of small dynamic buffers Besides avoiding allocations this also fixes a design defect of ff_rtp_send_punch_packets: It did not return an error in case of these allocations failed. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ad2cc0e2f41f3be59… --- libavformat/rtpdec.c | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index f40c020c33..d592e34893 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -404,38 +404,26 @@ int ff_rtp_check_and_send_back_rr(RTPDemuxContext *s, URLContext *fd, void ff_rtp_send_punch_packets(URLContext *rtp_handle) { - AVIOContext *pb; - uint8_t *buf; - int len; + uint8_t buf[RTP_MIN_PACKET_LENGTH], *ptr = buf; /* Send a small RTP packet */ - if (avio_open_dyn_buf(&pb) < 0) - return; - avio_w8(pb, (RTP_VERSION << 6)); - avio_w8(pb, 0); /* Payload type */ - avio_wb16(pb, 0); /* Seq */ - avio_wb32(pb, 0); /* Timestamp */ - avio_wb32(pb, 0); /* SSRC */ + bytestream_put_byte(&ptr, (RTP_VERSION << 6)); + bytestream_put_byte(&ptr, 0); /* Payload type */ + bytestream_put_be16(&ptr, 0); /* Seq */ + bytestream_put_be32(&ptr, 0); /* Timestamp */ + bytestream_put_be32(&ptr, 0); /* SSRC */ - len = avio_close_dyn_buf(pb, &buf); - if ((len > 0) && buf) - ffurl_write(rtp_handle, buf, len); - av_free(buf); + ffurl_write(rtp_handle, buf, ptr - buf); /* Send a minimal RTCP RR */ - if (avio_open_dyn_buf(&pb) < 0) - return; + ptr = buf; + bytestream_put_byte(&ptr, (RTP_VERSION << 6)); + bytestream_put_byte(&ptr, RTCP_RR); /* receiver report */ + bytestream_put_be16(&ptr, 1); /* length in words - 1 */ + bytestream_put_be32(&ptr, 0); /* our own SSRC */ - avio_w8(pb, (RTP_VERSION << 6)); - avio_w8(pb, RTCP_RR); /* receiver report */ - avio_wb16(pb, 1); /* length in words - 1 */ - avio_wb32(pb, 0); /* our own SSRC */ - - len = avio_close_dyn_buf(pb, &buf); - if ((len > 0) && buf) - ffurl_write(rtp_handle, buf, len); - av_free(buf); + ffurl_write(rtp_handle, buf, ptr - buf); } static int find_missing_packets(RTPDemuxContext *s, uint16_t *first_missing,

1 0

avfilter/vf_vibrance: add packed formats support
by Paul B Mahol 31 Jan '21

31 Jan '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Jan 31 20:52:22 2021 +0100| [459c6e8ab332718a705213d7bbff98bd0f48a786] | committer: Paul B Mahol avfilter/vf_vibrance: add packed formats support > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=459c6e8ab332718a7… --- libavfilter/vf_vibrance.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) diff --git a/libavfilter/vf_vibrance.c b/libavfilter/vf_vibrance.c index 8e1a55caca..edea521b16 100644 --- a/libavfilter/vf_vibrance.c +++ b/libavfilter/vf_vibrance.c @@ -21,10 +21,15 @@ #include "libavutil/opt.h" #include "libavutil/imgutils.h" #include "avfilter.h" +#include "drawutils.h" #include "formats.h" #include "internal.h" #include "video.h" +#define R 0 +#define G 1 +#define B 2 + typedef struct VibranceContext { const AVClass *class; @@ -33,7 +38,9 @@ typedef struct VibranceContext { float lcoeffs[3]; int alternate; + int step; int depth; + uint8_t rgba_map[4]; int (*do_slice)(AVFilterContext *s, void *arg, int jobnr, int nb_jobs); @@ -160,6 +167,118 @@ static int vibrance_slice16(AVFilterContext *avctx, void *arg, int jobnr, int nb return 0; } +static int vibrance_slice8p(AVFilterContext *avctx, void *arg, int jobnr, int nb_jobs) +{ + VibranceContext *s = avctx->priv; + AVFrame *frame = arg; + const int step = s->step; + const int width = frame->width; + const int height = frame->height; + const float scale = 1.f / 255.f; + const float gc = s->lcoeffs[0]; + const float bc = s->lcoeffs[1]; + const float rc = s->lcoeffs[2]; + const uint8_t roffset = s->rgba_map[R]; + const uint8_t goffset = s->rgba_map[G]; + const uint8_t boffset = s->rgba_map[B]; + const float intensity = s->intensity; + const float alternate = s->alternate ? 1.f : -1.f; + const float gintensity = intensity * s->balance[0]; + const float bintensity = intensity * s->balance[1]; + const float rintensity = intensity * s->balance[2]; + const float sgintensity = alternate * FFSIGN(gintensity); + const float sbintensity = alternate * FFSIGN(bintensity); + const float srintensity = alternate * FFSIGN(rintensity); + const int slice_start = (height * jobnr) / nb_jobs; + const int slice_end = (height * (jobnr + 1)) / nb_jobs; + const int linesize = frame->linesize[0]; + uint8_t *ptr = frame->data[0] + slice_start * linesize; + + for (int y = slice_start; y < slice_end; y++) { + for (int x = 0; x < width; x++) { + float g = ptr[x * step + goffset] * scale; + float b = ptr[x * step + boffset] * scale; + float r = ptr[x * step + roffset] * scale; + float max_color = FFMAX3(r, g, b); + float min_color = FFMIN3(r, g, b); + float color_saturation = max_color - min_color; + float luma = g * gc + r * rc + b * bc; + const float cg = 1.f + gintensity * (1.f - sgintensity * color_saturation); + const float cb = 1.f + bintensity * (1.f - sbintensity * color_saturation); + const float cr = 1.f + rintensity * (1.f - srintensity * color_saturation); + + g = lerpf(luma, g, cg); + b = lerpf(luma, b, cb); + r = lerpf(luma, r, cr); + + ptr[x * step + goffset] = av_clip_uint8(g * 255.f); + ptr[x * step + boffset] = av_clip_uint8(b * 255.f); + ptr[x * step + roffset] = av_clip_uint8(r * 255.f); + } + + ptr += linesize; + } + + return 0; +} + +static int vibrance_slice16p(AVFilterContext *avctx, void *arg, int jobnr, int nb_jobs) +{ + VibranceContext *s = avctx->priv; + AVFrame *frame = arg; + const int step = s->step; + const int depth = s->depth; + const float max = (1 << depth) - 1; + const float scale = 1.f / max; + const float gc = s->lcoeffs[0]; + const float bc = s->lcoeffs[1]; + const float rc = s->lcoeffs[2]; + const uint8_t roffset = s->rgba_map[R]; + const uint8_t goffset = s->rgba_map[G]; + const uint8_t boffset = s->rgba_map[B]; + const int width = frame->width; + const int height = frame->height; + const float intensity = s->intensity; + const float alternate = s->alternate ? 1.f : -1.f; + const float gintensity = intensity * s->balance[0]; + const float bintensity = intensity * s->balance[1]; + const float rintensity = intensity * s->balance[2]; + const float sgintensity = alternate * FFSIGN(gintensity); + const float sbintensity = alternate * FFSIGN(bintensity); + const float srintensity = alternate * FFSIGN(rintensity); + const int slice_start = (height * jobnr) / nb_jobs; + const int slice_end = (height * (jobnr + 1)) / nb_jobs; + const int linesize = frame->linesize[0] / 2; + uint16_t *ptr = (uint16_t *)frame->data[0] + slice_start * linesize; + + for (int y = slice_start; y < slice_end; y++) { + for (int x = 0; x < width; x++) { + float g = ptr[x * step + goffset] * scale; + float b = ptr[x * step + boffset] * scale; + float r = ptr[x * step + roffset] * scale; + float max_color = FFMAX3(r, g, b); + float min_color = FFMIN3(r, g, b); + float color_saturation = max_color - min_color; + float luma = g * gc + r * rc + b * bc; + const float cg = 1.f + gintensity * (1.f - sgintensity * color_saturation); + const float cb = 1.f + bintensity * (1.f - sbintensity * color_saturation); + const float cr = 1.f + rintensity * (1.f - srintensity * color_saturation); + + g = lerpf(luma, g, cg); + b = lerpf(luma, b, cb); + r = lerpf(luma, r, cr); + + ptr[x * step + goffset] = av_clip_uintp2_c(g * max, depth); + ptr[x * step + boffset] = av_clip_uintp2_c(b * max, depth); + ptr[x * step + roffset] = av_clip_uintp2_c(r * max, depth); + } + + ptr += linesize; + } + + return 0; +} + static int filter_frame(AVFilterLink *link, AVFrame *frame) { AVFilterContext *avctx = link->dst; @@ -176,10 +295,17 @@ static int filter_frame(AVFilterLink *link, AVFrame *frame) static av_cold int query_formats(AVFilterContext *avctx) { static const enum AVPixelFormat pixel_fmts[] = { + AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, + AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA, + AV_PIX_FMT_ARGB, AV_PIX_FMT_ABGR, + AV_PIX_FMT_0RGB, AV_PIX_FMT_0BGR, + AV_PIX_FMT_RGB0, AV_PIX_FMT_BGR0, AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRP9, 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_RGB48, AV_PIX_FMT_BGR48, + AV_PIX_FMT_RGBA64, AV_PIX_FMT_BGRA64, AV_PIX_FMT_NONE }; @@ -197,9 +323,21 @@ static av_cold int config_input(AVFilterLink *inlink) AVFilterContext *avctx = inlink->dst; VibranceContext *s = avctx->priv; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); + int planar = desc->flags & AV_PIX_FMT_FLAG_PLANAR; + + s->step = desc->nb_components; + if (inlink->format == AV_PIX_FMT_RGB0 || + inlink->format == AV_PIX_FMT_0RGB || + inlink->format == AV_PIX_FMT_BGR0 || + inlink->format == AV_PIX_FMT_0BGR) + s->step = 4; s->depth = desc->comp[0].depth; s->do_slice = s->depth <= 8 ? vibrance_slice8 : vibrance_slice16; + if (!planar) + s->do_slice = s->depth <= 8 ? vibrance_slice8p : vibrance_slice16p; + + ff_fill_rgba_map(s->rgba_map, inlink->format); return 0; }

1 0

avfilter/vf_colortemperature: add packed formats support
by Paul B Mahol 31 Jan '21

31 Jan '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Jan 31 20:39:45 2021 +0100| [98b0c0e44f0ba9e3e2fd39c3f4167f2f84a396fa] | committer: Paul B Mahol avfilter/vf_colortemperature: add packed formats support > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=98b0c0e44f0ba9e3e… --- libavfilter/vf_colortemperature.c | 107 +++++++++++++++++++++++++++++++++++++- 1 file changed, 106 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_colortemperature.c b/libavfilter/vf_colortemperature.c index f2026c6fca..7be5e796e6 100644 --- a/libavfilter/vf_colortemperature.c +++ b/libavfilter/vf_colortemperature.c @@ -23,10 +23,15 @@ #include "libavutil/opt.h" #include "libavutil/imgutils.h" #include "avfilter.h" +#include "drawutils.h" #include "formats.h" #include "internal.h" #include "video.h" +#define R 0 +#define G 1 +#define B 2 + typedef struct ColorTemperatureContext { const AVClass *class; @@ -36,7 +41,9 @@ typedef struct ColorTemperatureContext { float color[3]; + int step; int depth; + uint8_t rgba_map[4]; int (*do_slice)(AVFilterContext *s, void *arg, int jobnr, int nb_jobs); @@ -177,6 +184,85 @@ static int temperature_slice16(AVFilterContext *ctx, void *arg, int jobnr, int n return 0; } +static int temperature_slice8p(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) +{ + ColorTemperatureContext *s = ctx->priv; + AVFrame *frame = arg; + const int step = s->step; + const int width = frame->width; + const int height = frame->height; + const float mix = s->mix; + const float preserve = s->preserve; + const float *color = s->color; + const uint8_t roffset = s->rgba_map[R]; + const uint8_t goffset = s->rgba_map[G]; + const uint8_t boffset = s->rgba_map[B]; + const int slice_start = (height * jobnr) / nb_jobs; + const int slice_end = (height * (jobnr + 1)) / nb_jobs; + const int linesize = frame->linesize[0]; + uint8_t *ptr = frame->data[0] + slice_start * linesize; + + for (int y = slice_start; y < slice_end; y++) { + for (int x = 0; x < width; x++) { + float g = ptr[x * step + goffset]; + float b = ptr[x * step + boffset]; + float r = ptr[x * step + roffset]; + float nr, ng, nb; + float l0, l1, l; + + PROCESS() + + ptr[x * step + goffset] = av_clip_uint8(ng); + ptr[x * step + boffset] = av_clip_uint8(nb); + ptr[x * step + roffset] = av_clip_uint8(nr); + } + + ptr += linesize; + } + + return 0; +} + +static int temperature_slice16p(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) +{ + ColorTemperatureContext *s = ctx->priv; + AVFrame *frame = arg; + const int step = s->step; + const int depth = s->depth; + const int width = frame->width; + const int height = frame->height; + const float preserve = s->preserve; + const float mix = s->mix; + const float *color = s->color; + const uint8_t roffset = s->rgba_map[R]; + const uint8_t goffset = s->rgba_map[G]; + const uint8_t boffset = s->rgba_map[B]; + const int slice_start = (height * jobnr) / nb_jobs; + const int slice_end = (height * (jobnr + 1)) / nb_jobs; + const int linesize = frame->linesize[0] / sizeof(uint16_t); + uint16_t *ptr = (uint16_t *)frame->data[0] + slice_start * linesize; + + for (int y = slice_start; y < slice_end; y++) { + for (int x = 0; x < width; x++) { + float g = ptr[x * step + goffset]; + float b = ptr[x * step + boffset]; + float r = ptr[x * step + roffset]; + float nr, ng, nb; + float l0, l1, l; + + PROCESS() + + ptr[x * step + goffset] = av_clip_uintp2_c(ng, depth); + ptr[x * step + boffset] = av_clip_uintp2_c(nb, depth); + ptr[x * step + roffset] = av_clip_uintp2_c(nr, depth); + } + + ptr += linesize; + } + + return 0; +} + static int filter_frame(AVFilterLink *inlink, AVFrame *frame) { AVFilterContext *ctx = inlink->dst; @@ -193,10 +279,17 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) static av_cold int query_formats(AVFilterContext *ctx) { static const enum AVPixelFormat pixel_fmts[] = { + AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, + AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA, + AV_PIX_FMT_ARGB, AV_PIX_FMT_ABGR, + AV_PIX_FMT_0RGB, AV_PIX_FMT_0BGR, + AV_PIX_FMT_RGB0, AV_PIX_FMT_BGR0, AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRP9, 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_RGB48, AV_PIX_FMT_BGR48, + AV_PIX_FMT_RGBA64, AV_PIX_FMT_BGRA64, AV_PIX_FMT_NONE }; @@ -214,9 +307,21 @@ static av_cold int config_input(AVFilterLink *inlink) AVFilterContext *ctx = inlink->dst; ColorTemperatureContext *s = ctx->priv; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); + int planar = desc->flags & AV_PIX_FMT_FLAG_PLANAR; + + s->step = desc->nb_components; + if (inlink->format == AV_PIX_FMT_RGB0 || + inlink->format == AV_PIX_FMT_0RGB || + inlink->format == AV_PIX_FMT_BGR0 || + inlink->format == AV_PIX_FMT_0BGR) + s->step = 4; s->depth = desc->comp[0].depth; s->do_slice = s->depth <= 8 ? temperature_slice8 : temperature_slice16; + if (!planar) + s->do_slice = s->depth <= 8 ? temperature_slice8p : temperature_slice16p; + + ff_fill_rgba_map(s->rgba_map, inlink->format); return 0; } @@ -244,7 +349,7 @@ static const AVFilterPad outputs[] = { #define VF AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_RUNTIME_PARAM static const AVOption colortemperature_options[] = { - { "temperature", "set the temperature in Kelvins", OFFSET(temperature), AV_OPT_TYPE_FLOAT, {.dbl=6500}, 1000, 40000, VF }, + { "temperature", "set the temperature in Kelvin", OFFSET(temperature), AV_OPT_TYPE_FLOAT, {.dbl=6500}, 1000, 40000, VF }, { "mix", "set the mix with filtered output", OFFSET(mix), AV_OPT_TYPE_FLOAT, {.dbl=1}, 0, 1, VF }, { "pl", "set the amount of preserving lightness", OFFSET(preserve), AV_OPT_TYPE_FLOAT, {.dbl=0}, 0, 1, VF }, { NULL }

1 0

avfilter/vf_colortemperature: use macro for identical code
by Paul B Mahol 31 Jan '21

31 Jan '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Jan 31 20:24:04 2021 +0100| [aa8cf8fdee415106e55e19a81599a4d8e6c51a1f] | committer: Paul B Mahol avfilter/vf_colortemperature: use macro for identical code > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aa8cf8fdee415106e… --- libavfilter/vf_colortemperature.c | 61 +++++++++++++++------------------------ 1 file changed, 23 insertions(+), 38 deletions(-) diff --git a/libavfilter/vf_colortemperature.c b/libavfilter/vf_colortemperature.c index 0466573e96..f2026c6fca 100644 --- a/libavfilter/vf_colortemperature.c +++ b/libavfilter/vf_colortemperature.c @@ -73,6 +73,27 @@ static float lerpf(float v0, float v1, float f) return v0 + (v1 - v0) * f; } +#define PROCESS() \ + nr = r * color[0]; \ + ng = g * color[1]; \ + nb = b * color[2]; \ + \ + nr = lerpf(r, nr, mix); \ + ng = lerpf(g, ng, mix); \ + nb = lerpf(b, nb, mix); \ + \ + l0 = (FFMAX3(r, g, b) + FFMIN3(r, g, b)) + FLT_EPSILON; \ + l1 = (FFMAX3(nr, ng, nb) + FFMIN3(nr, ng, nb)) + FLT_EPSILON; \ + l = l0 / l1; \ + \ + r = nr * l; \ + g = ng * l; \ + b = nb * l; \ + \ + nr = lerpf(nr, r, preserve); \ + ng = lerpf(ng, g, preserve); \ + nb = lerpf(nb, b, preserve); + static int temperature_slice8(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) { ColorTemperatureContext *s = ctx->priv; @@ -99,25 +120,7 @@ static int temperature_slice8(AVFilterContext *ctx, void *arg, int jobnr, int nb float nr, ng, nb; float l0, l1, l; - nr = r * color[0]; - ng = g * color[1]; - nb = b * color[2]; - - nr = lerpf(r, nr, mix); - ng = lerpf(g, ng, mix); - nb = lerpf(b, nb, mix); - - l0 = (FFMAX3(r, g, b) + FFMIN3(r, g, b)) + FLT_EPSILON; - l1 = (FFMAX3(nr, ng, nb) + FFMIN3(nr, ng, nb)) + FLT_EPSILON; - l = l0 / l1; - - r = nr * l; - g = ng * l; - b = nb * l; - - nr = lerpf(nr, r, preserve); - ng = lerpf(ng, g, preserve); - nb = lerpf(nb, b, preserve); + PROCESS() gptr[x] = av_clip_uint8(ng); bptr[x] = av_clip_uint8(nb); @@ -159,25 +162,7 @@ static int temperature_slice16(AVFilterContext *ctx, void *arg, int jobnr, int n float nr, ng, nb; float l0, l1, l; - nr = r * color[0]; - ng = g * color[1]; - nb = b * color[2]; - - nr = lerpf(r, nr, mix); - ng = lerpf(g, ng, mix); - nb = lerpf(b, nb, mix); - - l0 = (FFMAX3(r, g, b) + FFMIN3(r, g, b)) + FLT_EPSILON; - l1 = (FFMAX3(nr, ng, nb) + FFMIN3(nr, ng, nb)) + FLT_EPSILON; - l = l0 / l1; - - r = nr * l; - g = ng * l; - b = nb * l; - - nr = lerpf(nr, r, preserve); - ng = lerpf(ng, g, preserve); - nb = lerpf(nb, b, preserve); + PROCESS() gptr[x] = av_clip_uintp2_c(ng, depth); bptr[x] = av_clip_uintp2_c(nb, depth);

1 0

avcodec/cscd: Check output len in zlib as in lzo
by Michael Niedermayer 31 Jan '21

31 Jan '21

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Nov 11 23:17:50 2020 +0100| [6de039823c2ffcf88e8bfff0d4e3ed9d5601a122] | committer: Michael Niedermayer avcodec/cscd: Check output len in zlib as in lzo Fixes: Timeout (>10sec -> 134ms) Fixes: 27245/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CSCD_fuzzer-575318210772992 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=6de039823c2ffcf88… --- libavcodec/cscd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/cscd.c b/libavcodec/cscd.c index d50ddd6258..f5c93e9912 100644 --- a/libavcodec/cscd.c +++ b/libavcodec/cscd.c @@ -93,7 +93,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, case 1: { // zlib compression #if CONFIG_ZLIB unsigned long dlen = c->decomp_size; - if (uncompress(c->decomp_buf, &dlen, &buf[2], buf_size - 2) != Z_OK) { + if (uncompress(c->decomp_buf, &dlen, &buf[2], buf_size - 2) != Z_OK || dlen != c->decomp_size) { av_log(avctx, AV_LOG_ERROR, "error during zlib decompression\n"); return AVERROR_INVALIDDATA; }

1 0

avcodec/vp3: Check input amount in theora_decode_header()
by Michael Niedermayer 31 Jan '21

31 Jan '21

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sat Jan 30 00:46:26 2021 +0100| [869fe41d1088c4badcd98ee1ca2490451a07b173] | committer: Michael Niedermayer avcodec/vp3: Check input amount in theora_decode_header() Fixes: Timeout Fixes: 29226/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_THEORA_fuzzer-6195092572471296 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=869fe41d1088c4bad… --- libavcodec/vp3.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 2a1da6b062..57c6eb1ff9 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2875,6 +2875,9 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb) int ret; AVRational fps, aspect; + if (get_bits_left(gb) < 206) + return AVERROR_INVALIDDATA; + s->theora_header = 0; s->theora = get_bits(gb, 24); av_log(avctx, AV_LOG_DEBUG, "Theora bitstream version %X\n", s->theora);

1 0

avformat/wavdec: Check avio_get_str16le() for failure
by Michael Niedermayer 31 Jan '21

31 Jan '21

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Fri Jan 29 23:58:04 2021 +0100| [d7594ee751e621f6c7ef4d4977c4a3ce169ae0af] | committer: Michael Niedermayer avformat/wavdec: Check avio_get_str16le() for failure Fixes: out of array access Fixes: 29195/clusterfuzz-testcase-minimized-ffmpeg_dem_W64_fuzzer-5037853281222656 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=d7594ee751e621f6c… --- libavformat/wavdec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index 3da4150f05..2fba9a08c8 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -922,6 +922,10 @@ static int w64_read_header(AVFormatContext *s) return AVERROR(ENOMEM); ret = avio_get_str16le(pb, chunk_size, value, chunk_size); + if (ret < 0) { + av_free(value); + return ret; + } avio_skip(pb, chunk_size - ret); av_dict_set(&s->metadata, chunk_key, value, AV_DICT_DONT_STRDUP_VAL);

1 0

avcodec/pnm: disable check for PFM as it is not needed
by Paul B Mahol 31 Jan '21

31 Jan '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Jan 31 14:04:51 2021 +0100| [47be08640cfabecbe277306a23a2f45503ca6d5b] | committer: Paul B Mahol avcodec/pnm: disable check for PFM as it is not needed > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=47be08640cfabecbe… --- libavcodec/pnm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c index aad23c7ae2..94ae74e13a 100644 --- a/libavcodec/pnm.c +++ b/libavcodec/pnm.c @@ -218,7 +218,8 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s) return AVERROR_INVALIDDATA; /* more check if YUV420 */ - if (av_pix_fmt_desc_get(avctx->pix_fmt)->flags & AV_PIX_FMT_FLAG_PLANAR) { + if ((av_pix_fmt_desc_get(avctx->pix_fmt)->flags & AV_PIX_FMT_FLAG_PLANAR) && + avctx->pix_fmt != AV_PIX_FMT_GBRPF32) { if ((avctx->width & 1) != 0) return AVERROR_INVALIDDATA; h = (avctx->height * 2);

1 0

ffmpeg: remove dead code for -vol
by Gyan Doshi 31 Jan '21

31 Jan '21

ffmpeg | branch: master | Gyan Doshi <ffmpeg(a)gyani.pro> | Sun Jan 31 10:39:54 2021 +0530| [d16b0a4bf0830db852ce404210e293f6ae26559f] | committer: Gyan Doshi ffmpeg: remove dead code for -vol It is applied via configure_input_audio_filter() > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d16b0a4bf0830db85… --- fftools/ffmpeg_filter.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index e9e31e043e..1cba3055cc 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -641,13 +641,6 @@ static int configure_output_audio_filter(FilterGraph *fg, OutputFilter *ofilter, pad_idx = 0; } - if (audio_volume != 256 && 0) { - char args[256]; - - snprintf(args, sizeof(args), "%f", audio_volume / 256.); - AUTO_INSERT_FILTER("-vol", "volume", args); - } - if (ost->apad && of->shortest) { char args[256]; int i;

1 0

doc/ffmpeg: document apad option
by Gyan Doshi 31 Jan '21

31 Jan '21

ffmpeg | branch: master | Gyan Doshi <ffmpeg(a)gyani.pro> | Sun Jan 31 10:20:18 2021 +0530| [6c9255775646c591f5de3d156050ce50153f56ac] | committer: Gyan Doshi doc/ffmpeg: document apad option > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6c9255775646c591f… --- doc/ffmpeg.texi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index d0d630a0ec..8eb012b7c0 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -1511,6 +1511,11 @@ adding/dropping samples to make it match the timestamps. This option effectively a threshold to select between hard (add/drop) and soft (squeeze/stretch) compensation. @code{-async} must be set to a positive value. +@item -apad @var{parameters} (@emph{output,per-stream}) +Pad the output audio stream(s). This is the same as applying @code{-af apad}. +Argument is a string of filter parameters composed the same as with the @code{apad} filter. +@code{-shortest} must be set for this output for the option to take effect. + @item -copyts Do not process input timestamps, but keep their values without trying to sanitize them. In particular, do not remove the initial start time

1 0