[FFmpeg-devel] [PATCH] avformat/wavdec: increase requested probe score for codec probe

[FFmpeg-devel] [PATCH] avformat/wavdec: increase requested probe score for codec probe

[Marton Balint]

Codec probing was primarily added to the wav demuxer to support DTS-in-wav
files, but DTS probing functions return AVPROBE_SCORE_EXTENSION+1, so we can be
a bit more strict with the required score.

This fixes MP3 misdetections for some wav files.

Fixes ticket #11581.

Signed-off-by: Marton Balint <cus@passwd.hu>
---
 libavformat/wavdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index dc7e49abc4..c65e0a2723 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -178,7 +178,7 @@ static void handle_stream_probing(AVStream *st)
 {
     if (st->codecpar->codec_id == AV_CODEC_ID_PCM_S16LE) {
         FFStream *const sti = ffstream(st);
-        sti->request_probe = AVPROBE_SCORE_EXTENSION;
+        sti->request_probe = AVPROBE_SCORE_EXTENSION + 1;
         sti->probe_packets = FFMIN(sti->probe_packets, 32);
     }
 }
-- 
2.43.0

_______________________________________________
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/wavdec: increase requested probe score for codec probe

[Michael Niedermayer]

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

On Fri, May 09, 2025 at 12:28:00AM +0200, Marton Balint wrote:
> Codec probing was primarily added to the wav demuxer to support DTS-in-wav
> files, but DTS probing functions return AVPROBE_SCORE_EXTENSION+1, so we can be
> a bit more strict with the required score.
> 
> This fixes MP3 misdetections for some wav files.
> 
> Fixes ticket #11581.
> 
> Signed-off-by: Marton Balint <cus@passwd.hu>
> ---
>  libavformat/wavdec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
> index dc7e49abc4..c65e0a2723 100644
> --- a/libavformat/wavdec.c
> +++ b/libavformat/wavdec.c
> @@ -178,7 +178,7 @@ static void handle_stream_probing(AVStream *st)
>  {
>      if (st->codecpar->codec_id == AV_CODEC_ID_PCM_S16LE) {
>          FFStream *const sti = ffstream(st);
> -        sti->request_probe = AVPROBE_SCORE_EXTENSION;
> +        sti->request_probe = AVPROBE_SCORE_EXTENSION + 1;
>          sti->probe_packets = FFMIN(sti->probe_packets, 32);
>      }
>  }

please add a testcase to fate, if possible. Such corner cases
are important to be in fate

thx

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Those who are too smart to engage in politics are punished by being
governed by those who are dumber. -- Plato 

