1
0
Fork 0
Commit graph

65 commits

Author SHA1 Message Date
krcroft
8f2a153dc2 STB Vorbis: eliminate inaccessible branch
The eliminated code removes the (ch == 1) branch, which is scoped
within this if condition: `if (rtype == 2 && ch != 1)`, therefore
the (ch == 1) branch will never be taken.
2019-12-05 10:35:44 +01:00
krcroft
a7a899fdb0 STB Vorbis: prevent division by zero in decode_resign if ch == 0
In the call to decode_residue:
  decode_residue(f, residue_buffers, ch, n2, r, do_not_decode);

The channel count is previously intialized as zero and incremented
based on a for-loop (f->channels) plus a conditional,
if (map->chan[j].mux == i).  If this doesn't happen then 'ch'
remains zero.

Once inside decode_residue(..), the code has three branches based
on channel count: stereo (ch == 2), mono (ch == 1), and then the
exception if it's neither of those (simple 'else').  It's in here
where a zero-valued 'ch' can be used as the denominator in these
calculations:
    int c_inter = z % ch
    p_inter = z/ch;

Obviously this 'else' branch is meant for channel counts greater
than two an not for zero channels; so this change simply makes
that branch only valid if (ch > 2).
2019-12-05 10:35:44 +01:00
krcroft
bedcc244d9 STB Vorbis: Check before derefercing a potential NULL pointer 2019-12-05 10:35:44 +01:00
David Reid
84588c50bd Bump dr_wav to v0.11.2
Fixes:
- https://github.com/mackron/dr_libs/issues/84
- https://github.com/mackron/dr_libs/issues/83
- https://github.com/mackron/dr_libs/issues/82
- https://github.com/mackron/dr_libs/issues/81
- https://github.com/mackron/dr_libs/issues/80
- https://github.com/mackron/dr_libs/issues/79
- https://github.com/mackron/dr_libs/issues/78
- https://github.com/mackron/dr_libs/issues/77
- https://github.com/mackron/dr_libs/issues/76
- https://github.com/mackron/dr_libs/issues/75
2019-12-03 06:35:00 +01:00
David Reid
6b5a5acc9a Bump dr_mp3 to v0.5.4
Fixes:
- https://github.com/mackron/dr_libs/issues/86
- https://github.com/mackron/dr_libs/issues/85
2019-12-03 06:35:00 +01:00
David Reid
1866b4d295 Bump dr_flac to v0.12.3
Fixes:
- https://github.com/mackron/dr_libs/issues/93
- https://github.com/mackron/dr_libs/issues/92
- https://github.com/mackron/dr_libs/issues/91
- https://github.com/mackron/dr_libs/issues/90
- https://github.com/mackron/dr_libs/issues/89
- https://github.com/mackron/dr_libs/issues/88
- https://github.com/mackron/dr_libs/issues/87
2019-12-03 06:35:00 +01:00
krcroft
1f2ff70463 Ensure alloca is not defined before defining 2019-12-03 06:35:00 +01:00
krcroft
01a61a33f8 Remove ineffective consts and indicate unused variables 2019-12-03 06:35:00 +01:00
Patryk Obara
618ab5ea08 Remove several unused variables in zmbv 2019-11-24 17:14:32 +01:00
Patryk Obara
bdee95848e Silence a number of switch warnings in zmbv 2019-11-24 17:14:32 +01:00
krcroft
9892c1722a Remove SpeexDSP from the auto-tools configuraiton 2019-11-12 08:17:09 +01:00
krcroft
5a9dd2866b
Refactor and pass-through the decode buffer 2019-11-11 13:27:19 -08:00
krcroft
83e1979f26
Eliminate buffers, conversions, and unused code 2019-11-11 13:20:11 -08:00
David Reid
3d8dceee57
Bump dr_mp3 codec to v0.5.2 2019-11-11 13:16:22 -08:00
krcroft
dfc9b2db31 Add the audio handling changes to build system and documentation 2019-11-06 05:47:03 +01:00
krcroft
fd695b0948 Cleanup comments and NULL-handling in decoders 2019-11-06 05:15:42 +01:00
krcroft
b932a89f87
Adapt the vorbis library to SDL_Sound's needs 2019-11-05 17:21:39 -08:00
krcroft
f39b51fa78 Add SDL decoders for their corresponding codecs 2019-11-02 19:27:36 +01:00
krcroft
1f193e14ab Simplify the task of making bit-field operations C and C++ compatible 2019-10-28 22:43:23 +01:00
krcroft
5736a7de9b Make comment match reality 2019-10-28 22:43:23 +01:00
krcroft
b99184d97e Replace SDL_RWFromMem with more applicable SDL_RWFromConstMem 2019-10-28 22:43:23 +01:00
krcroft
d9658b4788 Replace strncpy with snprintf 2019-10-28 22:43:23 +01:00
krcroft
d2333979cf Tailor SDL_Sound for interal use by DOSBox
- Removes extraneous (and unused) includes

 - Cleans up many compiler warnings

 - Fixes SDL include statements (using proper `#include <file.h>` directives
   given the prior `#include "file.h"` directives should only be used when
   including a projects' own header files instead of -Ipath-provided system
   headers)

 - Eliminates extraneous codecs

