[FFmpeg-cvslog] avfilter/afir_template: stop using hack to zero out data

2022-12-22 Thread Paul B Mahol
ffmpeg | branch: master | Paul B Mahol  | Tue Dec 20 16:18:07 
2022 +0100| [bc1fc1be993b70ae0ad7ae322239547a29b8b0d3] | committer: Paul B Mahol

avfilter/afir_template: stop using hack to zero out data

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bc1fc1be993b70ae0ad7ae322239547a29b8b0d3
---

 libavfilter/afir_template.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavfilter/afir_template.c b/libavfilter/afir_template.c
index e5eae4b3e2..8766119d39 100644
--- a/libavfilter/afir_template.c
+++ b/libavfilter/afir_template.c
@@ -59,7 +59,8 @@ static void fn(draw_response)(AVFilterContext *ctx, AVFrame 
*out)
 char text[32];
 int channel, i, x;
 
-memset(out->data[0], 0, s->h * out->linesize[0]);
+for (int y = 0; y < s->h; y++)
+memset(out->data[0] + y * out->linesize[0], 0, s->w * 4);
 
 phase = av_malloc_array(s->w, sizeof(*phase));
 mag = av_malloc_array(s->w, sizeof(*mag));

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".


[FFmpeg-cvslog] avfilter/afir_template: skip useless moving of samples

2022-12-22 Thread Paul B Mahol
ffmpeg | branch: master | Paul B Mahol  | Wed Dec 21 18:05:20 
2022 +0100| [54ebe1e8dcc07ac2e02d84fb8155fabf200dd8e6] | committer: Paul B Mahol

avfilter/afir_template: skip useless moving of samples

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=54ebe1e8dcc07ac2e02d84fb8155fabf200dd8e6
---

 libavfilter/afir_template.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavfilter/afir_template.c b/libavfilter/afir_template.c
index 8766119d39..ca994f4352 100644
--- a/libavfilter/afir_template.c
+++ b/libavfilter/afir_template.c
@@ -403,7 +403,8 @@ static int fn(fir_quantum)(AVFilterContext *ctx, AVFrame 
*out, int ch, int offse
 
 seg->part_index[ch] = (seg->part_index[ch] + 1) % nb_partitions;
 
-memmove(src, src + min_part_size, (seg->input_size - min_part_size) * 
sizeof(*src));
+if (part_size != min_part_size)
+memmove(src, src + min_part_size, (seg->input_size - 
min_part_size) * sizeof(*src));
 
 fn(fir_fadd)(s, ptr, dst, nb_samples);
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".


[FFmpeg-cvslog] avfilter/af_afir: make dry/wet runtime options

2022-12-22 Thread Paul B Mahol
ffmpeg | branch: master | Paul B Mahol  | Thu Dec 22 17:04:29 
2022 +0100| [9498bc7c3218fd1cdf7f513cb2fe0f93d1d6a354] | committer: Paul B Mahol

avfilter/af_afir: make dry/wet runtime options

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9498bc7c3218fd1cdf7f513cb2fe0f93d1d6a354
---

 libavfilter/af_afir.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavfilter/af_afir.c b/libavfilter/af_afir.c
index bfb27e07d9..6790cf3727 100644
--- a/libavfilter/af_afir.c
+++ b/libavfilter/af_afir.c
@@ -660,8 +660,8 @@ static int process_command(AVFilterContext *ctx,
 #define OFFSET(x) offsetof(AudioFIRContext, x)
 
 static const AVOption afir_options[] = {
-{ "dry","set dry gain",  OFFSET(dry_gain),   AV_OPT_TYPE_FLOAT, 
{.dbl=1},0, 10, AF },
-{ "wet","set wet gain",  OFFSET(wet_gain),   AV_OPT_TYPE_FLOAT, 
{.dbl=1},0, 10, AF },
+{ "dry","set dry gain",  OFFSET(dry_gain),   AV_OPT_TYPE_FLOAT, 
{.dbl=1},0, 10, AFR },
+{ "wet","set wet gain",  OFFSET(wet_gain),   AV_OPT_TYPE_FLOAT, 
{.dbl=1},0, 10, AFR },
 { "length", "set IR length", OFFSET(length), AV_OPT_TYPE_FLOAT, 
{.dbl=1},0,  1, AF },
 { "gtype",  "set IR auto gain type",OFFSET(gtype),   AV_OPT_TYPE_INT,   
{.i64=0},   -1,  4, AF, "gtype" },
 {  "none",  "without auto gain", 0,  AV_OPT_TYPE_CONST, 
{.i64=-1},   0,  0, AF, "gtype" },

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".


[FFmpeg-cvslog] avformat/lafdec: Check for EOF in header reading

2022-12-22 Thread Michael Niedermayer
ffmpeg | branch: master | Michael Niedermayer  | Sat 
Nov 12 18:14:19 2022 +0100| [b92260f70a4ac194d1cc09c40b92766d38c7c783] | 
committer: Michael Niedermayer

avformat/lafdec: Check for EOF in header reading

Fixes: OOM testcase
Fixes: 
51527/clusterfuzz-testcase-minimized-ffmpeg_dem_LAF_fuzzer-5453663505612800

OOM can still happen after this as an arbitrary sized block is allocated and 
read
this would require a redesign or some limit on the sample rate.

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b92260f70a4ac194d1cc09c40b92766d38c7c783
---

 libavformat/lafdec.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/lafdec.c b/libavformat/lafdec.c
index 12b0d8540b..d02b479c4d 100644
--- a/libavformat/lafdec.c
+++ b/libavformat/lafdec.c
@@ -111,6 +111,9 @@ static int laf_read_header(AVFormatContext *ctx)
 sample_rate = avio_rl32(pb);
 duration = avio_rl64(pb) / st_count;
 
+if (avio_feof(pb))
+return AVERROR_INVALIDDATA;
+
 switch (quality) {
 case 0:
 codec_id = AV_CODEC_ID_PCM_U8;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".


[FFmpeg-cvslog] avcodec/mjpegbdec: Check for AVDISCARD_ALL

2022-12-22 Thread Michael Niedermayer
ffmpeg | branch: master | Michael Niedermayer  | Sat 
Nov 12 20:29:14 2022 +0100| [64c6c568908ee9d7f9a5d75686b6d4ce3334222c] | 
committer: Michael Niedermayer

avcodec/mjpegbdec: Check for AVDISCARD_ALL

Fixes: Assertion failure
Fixes: 
51825/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MJPEGB_fuzzer-6393802688692224

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=64c6c568908ee9d7f9a5d75686b6d4ce3334222c
---

 libavcodec/mjpegbdec.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/mjpegbdec.c b/libavcodec/mjpegbdec.c
index 98c64b44ca..a82a95d70a 100644
--- a/libavcodec/mjpegbdec.c
+++ b/libavcodec/mjpegbdec.c
@@ -141,9 +141,10 @@ read_header:
 av_log(avctx, AV_LOG_WARNING, "no picture\n");
 return buf_size;
 }
-
 av_frame_move_ref(rframe, s->picture_ptr);
 s->got_picture = 0;
+if (avctx->skip_frame == AVDISCARD_ALL)
+return AVERROR(EAGAIN);
 *got_frame = 1;
 
 if (!s->lossless && avctx->debug & FF_DEBUG_QP) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".