[Mplayer-cvslog] CVS: main/libmpdemux matroska.h,1.10,1.11 demux_mkv.cpp,1.49,1.50

[D Richard Felker III]

On Fri, Dec 05, 2003 at 12:04:11PM +0100, Moritz Bunkus CVS wrote:
> Update of /cvsroot/mplayer/main/libmpdemux
> In directory mail:/var/tmp.root/cvs-serv31836
> 
> Modified Files:
> 	matroska.h demux_mkv.cpp 
> Log Message:
> Support for HE-AAC in Matroska. Also only set ds->pts to the first pts of a laced block, and set dp->pts to the current pts taking default_duration into account.
> 
> Index: matroska.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/libmpdemux/matroska.h,v
> retrieving revision 1.10
> retrieving revision 1.11
> diff -u -r1.10 -r1.11
> --- matroska.h	16 Nov 2003 22:53:08 -0000	1.10
> +++ matroska.h	5 Dec 2003 11:03:43 -0000	1.11
> @@ -9,12 +9,13 @@
>  
>  #define MKV_A_AAC_2MAIN  "A_AAC/MPEG2/MAIN"
>  #define MKV_A_AAC_2LC    "A_AAC/MPEG2/LC"
> +#define MKV_A_AAC_2SBR   "A_AAC/MPEG2/LC/SBR"
  ...
> Index: demux_mkv.cpp
> ===================================================================
> RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.cpp,v
> retrieving revision 1.49
> retrieving revision 1.50
> diff -u -r1.49 -r1.50
> --- demux_mkv.cpp	16 Nov 2003 20:05:09 -0000	1.49
> +++ demux_mkv.cpp	5 Dec 2003 11:03:43 -0000	1.50
  ...
> @@ -981,13 +983,14 @@
>                     !strcmp(t->codec_id, MKV_A_PCM_BE))
>              t->a_formattag = 0x0001;
>            else if (!strcmp(t->codec_id, MKV_A_AAC_2MAIN) ||
> -                   !strcmp(t->codec_id, MKV_A_AAC_2LC) ||
> +                   !strncmp(t->codec_id, MKV_A_AAC_2LC,
> +                            strlen(MKV_A_AAC_2LC)) ||
>                     !strcmp(t->codec_id, MKV_A_AAC_2SSR) ||
>                     !strcmp(t->codec_id, MKV_A_AAC_4MAIN) ||
> -                   !strcmp(t->codec_id, MKV_A_AAC_4LC) ||
> +                   !strncmp(t->codec_id, MKV_A_AAC_4LC,
> +                            strlen(MKV_A_AAC_4LC)) ||
>                     !strcmp(t->codec_id, MKV_A_AAC_4SSR) ||
> -                   !strcmp(t->codec_id, MKV_A_AAC_4LTP) ||
> -                   !strcmp(t->codec_id, MKV_A_AAC_4SBR))
> +                   !strcmp(t->codec_id, MKV_A_AAC_4LTP))
>              t->a_formattag = mmioFOURCC('M', 'P', '4', 'A');
>            else if (!strcmp(t->codec_id, MKV_A_VORBIS)) {
>              if (t->private_data == NULL) {
> @@ -1486,6 +1489,34 @@
>    mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] \\---- [ parsing seek head ] ---------\n");
>  }
>  
> +#define AAC_SYNC_EXTENSION_TYPE 0x02b7
> +static int aac_get_sample_rate_index(uint32_t sample_rate) {
> +  if (92017 <= sample_rate)
> +    return 0;
> +  else if (75132 <= sample_rate)
> +    return 1;
> +  else if (55426 <= sample_rate)
> +    return 2;
> +  else if (46009 <= sample_rate)
> +    return 3;
> +  else if (37566 <= sample_rate)
> +    return 4;
> +  else if (27713 <= sample_rate)
> +    return 5;
> +  else if (23004 <= sample_rate)
> +    return 6;
> +  else if (18783 <= sample_rate)
> +    return 7;
> +  else if (13856 <= sample_rate)
> +    return 8;
> +  else if (11502 <= sample_rate)
> +    return 9;
> +  else if (9391 <= sample_rate)
> +    return 10;
> +  else
> +    return 11;
> +}
> +
  ...

And on and on and on........

OH MY GOODNESS!

Is there ANY way that ANY sane person cannot agree that Matroska is
complete and utter shit after reading this??????????

Rich