[FFmpeg-devel] [PATCH] avformat/riffdec: remove invalid sample rate check

[FFmpeg-devel] [PATCH] avformat/riffdec: remove invalid sample rate check

[Viraaj Raulgaonkar]

Sample rates up to 2^31 - 1 are considered valid, while greater values
are invalid.  Removing the check potentially allows the sample rate
to be decoded in all cases instead of halting demux for values
greater than 2^31 - 1.

Fixes Trac ticket #11361.
---
 libavformat/riffdec.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c
index b7a85a6ab2..94dccb324e 100644
--- a/libavformat/riffdec.c
+++ b/libavformat/riffdec.c
@@ -179,11 +179,6 @@ int ff_get_wav_header(void *logctx, AVIOContext *pb,
 
     par->bit_rate = bitrate;
 
-    if (par->sample_rate <= 0) {
-        av_log(logctx, AV_LOG_ERROR,
-               "Invalid sample rate: %d\n", par->sample_rate);
-        return AVERROR_INVALIDDATA;
-    }
     if (par->codec_id == AV_CODEC_ID_AAC_LATM) {
         /* Channels and sample_rate values are those prior to applying SBR
          * and/or PS. */
-- 
2.39.5

_______________________________________________
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] avformat/riffdec: remove invalid sample rate check

[Michael Niedermayer]

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

Hi

On Tue, Jan 21, 2025 at 05:30:05PM +0530, Viraaj Raulgaonkar wrote:
> Sample rates up to 2^31 - 1 are considered valid, while greater values
> are invalid.  Removing the check potentially allows the sample rate
> to be decoded in all cases instead of halting demux for values
> greater than 2^31 - 1.
> 
> Fixes Trac ticket #11361.
> ---
>  libavformat/riffdec.c | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c
> index b7a85a6ab2..94dccb324e 100644
> --- a/libavformat/riffdec.c
> +++ b/libavformat/riffdec.c
> @@ -179,11 +179,6 @@ int ff_get_wav_header(void *logctx, AVIOContext *pb,
>  
>      par->bit_rate = bitrate;
>  
> -    if (par->sample_rate <= 0) {
> -        av_log(logctx, AV_LOG_ERROR,
> -               "Invalid sample rate: %d\n", par->sample_rate);
> -        return AVERROR_INVALIDDATA;
> -    }

the API does not really allow negative sample rates

thx

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


[-- 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".

Re: [FFmpeg-devel] [PATCH] avformat/riffdec: remove invalid sample rate check

[Michael Niedermayer]

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

On Sat, Jan 25, 2025 at 02:19:52AM +0100, Michael Niedermayer wrote:
> Hi
> 
> On Tue, Jan 21, 2025 at 05:30:05PM +0530, Viraaj Raulgaonkar wrote:
> > Sample rates up to 2^31 - 1 are considered valid, while greater values
> > are invalid.  Removing the check potentially allows the sample rate
> > to be decoded in all cases instead of halting demux for values
> > greater than 2^31 - 1.
> > 
> > Fixes Trac ticket #11361.
> > ---
> >  libavformat/riffdec.c | 5 -----
> >  1 file changed, 5 deletions(-)
> > 
> > diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c
> > index b7a85a6ab2..94dccb324e 100644
> > --- a/libavformat/riffdec.c
> > +++ b/libavformat/riffdec.c
> > @@ -179,11 +179,6 @@ int ff_get_wav_header(void *logctx, AVIOContext *pb,
> >  
> >      par->bit_rate = bitrate;
> >  
> > -    if (par->sample_rate <= 0) {
> > -        av_log(logctx, AV_LOG_ERROR,
> > -               "Invalid sample rate: %d\n", par->sample_rate);
> > -        return AVERROR_INVALIDDATA;
> > -    }
> 
> the API does not really allow negative sample rates

If you want to export the stored sample rate value correctly, this would
need a API change (which is a alot of work and seems not justified here)

Otherwise, simply print a warning and return sample_rate/2 instead
(assuming that works, does it work ?)

thx

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Some people wanted to paint the bikeshed green, some blue and some pink.
People argued and fought, when they finally agreed, only rust was left.

[-- 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".

Re: [FFmpeg-devel] [PATCH] avformat/riffdec: remove invalid sample rate check

[Viraaj Raulgaonkar]

Hi

On Sat, Jan 25, 2025 at 6:56 AM Michael Niedermayer
<michael@niedermayer.cc> wrote:
>
> On Sat, Jan 25, 2025 at 02:19:52AM +0100, Michael Niedermayer wrote:
> > Hi
> >
> > On Tue, Jan 21, 2025 at 05:30:05PM +0530, Viraaj Raulgaonkar wrote:
> > > Sample rates up to 2^31 - 1 are considered valid, while greater values
> > > are invalid.  Removing the check potentially allows the sample rate
> > > to be decoded in all cases instead of halting demux for values
> > > greater than 2^31 - 1.
> > >
> > > Fixes Trac ticket #11361.
> > > ---
> > >  libavformat/riffdec.c | 5 -----
> > >  1 file changed, 5 deletions(-)
> > >
> > > diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c
> > > index b7a85a6ab2..94dccb324e 100644
> > > --- a/libavformat/riffdec.c
> > > +++ b/libavformat/riffdec.c
> > > @@ -179,11 +179,6 @@ int ff_get_wav_header(void *logctx, AVIOContext *pb,
> > >
> > >      par->bit_rate = bitrate;
> > >
> > > -    if (par->sample_rate <= 0) {
> > > -        av_log(logctx, AV_LOG_ERROR,
> > > -               "Invalid sample rate: %d\n", par->sample_rate);
> > > -        return AVERROR_INVALIDDATA;
> > > -    }
> >
> > the API does not really allow negative sample rates
>

I see.

> If you want to export the stored sample rate value correctly, this would
> need a API change (which is a alot of work and seems not justified here)
>
> Otherwise, simply print a warning and return sample_rate/2 instead
> (assuming that works, does it work ?)

Returning sample_rate/2 or INT_MAX passes tests. I'll send an updated
patch with these changes.

Thanks,
Viraaj

>
> thx
>
> [...]
>
> --
> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
> Some people wanted to paint the bikeshed green, some blue and some pink.
> People argued and fought, when they finally agreed, only rust was left.
> _______________________________________________
> 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".
_______________________________________________
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".