aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMax Horn2005-06-24 16:21:10 +0000
committerMax Horn2005-06-24 16:21:10 +0000
commit9da50d66628df3c86ee63cb4eeb185ae4e6e7b4a (patch)
treed0d5c30310410da242e93b73933e90e0ce1bdc67 /sound
parent7760c0b8a42dc5b5ccac06252ddadf31e8310b59 (diff)
downloadscummvm-rg350-9da50d66628df3c86ee63cb4eeb185ae4e6e7b4a.tar.gz
scummvm-rg350-9da50d66628df3c86ee63cb4eeb185ae4e6e7b4a.tar.bz2
scummvm-rg350-9da50d66628df3c86ee63cb4eeb185ae4e6e7b4a.zip
Fixed Oki table entry; added doc URL; mention IMA ADPCM
svn-id: r18456
Diffstat (limited to 'sound')
-rw-r--r--sound/adpcm.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/adpcm.cpp b/sound/adpcm.cpp
index d04cb7c67c..55b84112b6 100644
--- a/sound/adpcm.cpp
+++ b/sound/adpcm.cpp
@@ -27,7 +27,10 @@
// Routines to convert 12 bit linear samples to the
-// Dialogic or Oki ADPCM coding format aka VOX
+// Dialogic or Oki ADPCM coding format aka VOX.
+// See also <http://www.comptek.ru/telephony/tnotes/tt1-13.html>
+//
+// In addition, also IMA ADPCM is supported.
class ADPCMInputStream : public AudioStream {
private:
bool _evenPos;
@@ -196,7 +199,6 @@ int16 ADPCMInputStream::imaADPCMDecode(byte code) {
E += SS/2;
if (code & 0x04)
E += SS;
-
diff = (code & 0x08) ? -E : E;
samp = _status.last + diff;