RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

QuickTime in24 and in32 PCM audio support 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17814 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
rathann 2006-03-11 22:43:28 +00:00
parent 4e880d8076
commit 7875c2e150
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -62,6 +62,7 @@ MPlayer (1.0)
* 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

2
etc/codecs.conf
View File

@ -2363,6 +2363,8 @@ audiocodec pcm
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

8
libmpcodecs/ad_pcm.c
View File

@ -65,6 +65,14 @@ static int init(sh_audio_t *sh_audio)
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