[FFmpeg-devel] [FFmpeg-cvslog] lavf/amr: Make the heuristic for auto-detection even stricter.

[Michael Niedermayer]

On Thu, Jun 21, 2018 at 10:09:14PM +0000, Carl Eugen Hoyos wrote:
> ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg at gmail.com> | Fri Jun 22 00:08:13 2018 +0200| [40b7e6071815fc416a4efc5dc1616f5460a3aacb] | committer: Carl Eugen Hoyos
> 
> lavf/amr: Make the heuristic for auto-detection even stricter.
> 
> Fixes ticket #7270.
> 
> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=40b7e6071815fc416a4efc5dc1616f5460a3aacb
> ---
> 
>  libavformat/amr.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/libavformat/amr.c b/libavformat/amr.c
> index f954803d46..6cc06bceac 100644
> --- a/libavformat/amr.c
> +++ b/libavformat/amr.c
> @@ -201,7 +201,7 @@ static int amrnb_probe(AVProbeData *p)
>              i++;
>          }
>      }
> -    if (valid > 100 && valid > invalid)
> +    if (valid > 100 && valid >> 4 > invalid)
>          return AVPROBE_SCORE_EXTENSION / 2 + 1;
>      return 0;
>  }
> @@ -258,8 +258,8 @@ static int amrwb_probe(AVProbeData *p)
>              i++;
>          }
>      }
> -    if (valid > 100 && valid > invalid)
> -        return AVPROBE_SCORE_EXTENSION / 2 - 1;
> +    if (valid > 100 && valid >> 4 > invalid)
> +        return AVPROBE_SCORE_EXTENSION / 2 + 1;

This breaks detecting the h263 file:

https://samples.ffmpeg.org/V-codecs/h263/h263-raw/messenger.h263

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

It is what and why we do it that matters, not just one of them.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20180623/730e44ad/attachment.sig>