ad_pcm, codecs.conf: support 'lpcm' in mov and float in aiff

Support 'lpcm' in mov files, has audible (clipping?) artefacts on some
systems.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33075 b3059339-0415-0410-9bf9-f77b7e298cf2

Support 32bit big endian float pcm in aiff.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33076 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
cehoyos 2011-03-12 10:50:14 +00:00 committed by Uoti Urpala
parent cb61c0f2d4
commit e43e0de9e6
2 changed files with 4 additions and 0 deletions

View File

@ -4136,6 +4136,8 @@ audiocodec pcm
format 0x696e3234 ; "42ni" (MOV files)
format 0x32336e69 ; "in32" (MOV files)
format 0x696e3332 ; "23ni" (MOV files)
format 0x6D63706C ; "lpcm" (MOV files)
format 0x32334C46 ; 'FL32" (aiff files)
;;;; these are for hardware support only: (alaw,ulaw,ima-adpcm,mpeg,ac3)
; format 0x6
; format 0x7

View File

@ -86,10 +86,12 @@ 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
sh_audio->sample_format = AF_FORMAT_FLOAT_BE;
sh_audio->samplesize = 4;
break;
case 0x666c3332: // '23lf', little endian float32, MPlayer internal fourCC
case 0x6D63706C: // 'lpcm'
sh_audio->sample_format = AF_FORMAT_FLOAT_LE;
sh_audio->samplesize = 4;
break;