[-- 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/wavdec: increase requested probe score for codec probe

[Marton Balint]

On Fri, 9 May 2025, Michael Niedermayer wrote:

> On Fri, May 09, 2025 at 12:28:00AM +0200, Marton Balint wrote:
>> Codec probing was primarily added to the wav demuxer to support DTS-in-wav
>> files, but DTS probing functions return AVPROBE_SCORE_EXTENSION+1, so we can be
>> a bit more strict with the required score.
>>
>> This fixes MP3 misdetections for some wav files.
>>
>> Fixes ticket #11581.
>>
>> Signed-off-by: Marton Balint <cus@passwd.hu>
>> ---
>>  libavformat/wavdec.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
>> index dc7e49abc4..c65e0a2723 100644
>> --- a/libavformat/wavdec.c
>> +++ b/libavformat/wavdec.c
>> @@ -178,7 +178,7 @@ static void handle_stream_probing(AVStream *st)
>>  {
>>      if (st->codecpar->codec_id == AV_CODEC_ID_PCM_S16LE) {
>>          FFStream *const sti = ffstream(st);
>> -        sti->request_probe = AVPROBE_SCORE_EXTENSION;
>> +        sti->request_probe = AVPROBE_SCORE_EXTENSION + 1;
>>          sti->probe_packets = FFMIN(sti->probe_packets, 32);
>>      }
>>  }
>
> please add a testcase to fate, if possible. Such corner cases
> are important to be in fate

Sample is in the ticket, so it should be pretty trivial to do so. Can't we 
fund someone to do this and the other fixed trac tickets without fate 
tests?

Thanks,
Marton
_______________________________________________
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/wavdec: increase requested probe score for codec probe

[Michael Niedermayer]

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

On Fri, May 09, 2025 at 01:54:22PM +0200, Marton Balint wrote:
> 
> 
> On Fri, 9 May 2025, Michael Niedermayer wrote:
> 
> > On Fri, May 09, 2025 at 12:28:00AM +0200, Marton Balint wrote:
> > > Codec probing was primarily added to the wav demuxer to support DTS-in-wav
> > > files, but DTS probing functions return AVPROBE_SCORE_EXTENSION+1, so we can be
> > > a bit more strict with the required score.
> > > 
> > > This fixes MP3 misdetections for some wav files.
> > > 
> > > Fixes ticket #11581.
> > > 
> > > Signed-off-by: Marton Balint <cus@passwd.hu>
> > > ---
> > >  libavformat/wavdec.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
> > > index dc7e49abc4..c65e0a2723 100644
> > > --- a/libavformat/wavdec.c
> > > +++ b/libavformat/wavdec.c
> > > @@ -178,7 +178,7 @@ static void handle_stream_probing(AVStream *st)
> > >  {
> > >      if (st->codecpar->codec_id == AV_CODEC_ID_PCM_S16LE) {
> > >          FFStream *const sti = ffstream(st);
> > > -        sti->request_probe = AVPROBE_SCORE_EXTENSION;
> > > +        sti->request_probe = AVPROBE_SCORE_EXTENSION + 1;
> > >          sti->probe_packets = FFMIN(sti->probe_packets, 32);
> > >      }
> > >  }
> > 
> > please add a testcase to fate, if possible. Such corner cases
> > are important to be in fate
> 
> Sample is in the ticket, so it should be pretty trivial to do so. Can't we

> fund someone to do this and the other fixed trac tickets without fate tests?

Iam in favor of funding that

see https://trac.ffmpeg.org/wiki/SponsoringPrograms/STF/2025

thx

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

"You are 36 times more likely to die in a bathtub than at the hands of a
terrorist. Also, you are 2.5 times more likely to become a president and
2 times more likely to become an astronaut, than to die in a terrorist
attack." -- Thoughty2


[-- 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/wavdec: increase requested probe score for codec probe

[Marton Balint]

On Sat, 10 May 2025, Michael Niedermayer wrote:

> On Fri, May 09, 2025 at 01:54:22PM +0200, Marton Balint wrote:
>>
>>
>> On Fri, 9 May 2025, Michael Niedermayer wrote:
>>
>>> On Fri, May 09, 2025 at 12:28:00AM +0200, Marton Balint wrote:
>>>> Codec probing was primarily added to the wav demuxer to support DTS-in-wav
>>>> files, but DTS probing functions return AVPROBE_SCORE_EXTENSION+1, so we can be
>>>> a bit more strict with the required score.
>>>>
>>>> This fixes MP3 misdetections for some wav files.
>>>>
>>>> Fixes ticket #11581.
>>>>
>>>> Signed-off-by: Marton Balint <cus@passwd.hu>
>>>> ---
>>>>  libavformat/wavdec.c | 2 +-
>>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
>>>> index dc7e49abc4..c65e0a2723 100644
>>>> --- a/libavformat/wavdec.c
>>>> +++ b/libavformat/wavdec.c
>>>> @@ -178,7 +178,7 @@ static void handle_stream_probing(AVStream *st)
>>>>  {
>>>>      if (st->codecpar->codec_id == AV_CODEC_ID_PCM_S16LE) {
>>>>          FFStream *const sti = ffstream(st);
>>>> -        sti->request_probe = AVPROBE_SCORE_EXTENSION;
>>>> +        sti->request_probe = AVPROBE_SCORE_EXTENSION + 1;
>>>>          sti->probe_packets = FFMIN(sti->probe_packets, 32);
>>>>      }
>>>>  }
>>>
>>> please add a testcase to fate, if possible. Such corner cases
>>> are important to be in fate
>>
>> Sample is in the ticket, so it should be pretty trivial to do so. Can't we
>
>> fund someone to do this and the other fixed trac tickets without fate tests?
>
> Iam in favor of funding that
>
> see https://trac.ffmpeg.org/wiki/SponsoringPrograms/STF/2025

Will apply the patch.

Regards,
Marton
_______________________________________________
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".