[FFmpeg-devel] [PATCH] ADTS AAC with ID3v2

[Michael Niedermayer]

On Wed, Jan 14, 2009 at 12:23:00AM -0500, Alex Converse wrote:
> Hi,
> 
> The attached patch adds support to the ADTS AAC probe to detect AAC files
> with ID3v2 tags at a higher level than the MP3 probe and the MPC probe. It
> refactors some id3 detection from mp3.c into id3v2.c.
> 
[...]

>  #define ID3v1_TAG_SIZE 128
> -
>  #define ID3v1_GENRE_MAX 125
>  
>  static const char * const id3v1_genre_str[ID3v1_GENRE_MAX + 1] = {

cosmetic 

[...]
> @@ -487,7 +472,7 @@ static int mp3_read_header(AVFormatContext *s,
>      ret = get_buffer(s->pb, buf, ID3v2_HEADER_SIZE);
>      if (ret != ID3v2_HEADER_SIZE)
>          return -1;
> -    if (id3v2_match(buf)) {
> +    if (ff_id3v2_match(buf)) {
>          /* parse ID3v2 header */
>          len = ((buf[6] & 0x7f) << 21) |
>              ((buf[7] & 0x7f) << 14) |

the split out of (ff_)id3v2_match is ok but should be a seperate patch
and commit

[...]
>      }
> -    if   (first_frames>=3) return AVPROBE_SCORE_MAX/2+1;
> +    if   (first_frames>=3) return AVPROBE_SCORE_MAX/2+2;
>      else if(max_frames>500)return AVPROBE_SCORE_MAX/2;
>      else if(max_frames>=3) return AVPROBE_SCORE_MAX/4;
>      else if(max_frames>=1) return 1;

why?

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

Freedom in capitalist society always remains about the same as it was in
ancient Greek republics: Freedom for slave owners. -- Vladimir Lenin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20090114/7cf65649/attachment.pgp>