From e43e0de9e629c780bfe14af50c4c48b220495de4 Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 12 Mar 2011 10:50:14 +0000
Subject: [PATCH] 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
---
 etc/codecs.conf      | 2 ++
 libmpcodecs/ad_pcm.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/etc/codecs.conf b/etc/codecs.conf
index 83476a2c6a..ee758d6037 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -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
diff --git a/libmpcodecs/ad_pcm.c b/libmpcodecs/ad_pcm.c
index 29e78d69af..1920f396f4 100644
--- a/libmpcodecs/ad_pcm.c
+++ b/libmpcodecs/ad_pcm.c
@@ -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;
-- 
2.11.4.GIT