[FFmpeg-devel] [PATCH v5 1/2] avformat/riffdec: change declaration of ff_get_wav_header()

[FFmpeg-devel] [PATCH v5 1/2] avformat/riffdec: change declaration of ff_get_wav_header()

[Viraaj Raulgaonkar]

Change the type of logctx from void* to AVFormatContext*. This is in
preparation for the next commit.
---
 libavformat/riff.h    |  2 +-
 libavformat/riffdec.c | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libavformat/riff.h b/libavformat/riff.h
index a93eadfeca..0b01b1fd20 100644
--- a/libavformat/riff.h
+++ b/libavformat/riff.h
@@ -67,7 +67,7 @@ void ff_put_bmp_header(AVIOContext *pb, AVCodecParameters *par, int for_asf, int
 int ff_put_wav_header(AVFormatContext *s, AVIOContext *pb, AVCodecParameters *par, int flags);
 
 enum AVCodecID ff_wav_codec_get_id(unsigned int tag, int bps);
-int ff_get_wav_header(void *logctx, AVIOContext *pb, AVCodecParameters *par,
+int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb, AVCodecParameters *par,
                       int size, int big_endian);
 
 extern const AVCodecTag ff_codec_bmp_tags[]; // exposed through avformat_get_riff_video_tags()
diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c
index b7a85a6ab2..2b269b1682 100644
--- a/libavformat/riffdec.c
+++ b/libavformat/riffdec.c
@@ -92,14 +92,14 @@ static void parse_waveformatex(void *logctx, AVIOContext *pb, AVCodecParameters
 }
 
 /* "big_endian" values are needed for RIFX file format */
-int ff_get_wav_header(void *logctx, AVIOContext *pb,
+int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb,
                       AVCodecParameters *par, int size, int big_endian)
 {
     int id, channels = 0, ret;
     uint64_t bitrate = 0;
 
     if (size < 14) {
-        avpriv_request_sample(logctx, "wav header size < 14");
+        avpriv_request_sample(s, "wav header size < 14");
         return AVERROR_INVALIDDATA;
     }
 
@@ -140,18 +140,18 @@ int ff_get_wav_header(void *logctx, AVIOContext *pb,
     if (size >= 18 && id != 0x0165) {  /* We're obviously dealing with WAVEFORMATEX */
         int cbSize = avio_rl16(pb); /* cbSize */
         if (big_endian) {
-            avpriv_report_missing_feature(logctx, "WAVEFORMATEX support for RIFX files");
+            avpriv_report_missing_feature(s, "WAVEFORMATEX support for RIFX files");
             return AVERROR_PATCHWELCOME;
         }
         size  -= 18;
         cbSize = FFMIN(size, cbSize);
         if (cbSize >= 22 && id == 0xfffe) { /* WAVEFORMATEXTENSIBLE */
-            parse_waveformatex(logctx, pb, par);
+            parse_waveformatex(s, pb, par);
             cbSize -= 22;
             size   -= 22;
         }
         if (cbSize > 0) {
-            ret = ff_get_extradata(logctx, par, pb, cbSize);
+            ret = ff_get_extradata(s, par, pb, cbSize);
             if (ret < 0)
                 return ret;
             size -= cbSize;
@@ -164,7 +164,7 @@ int ff_get_wav_header(void *logctx, AVIOContext *pb,
         int nb_streams, i;
 
         size -= 4;
-        ret = ff_get_extradata(logctx, par, pb, size);
+        ret = ff_get_extradata(s, par, pb, size);
         if (ret < 0)
             return ret;
         nb_streams         = AV_RL16(par->extradata + 4);
@@ -180,7 +180,7 @@ int ff_get_wav_header(void *logctx, AVIOContext *pb,
     par->bit_rate = bitrate;
 
     if (par->sample_rate <= 0) {
-        av_log(logctx, AV_LOG_ERROR,
+        av_log(s, AV_LOG_ERROR,
                "Invalid sample rate: %d\n", par->sample_rate);
         return AVERROR_INVALIDDATA;
     }
-- 
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".

[FFmpeg-devel] [PATCH v5 2/2] avformat/riffdec: warn on invalid sample rate

[Viraaj Raulgaonkar]

If strict_std_compliance < FF_COMPLIANCE_STRICT, warn the user of the
invalid sample rate instead of returning an error. In certain cases the
sample rate can get decoded later on.

Fixes Trac Ticket #11361.
---
 libavformat/riffdec.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c
index 2b269b1682..a3eee43a41 100644
--- a/libavformat/riffdec.c
+++ b/libavformat/riffdec.c
@@ -180,9 +180,12 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb,
     par->bit_rate = bitrate;
 
     if (par->sample_rate <= 0) {
-        av_log(s, AV_LOG_ERROR,
+        int strict = s->strict_std_compliance >= FF_COMPLIANCE_STRICT;
+        av_log(s, strict ? AV_LOG_ERROR : AV_LOG_WARNING,
                "Invalid sample rate: %d\n", par->sample_rate);
-        return AVERROR_INVALIDDATA;
+        if (strict)
+            return AVERROR_INVALIDDATA;
+        par->sample_rate = 0;
     }
     if (par->codec_id == AV_CODEC_ID_AAC_LATM) {
         /* Channels and sample_rate values are those prior to applying SBR
-- 
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 v5 2/2] avformat/riffdec: warn on invalid sample rate

[Viraaj Raulgaonkar]

On Mon, Feb 3, 2025 at 9:55 AM Viraaj Raulgaonkar
<viraajraulgkar@gmail.com> wrote:
>
> If strict_std_compliance < FF_COMPLIANCE_STRICT, warn the user of the
> invalid sample rate instead of returning an error. In certain cases the
> sample rate can get decoded later on.
>
> Fixes Trac Ticket #11361.
> ---
>  libavformat/riffdec.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c
> index 2b269b1682..a3eee43a41 100644
> --- a/libavformat/riffdec.c
> +++ b/libavformat/riffdec.c
> @@ -180,9 +180,12 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb,
>      par->bit_rate = bitrate;
>
>      if (par->sample_rate <= 0) {
> -        av_log(s, AV_LOG_ERROR,
> +        int strict = s->strict_std_compliance >= FF_COMPLIANCE_STRICT;
> +        av_log(s, strict ? AV_LOG_ERROR : AV_LOG_WARNING,
>                 "Invalid sample rate: %d\n", par->sample_rate);
> -        return AVERROR_INVALIDDATA;
> +        if (strict)
> +            return AVERROR_INVALIDDATA;
> +        par->sample_rate = 0;
>      }
>      if (par->codec_id == AV_CODEC_ID_AAC_LATM) {
>          /* Channels and sample_rate values are those prior to applying SBR
> --
> 2.39.5
>

Ping
_______________________________________________
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 v5 2/2] avformat/riffdec: warn on invalid sample rate

[Viraaj Raulgaonkar]

On Wed, Feb 12, 2025 at 5:01 PM Viraaj Raulgaonkar
<viraajraulgkar@gmail.com> wrote:
>
> On Mon, Feb 3, 2025 at 9:55 AM Viraaj Raulgaonkar
> <viraajraulgkar@gmail.com> wrote:
> >
> > If strict_std_compliance < FF_COMPLIANCE_STRICT, warn the user of the
> > invalid sample rate instead of returning an error. In certain cases the
> > sample rate can get decoded later on.
> >
> > Fixes Trac Ticket #11361.
> > ---
> >  libavformat/riffdec.c | 7 +++++--
> >  1 file changed, 5 insertions(+), 2 deletions(-)
> >
> > diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c
> > index 2b269b1682..a3eee43a41 100644
> > --- a/libavformat/riffdec.c
> > +++ b/libavformat/riffdec.c
> > @@ -180,9 +180,12 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb,
> >      par->bit_rate = bitrate;
> >
> >      if (par->sample_rate <= 0) {
> > -        av_log(s, AV_LOG_ERROR,
> > +        int strict = s->strict_std_compliance >= FF_COMPLIANCE_STRICT;
> > +        av_log(s, strict ? AV_LOG_ERROR : AV_LOG_WARNING,
> >                 "Invalid sample rate: %d\n", par->sample_rate);
> > -        return AVERROR_INVALIDDATA;
> > +        if (strict)
> > +            return AVERROR_INVALIDDATA;
> > +        par->sample_rate = 0;
> >      }
> >      if (par->codec_id == AV_CODEC_ID_AAC_LATM) {
> >          /* Channels and sample_rate values are those prior to applying SBR
> > --
> > 2.39.5
> >
>
> Ping

Ping
_______________________________________________
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 v5 2/2] avformat/riffdec: warn on invalid sample rate

[Michael Niedermayer]

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

On Mon, Feb 03, 2025 at 09:54:58AM +0530, Viraaj Raulgaonkar wrote:
> If strict_std_compliance < FF_COMPLIANCE_STRICT, warn the user of the
> invalid sample rate instead of returning an error. In certain cases the
> sample rate can get decoded later on.
> 
> Fixes Trac Ticket #11361.
> ---
>  libavformat/riffdec.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c
> index 2b269b1682..a3eee43a41 100644
> --- a/libavformat/riffdec.c
> +++ b/libavformat/riffdec.c
> @@ -180,9 +180,12 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb,
>      par->bit_rate = bitrate;
>  
>      if (par->sample_rate <= 0) {
> -        av_log(s, AV_LOG_ERROR,
> +        int strict = s->strict_std_compliance >= FF_COMPLIANCE_STRICT;
> +        av_log(s, strict ? AV_LOG_ERROR : AV_LOG_WARNING,
>                 "Invalid sample rate: %d\n", par->sample_rate);
> -        return AVERROR_INVALIDDATA;
> +        if (strict)
> +            return AVERROR_INVALIDDATA;

The specification uses a DWORD, which is unsigned, so
strict_std_compliance is not strictly correct
as teh specification allows values that fall outside int32_t
its libavformat that doesnt suppport that

thx

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

Dictatorship: All citizens are under surveillance, all their steps and
actions recorded, for the politicians to enforce control.
Democracy: All politicians are under surveillance, all their steps and
actions recorded, for the citizens to enforce control.

[-- 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 v5 1/2] avformat/riffdec: change declaration of ff_get_wav_header()

[Viraaj Raulgaonkar]

On Mon, Feb 3, 2025 at 9:55 AM Viraaj Raulgaonkar
<viraajraulgkar@gmail.com> wrote:
>
> Change the type of logctx from void* to AVFormatContext*. This is in
> preparation for the next commit.
> ---
>  libavformat/riff.h    |  2 +-
>  libavformat/riffdec.c | 14 +++++++-------
>  2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/libavformat/riff.h b/libavformat/riff.h
> index a93eadfeca..0b01b1fd20 100644
> --- a/libavformat/riff.h
> +++ b/libavformat/riff.h
> @@ -67,7 +67,7 @@ void ff_put_bmp_header(AVIOContext *pb, AVCodecParameters *par, int for_asf, int
>  int ff_put_wav_header(AVFormatContext *s, AVIOContext *pb, AVCodecParameters *par, int flags);
>
>  enum AVCodecID ff_wav_codec_get_id(unsigned int tag, int bps);
> -int ff_get_wav_header(void *logctx, AVIOContext *pb, AVCodecParameters *par,
> +int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb, AVCodecParameters *par,
>                        int size, int big_endian);
>
>  extern const AVCodecTag ff_codec_bmp_tags[]; // exposed through avformat_get_riff_video_tags()
> diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c
> index b7a85a6ab2..2b269b1682 100644
> --- a/libavformat/riffdec.c
> +++ b/libavformat/riffdec.c
> @@ -92,14 +92,14 @@ static void parse_waveformatex(void *logctx, AVIOContext *pb, AVCodecParameters
>  }
>
>  /* "big_endian" values are needed for RIFX file format */
> -int ff_get_wav_header(void *logctx, AVIOContext *pb,
> +int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb,
>                        AVCodecParameters *par, int size, int big_endian)
>  {
>      int id, channels = 0, ret;
>      uint64_t bitrate = 0;
>
>      if (size < 14) {
> -        avpriv_request_sample(logctx, "wav header size < 14");
> +        avpriv_request_sample(s, "wav header size < 14");
>          return AVERROR_INVALIDDATA;
>      }
>
> @@ -140,18 +140,18 @@ int ff_get_wav_header(void *logctx, AVIOContext *pb,
>      if (size >= 18 && id != 0x0165) {  /* We're obviously dealing with WAVEFORMATEX */
>          int cbSize = avio_rl16(pb); /* cbSize */
>          if (big_endian) {
> -            avpriv_report_missing_feature(logctx, "WAVEFORMATEX support for RIFX files");
> +            avpriv_report_missing_feature(s, "WAVEFORMATEX support for RIFX files");
>              return AVERROR_PATCHWELCOME;
>          }
>          size  -= 18;
>          cbSize = FFMIN(size, cbSize);
>          if (cbSize >= 22 && id == 0xfffe) { /* WAVEFORMATEXTENSIBLE */
> -            parse_waveformatex(logctx, pb, par);
> +            parse_waveformatex(s, pb, par);
>              cbSize -= 22;
>              size   -= 22;
>          }
>          if (cbSize > 0) {
> -            ret = ff_get_extradata(logctx, par, pb, cbSize);
> +            ret = ff_get_extradata(s, par, pb, cbSize);
>              if (ret < 0)
>                  return ret;
>              size -= cbSize;
> @@ -164,7 +164,7 @@ int ff_get_wav_header(void *logctx, AVIOContext *pb,
>          int nb_streams, i;
>
>          size -= 4;
> -        ret = ff_get_extradata(logctx, par, pb, size);
> +        ret = ff_get_extradata(s, par, pb, size);
>          if (ret < 0)
>              return ret;
>          nb_streams         = AV_RL16(par->extradata + 4);
> @@ -180,7 +180,7 @@ int ff_get_wav_header(void *logctx, AVIOContext *pb,
>      par->bit_rate = bitrate;
>
>      if (par->sample_rate <= 0) {
> -        av_log(logctx, AV_LOG_ERROR,
> +        av_log(s, AV_LOG_ERROR,
>                 "Invalid sample rate: %d\n", par->sample_rate);
>          return AVERROR_INVALIDDATA;
>      }
> --
> 2.39.5
>

Ping
_______________________________________________
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 v5 1/2] avformat/riffdec: change declaration of ff_get_wav_header()

[Michael Niedermayer]

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

On Mon, Feb 03, 2025 at 09:54:57AM +0530, Viraaj Raulgaonkar wrote:
> Change the type of logctx from void* to AVFormatContext*. This is in
> preparation for the next commit.
> ---
>  libavformat/riff.h    |  2 +-
>  libavformat/riffdec.c | 14 +++++++-------
>  2 files changed, 8 insertions(+), 8 deletions(-)

will apply

thanks

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

I know you won't believe me, but the highest form of Human Excellence is
to question oneself and others. -- Socrates

[-- 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 v5 1/2] avformat/riffdec: change declaration of ff_get_wav_header()

[Andreas Rheinhardt]

Michael Niedermayer:
> On Mon, Feb 03, 2025 at 09:54:57AM +0530, Viraaj Raulgaonkar wrote:
>> Change the type of logctx from void* to AVFormatContext*. This is in
>> preparation for the next commit.
>> ---
>>  libavformat/riff.h    |  2 +-
>>  libavformat/riffdec.c | 14 +++++++-------
>>  2 files changed, 8 insertions(+), 8 deletions(-)
> 
> will apply
> 

You applied only patch 1/2. This means the "next commit" mentioned in
the commit message is "swscale/aarch64: dotprod implementation of
rgba32_to_Y".

- Andreas

_______________________________________________
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 v5 1/2] avformat/riffdec: change declaration of ff_get_wav_header()

[Michael Niedermayer]

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

On Tue, Mar 04, 2025 at 01:47:10PM +0100, Andreas Rheinhardt wrote:
> Michael Niedermayer:
> > On Mon, Feb 03, 2025 at 09:54:57AM +0530, Viraaj Raulgaonkar wrote:
> >> Change the type of logctx from void* to AVFormatContext*. This is in
> >> preparation for the next commit.
> >> ---
> >>  libavformat/riff.h    |  2 +-
> >>  libavformat/riffdec.c | 14 +++++++-------
> >>  2 files changed, 8 insertions(+), 8 deletions(-)
> > 
> > will apply
> > 
> 
> You applied only patch 1/2. This means the "next commit" mentioned in
> the commit message is "swscale/aarch64: dotprod implementation of
> rgba32_to_Y".

I didnt notice that

I guess, it would be better if patches dont refer to "next commit"
but rather to what the commit does so the exact ordering of commits
dont affect the commit messages

thx

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

The worst form of inequality is to try to make unequal things equal.
-- Aristotle

[-- 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 v5 1/2] avformat/riffdec: change declaration of ff_get_wav_header()

[James Almer]

[-- Attachment #1.1.1: Type: text/plain, Size: 1025 bytes --]

On 3/4/2025 12:28 PM, Michael Niedermayer wrote:
> On Tue, Mar 04, 2025 at 01:47:10PM +0100, Andreas Rheinhardt wrote:
>> Michael Niedermayer:
>>> On Mon, Feb 03, 2025 at 09:54:57AM +0530, Viraaj Raulgaonkar wrote:
>>>> Change the type of logctx from void* to AVFormatContext*. This is in
>>>> preparation for the next commit.
>>>> ---
>>>>   libavformat/riff.h    |  2 +-
>>>>   libavformat/riffdec.c | 14 +++++++-------
>>>>   2 files changed, 8 insertions(+), 8 deletions(-)
>>>
>>> will apply
>>>
>>
>> You applied only patch 1/2. This means the "next commit" mentioned in
>> the commit message is "swscale/aarch64: dotprod implementation of
>> rgba32_to_Y".
> 
> I didnt notice that
> 
> I guess, it would be better if patches dont refer to "next commit"
> but rather to what the commit does so the exact ordering of commits
> dont affect the commit messages
> 
> thx

"In a following commit" should be enough to make it valid regardless of 
how far in the future the referenced commit is.


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 495 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".