Commit Graph

28 Commits

Author SHA1 Message Date
reimar 31f9de2546 Initialize local variable, avoids a possible crash due to using an
uninitialized variable as array index for mono files.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29339 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-01 10:43:41 +00:00
diego 6e9cbdc104 whitespace cosmetics: Remove all trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-13 02:58:57 +00:00
reimar ed0edb61cb Make really sure channels can only be 1 or 2 for imaadpcm
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27262 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 19:29:41 +00:00
reimar ca588e6a9f Simplify imaadpcm return statement
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27261 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 19:28:22 +00:00
reimar 0872673a5e Remove unused macros
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27253 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 18:12:15 +00:00
reimar 57b3cfcea4 Explicitly include inttypes.h in ad_imaadpcm
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27252 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 18:10:06 +00:00
diego bd6d4ea9cf Remove unused variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27185 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-02 23:19:05 +00:00
reimar c2af943b84 Half size for adpcm_index
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27153 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 09:14:26 +00:00
reimar 9f941c8a00 Simplify predictor updates
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27152 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 09:10:46 +00:00
reimar 8532066166 Get rid of 16-bit sign extension macro
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27151 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 08:47:56 +00:00
reimar 6767061f8b Simplify some imaadpcm macros
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27150 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 08:42:53 +00:00
reimar 5e97c2f960 Directly pass arrays into decode_nibbles
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27149 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 08:35:27 +00:00
reimar fe3548c668 Use smaller types for tables
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27148 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 08:27:52 +00:00
reimar 64478f25d6 Make imaadpcm tables const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27147 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 08:22:47 +00:00
reimar 8666dab4f0 Simplify code to read index/predictor
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27146 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 08:20:42 +00:00
reimar 2f1ffb093b Add a few size checks to IMA decoder. The code is still a mess though,
but bug # 1114 is probably fixed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27145 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 08:08:51 +00:00
reimar 15a54da104 Simplify ad_imaadpcm decode_audio function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27144 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 07:55:44 +00:00
reimar 18004d2d98 Hack around libavutil/bswap.h compilation problems due to always_inline undefined.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21523 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-07 11:58:07 +00:00
diego cac6c0eea2 Remove bswap.h, use libavutil/bswap.h instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21388 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-29 15:02:45 +00:00
reimar fe5d1817e0 fix illegal read
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15787 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-20 15:10:40 +00:00
reimar 393924ff39 setting samplesize to 2 in decoders where neccessary.
Needed because initialization of sh_audio was moved from dec_audio to
demuxer.c, and some demuxers set samplesize incorrect or to 0.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13428 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-21 20:34:47 +00:00
rtognimp 16a6f6b201 100l: you have 2 nibbles per byte, don't divide byte count by 2
Fixes samples/ima_adpcm_stutter/IMAG0006.AVI and another wav file i
have.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10809 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-09-03 22:30:30 +00:00
alex 4cd4fd0745 ms\0x00\x11 support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8104 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-04 20:31:46 +00:00
arpi 1b667f61ba -afm/-vfm migration from ID (int) to NAME (string) - simplifies code and makes dlopen()'ing possible
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7181 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-30 21:44:20 +00:00
arpi f331f54b26 control() done
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5482 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-03 21:37:26 +00:00
arpi aff40c7823 audio input buffer allocation/free cleanup
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5459 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-01 17:58:04 +00:00
melanson a9803b9f75 reworked ADPCM decoders; changes include:
* fixed MS IMA ADPCM
 * dissolved adpcm.c/.h into appropriate ad_* decoders
 * DK4 audio is handled directly by IMA ADPCM decoder (this obsoletes
   ad_dk4adpcm.c)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5409 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-30 22:27:45 +00:00
arpi 7c026066ea imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface functions changed to static, info->author field added
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5341 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-25 21:06:01 +00:00