Mercurial > mplayer.hg
changeset 17813:f34f61843448
QuickTime in24 and in32 PCM audio support
| author | rathann |
|---|---|
| date | Sat, 11 Mar 2006 22:43:28 +0000 |
| parents | 1ade5769c97b |
| children | 8f2e94a4a4c1 |
| files | ChangeLog etc/codecs.conf libmpcodecs/ad_pcm.c |
| diffstat | 3 files changed, 11 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Mar 11 21:16:59 2006 +0000 +++ b/ChangeLog Sat Mar 11 22:43:28 2006 +0000 @@ -62,6 +62,7 @@ * PNG decoding via libavcodec * removed native RealAudio codecs (ported to lavc) * Zip Motion-Block Video (ZMB) decoder via binary DLL + * support for QuickTime in24 and in32 PCM audio Demuxers: * simultaneous audio capture/playback (-tv immediatemode=0) fixed in v4l2
--- a/etc/codecs.conf Sat Mar 11 21:16:59 2006 +0000 +++ b/etc/codecs.conf Sat Mar 11 22:43:28 2006 +0000 @@ -2363,6 +2363,8 @@ format 0x74776f73 ; "sowt" (MOV files) format 0x32336c66 ; "fl32" (MOV files) format 0x454e4f4e ; "NONE" (MOV files from Kodak CX6320) + format 0x34326e69 ; "in24" (MOV files) + format 0x32336e69 ; "in32" (MOV files) ;;;; these are for hardware support only: (alaw,ulaw,ima-adpcm,mpeg,ac3) ; format 0x6 ; format 0x7
--- a/libmpcodecs/ad_pcm.c Sat Mar 11 21:16:59 2006 +0000 +++ b/libmpcodecs/ad_pcm.c Sat Mar 11 22:43:28 2006 +0000 @@ -65,6 +65,14 @@ sh_audio->sample_format=AF_FORMAT_FLOAT_BE; sh_audio->samplesize=4; break; + case 0x34326e69: // 'in24', bigendian int24 + sh_audio->sample_format=AF_FORMAT_S24_BE; + sh_audio->samplesize=3; + break; + case 0x32336e69: // 'in32', bigendian int32 + sh_audio->sample_format=AF_FORMAT_S32_BE; + sh_audio->samplesize=4; + break; default: if(sh_audio->samplesize!=2) sh_audio->sample_format=AF_FORMAT_U8; } if (!sh_audio->samplesize) // this would cause MPlayer to hang later