Many of these were made after building SDL_Sound under various compilers
and operating systems and hitting various issues. It currently builds
clean without errors or warnings on all our workflow compilers and
versions.
2019-10-28 22:43:23 +01:00
Ryan C. Gordon
0420181d59 Add built-in SDL_sound r599
This commit contains several files imported from SDL_sound Mercurial
repo: https://hg.icculus.org/icculus/SDL_sound/ r599 (also tagged as
"final-lgpl-revision").
2019-10-26 06:55:13 +02:00
Arthur Ouellet
db67ff2e3b Add built-in C++ object serializer [snapshot as of 2019-10-23] 2019-10-25 00:47:43 +02:00
Yann Collet
28cf402cae Add built-in Extremely Fast Hash algorithm: xxHash [snapshot as of 2019-10-23] 2019-10-25 00:47:43 +02:00
Sean Barrett
fd5aeab8b5 Add built-in Vorbis codec: stb_vorbis v1.17 2019-10-25 00:47:43 +02:00
David Reid
d66317a08e Add built-in WAV codec: dr_wav v0.11.1 2019-10-25 00:47:43 +02:00
David Reid
a5f1e3473f Add built-in MP3 codec: dr_mp3 v0.5.1 2019-10-25 00:47:43 +02:00
David Reid
a5d87fa8ce Add built-in FLAC codec: dr_flac v0.12.2 2019-10-25 00:47:43 +02:00
Patryk Obara
0a9f80f1b5 Transform zmbv into a project inside dosbox solution
This way it's possible to build them together in VS and it's easier to
develop both.
2019-10-02 12:03:03 +02:00
Patryk Obara
a57d081f24 Upgrade zmbv solution and project to VS2019
Previous solution format does not work any more in modern Visual Studio.
Includes some project adjustments needed to cleanly build the project in
MSVC without any warnings.
2019-10-02 12:03:03 +02:00
Patryk Obara
b62a637157 Import svn:ignore props to .gitignore files 2019-09-15 20:34:57 +02:00
Sjoerd van der Berg
e48149278e Changes to allow for mingw i686 to compile a new zmbv.dll
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4247
2019-06-25 20:44:00 +00:00
Peter Veenstra
5888c05dd1 Add some missing va_ends. Reported by jmarsh
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4227
2019-05-23 12:51:10 +00:00
Peter Veenstra
1fbaff47fc Update year and address of FSF
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4183
2019-01-25 14:09:58 +00:00
Peter Veenstra
5bb10db88b Time keeps on ticking
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4109
2018-05-29 12:58:58 +00:00
Peter Veenstra
6cf39c1fc6 Years update
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4021
2017-05-30 11:35:08 +00:00
Sjoerd van der Berg
169ca61f9e fix for 256 color encoding in zmbv.dll codec patch by Avery Lee
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3993
2016-09-04 19:04:02 +00:00
Peter Veenstra
0f4c92ca32 Year update.
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3878
2015-01-06 14:40:32 +00:00
Peter Veenstra
2fea508f7f Year update
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3812
2013-01-15 09:03:13 +00:00
Sebastian Strohhäcker
0ae27e9b4a year/info update for some other files as well
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3701
2011-04-26 15:00:36 +00:00
Peter Veenstra
999f33de27 Update year. Remove CVS tags
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3700
2011-04-26 09:34:55 +00:00
Ralf Grillenberger
d40f71fc45 Fix warnings (thanks ripsaw)
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3578
2010-04-12 10:37:59 +00:00
Peter Veenstra
a78b2c4f8b Update year
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3548
2010-02-11 13:36:50 +00:00
Peter Veenstra
16d14b78e1 Some year and version numbers
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3410
2009-05-27 09:15:42 +00:00
Sebastian Strohhäcker
229c30dd4f min/max safety
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3394
2009-05-17 15:28:05 +00:00
Sebastian Strohhäcker
9d45ed91b5 update zmbv installer (installs under vista64 as 32bit wow6432 codec)
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3302
2009-02-12 21:38:23 +00:00
Sebastian Strohhäcker
384ca22a2b update zmbv codec stats
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3300
2009-02-04 21:47:57 +00:00
Peter Veenstra
0c570b7b79 Disable menu, reintroduce pausedosbox. reintroduce -startmapper and keybindings.
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3293
2009-02-01 16:06:26 +00:00