[MPlayer-cvslog] r33076 - in trunk: etc/codecs.conf libmpcodecs/ad_pcm.c

[Reimar Döffinger]

On Sat, Mar 12, 2011 at 11:55:33AM +0100, cehoyos wrote:
> Modified: trunk/etc/codecs.conf
> ==============================================================================
> --- trunk/etc/codecs.conf	Sat Mar 12 11:50:14 2011	(r33075)
> +++ trunk/etc/codecs.conf	Sat Mar 12 11:55:33 2011	(r33076)
> @@ -4183,6 +4183,7 @@ audiocodec pcm
>    format 0x32336e69  ; "in32" (MOV files)
>    format 0x696e3332  ; "23ni" (MOV files)
>    format 0x6D63706C  ; "lpcm" (MOV files)
> +  format 0x32334C46  ; 'FL32" (aiff files)

This would be far more readable if it used "fourcc" instead of "format".
Also it is possible to use
format 0x32334C46 0x32336c66
to make MPlayer replace the fourcc (not sure if it's a good idea though,
but it would save extra code in ad_pcm.c, and stupidly it doesn't work
when using fourcc instead, which is quite silly)

> Modified: trunk/libmpcodecs/ad_pcm.c
> ==============================================================================
> --- trunk/libmpcodecs/ad_pcm.c	Sat Mar 12 11:50:14 2011	(r33075)
> +++ trunk/libmpcodecs/ad_pcm.c	Sat Mar 12 11:55:33 2011	(r33076)
> @@ -77,6 +77,7 @@ static int init(sh_audio_t * sh_audio)
>              sh_audio->sample_format = AF_FORMAT_S8;
>          break;
>      case 0x32336c66: // 'fl32', bigendian float32
> +    case 0x32334C46: // 'FL32', bigendian float32 in aiff

We should probably introduce a STR2TAG macro
and use STR2TAG("fl32")
I know we have MKTAG and we have AV_RL32, but both have issues
(MKTAG looks ugly as hell, AV_RL32 might be a function using asm
code and thus can't be used where constants are required).