[FFmpeg-devel] [PATCH v2] avcodec/noise_bsf: Check for wrapped frames

[FFmpeg-devel] [PATCH v2] avcodec/noise_bsf: Check for wrapped frames

[Michael Niedermayer]

Wrapped frames contain pointers so they need specific code to
noise them, the generic code would lead to segfaults

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/noise_bsf.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libavcodec/noise_bsf.c b/libavcodec/noise_bsf.c
index 168f3aa373..2985a8ec4f 100644
--- a/libavcodec/noise_bsf.c
+++ b/libavcodec/noise_bsf.c
@@ -86,6 +86,13 @@ static int noise_init(AVBSFContext *ctx)
             return AVERROR(ENOMEM);
     }
 
+    if (ctx->par_in->codec_id == AV_CODEC_ID_WRAPPED_AVFRAME &&
+        strcmp(s->amount_str, "0")
+    ) {
+        av_log(ctx, AV_LOG_ERROR, "Wrapped AVFrame noising is unsupported\n");
+        return AVERROR_PATCHWELCOME;
+    }
+
     ret = av_expr_parse(&s->amount_pexpr, s->amount_str,
                         var_names, NULL, NULL, NULL, NULL, 0, ctx);
     if (ret < 0) {
-- 
2.17.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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

Re: [FFmpeg-devel] [PATCH v2] avcodec/noise_bsf: Check for wrapped frames

[Anton Khirnov]

Quoting Michael Niedermayer (2023-06-04 21:53:22)
> Wrapped frames contain pointers so they need specific code to
> noise them, the generic code would lead to segfaults
> 
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/noise_bsf.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/libavcodec/noise_bsf.c b/libavcodec/noise_bsf.c
> index 168f3aa373..2985a8ec4f 100644
> --- a/libavcodec/noise_bsf.c
> +++ b/libavcodec/noise_bsf.c
> @@ -86,6 +86,13 @@ static int noise_init(AVBSFContext *ctx)
>              return AVERROR(ENOMEM);
>      }
>  
> +    if (ctx->par_in->codec_id == AV_CODEC_ID_WRAPPED_AVFRAME &&
> +        strcmp(s->amount_str, "0")
> +    ) {

Why is this on a separate line?

-- 
Anton Khirnov
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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

Re: [FFmpeg-devel] [PATCH v2] avcodec/noise_bsf: Check for wrapped frames

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 1132 bytes --]

On Mon, Jun 05, 2023 at 12:21:13PM +0200, Anton Khirnov wrote:
> Quoting Michael Niedermayer (2023-06-04 21:53:22)
> > Wrapped frames contain pointers so they need specific code to
> > noise them, the generic code would lead to segfaults
> > 
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavcodec/noise_bsf.c | 7 +++++++
> >  1 file changed, 7 insertions(+)
> > 
> > diff --git a/libavcodec/noise_bsf.c b/libavcodec/noise_bsf.c
> > index 168f3aa373..2985a8ec4f 100644
> > --- a/libavcodec/noise_bsf.c
> > +++ b/libavcodec/noise_bsf.c
> > @@ -86,6 +86,13 @@ static int noise_init(AVBSFContext *ctx)
> >              return AVERROR(ENOMEM);
> >      }
> >  
> > +    if (ctx->par_in->codec_id == AV_CODEC_ID_WRAPPED_AVFRAME &&
> > +        strcmp(s->amount_str, "0")
> > +    ) {
> 
> Why is this on a separate line?

Probably because i pressed the enter key. Ill remove the \n

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

It is dangerous to be right in matters on which the established authorities
are wrong. -- Voltaire

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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