thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AUDIO: Fix some whitespaces

Browse source
This commit is contained in:
dhewg 2011-03-11 20:53:25 +01:00
parent a2a5083dc9
commit 3d576c184a
1 changed files with 85 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

167
audio/rate_arm.cpp
View file

@ -60,7 +60,7 @@ namespace Audio {
* ARM routine we call doesn't respect those definitions. * ARM routine we call doesn't respect those definitions.
*/ */
#define FRAC_BITS 16 #define FRAC_BITS 16
#define FRAC_ONE (1<<FRAC_BITS) #define FRAC_ONE (1 << FRAC_BITS)
/** /**
* The size of the intermediate input cache. Bigger values may increase * The size of the intermediate input cache. Bigger values may increase
@ -138,34 +138,33 @@ extern "C" {
} }
extern "C" st_sample_t *ARM_SimpleRate_M( extern "C" st_sample_t *ARM_SimpleRate_M(
AudioStream &input, AudioStream &input,
int (*fn)(Audio::AudioStream&,int16*,int), int (*fn)(Audio::AudioStream&,int16*,int),
SimpleRateDetails *sr, SimpleRateDetails *sr,
st_sample_t *obuf, st_sample_t *obuf,
st_size_t osamp, st_size_t osamp,
st_volume_t vol_l, st_volume_t vol_l,
st_volume_t vol_r); st_volume_t vol_r);
extern "C" st_sample_t *ARM_SimpleRate_S( extern "C" st_sample_t *ARM_SimpleRate_S(
AudioStream &input, AudioStream &input,
int (*fn)(Audio::AudioStream&,int16*,int), int (*fn)(Audio::AudioStream&,int16*,int),
SimpleRateDetails *sr, SimpleRateDetails *sr,
st_sample_t *obuf, st_sample_t *obuf,
st_size_t osamp, st_size_t osamp,
st_volume_t vol_l, st_volume_t vol_l,
st_volume_t vol_r); st_volume_t vol_r);
extern "C" st_sample_t *ARM_SimpleRate_R( extern "C" st_sample_t *ARM_SimpleRate_R(
AudioStream &input, AudioStream &input,
int (*fn)(Audio::AudioStream&,int16*,int), int (*fn)(Audio::AudioStream&,int16*,int),
SimpleRateDetails *sr, SimpleRateDetails *sr,
st_sample_t *obuf, st_sample_t *obuf,
st_size_t osamp, st_size_t osamp,
st_volume_t vol_l, st_volume_t vol_l,
st_volume_t vol_r); st_volume_t vol_r);
extern "C" int SimpleRate_readFudge(Audio::AudioStream &input, extern "C" int SimpleRate_readFudge(Audio::AudioStream &input, int16 *a, int b)
int16 *a, int b)
{ {
#ifdef DEBUG_RATECONV #ifdef DEBUG_RATECONV
debug("Reading ptr=%x n%d", a, b); debug("Reading ptr=%x n%d", a, b);
@ -183,21 +182,22 @@ int SimpleRateConverter<stereo, reverseStereo>::flow(AudioStream &input, st_samp
if (!stereo) { if (!stereo) {
obuf = ARM_SimpleRate_M(input, obuf = ARM_SimpleRate_M(input,
&SimpleRate_readFudge, &SimpleRate_readFudge,
&sr, &sr,
obuf, osamp, vol_l, vol_r); obuf, osamp, vol_l, vol_r);
} else if (reverseStereo) { } else if (reverseStereo) {
obuf = ARM_SimpleRate_R(input, obuf = ARM_SimpleRate_R(input,
&SimpleRate_readFudge, &SimpleRate_readFudge,
&sr, &sr,
obuf, osamp, vol_l, vol_r); obuf, osamp, vol_l, vol_r);
} else { } else {
obuf = ARM_SimpleRate_S(input, obuf = ARM_SimpleRate_S(input,
&SimpleRate_readFudge, &SimpleRate_readFudge,
&sr, &sr,
obuf, osamp, vol_l, vol_r); obuf, osamp, vol_l, vol_r);
} }
return (obuf-ostart)/2;
return (obuf - ostart) / 2;
} }
/** /**
@ -240,31 +240,31 @@ extern "C" {
} }
extern "C" st_sample_t *ARM_LinearRate_M( extern "C" st_sample_t *ARM_LinearRate_M(
AudioStream &input, AudioStream &input,
int (*fn)(Audio::AudioStream&,int16*,int), int (*fn)(Audio::AudioStream&,int16*,int),
LinearRateDetails *lr, LinearRateDetails *lr,
st_sample_t *obuf, st_sample_t *obuf,
st_size_t osamp, st_size_t osamp,
st_volume_t vol_l, st_volume_t vol_l,
st_volume_t vol_r); st_volume_t vol_r);
extern "C" st_sample_t *ARM_LinearRate_S( extern "C" st_sample_t *ARM_LinearRate_S(
AudioStream &input, AudioStream &input,
int (*fn)(Audio::AudioStream&,int16*,int), int (*fn)(Audio::AudioStream&,int16*,int),
LinearRateDetails *lr, LinearRateDetails *lr,
st_sample_t *obuf, st_sample_t *obuf,
st_size_t osamp, st_size_t osamp,
st_volume_t vol_l, st_volume_t vol_l,
st_volume_t vol_r); st_volume_t vol_r);
extern "C" st_sample_t *ARM_LinearRate_R( extern "C" st_sample_t *ARM_LinearRate_R(
AudioStream &input, AudioStream &input,
int (*fn)(Audio::AudioStream&,int16*,int), int (*fn)(Audio::AudioStream&,int16*,int),
LinearRateDetails *lr, LinearRateDetails *lr,
st_sample_t *obuf, st_sample_t *obuf,
st_size_t osamp, st_size_t osamp,
st_volume_t vol_l, st_volume_t vol_l,
st_volume_t vol_r); st_volume_t vol_r);
template<bool stereo, bool reverseStereo> template<bool stereo, bool reverseStereo>
class LinearRateConverter : public RateConverter { class LinearRateConverter : public RateConverter {
@ -328,21 +328,21 @@ int LinearRateConverter<stereo, reverseStereo>::flow(AudioStream &input, st_samp
if (!stereo) { if (!stereo) {
obuf = ARM_LinearRate_M(input, obuf = ARM_LinearRate_M(input,
&SimpleRate_readFudge, &SimpleRate_readFudge,
&lr, &lr,
obuf, osamp, vol_l, vol_r); obuf, osamp, vol_l, vol_r);
} else if (reverseStereo) { } else if (reverseStereo) {
obuf = ARM_LinearRate_R(input, obuf = ARM_LinearRate_R(input,
&SimpleRate_readFudge, &SimpleRate_readFudge,
&lr, &lr,
obuf, osamp, vol_l, vol_r); obuf, osamp, vol_l, vol_r);
} else { } else {
obuf = ARM_LinearRate_S(input, obuf = ARM_LinearRate_S(input,
&SimpleRate_readFudge, &SimpleRate_readFudge,
&lr, &lr,
obuf, osamp, vol_l, vol_r); obuf, osamp, vol_l, vol_r);
} }
return (obuf-ostart)/2; return (obuf - ostart) / 2;
} }
@ -361,31 +361,32 @@ extern "C" {
} }
extern "C" st_sample_t *ARM_CopyRate_M( extern "C" st_sample_t *ARM_CopyRate_M(
st_size_t len, st_size_t len,
st_sample_t *obuf, st_sample_t *obuf,
st_volume_t vol_l, st_volume_t vol_l,
st_volume_t vol_r, st_volume_t vol_r,
st_sample_t *_buffer); st_sample_t *_buffer);
extern "C" st_sample_t *ARM_CopyRate_S( extern "C" st_sample_t *ARM_CopyRate_S(
st_size_t len, st_size_t len,
st_sample_t *obuf, st_sample_t *obuf,
st_volume_t vol_l, st_volume_t vol_l,
st_volume_t vol_r, st_volume_t vol_r,
st_sample_t *_buffer); st_sample_t *_buffer);
extern "C" st_sample_t *ARM_CopyRate_R( extern "C" st_sample_t *ARM_CopyRate_R(
st_size_t len, st_size_t len,
st_sample_t *obuf, st_sample_t *obuf,
st_volume_t vol_l, st_volume_t vol_l,
st_volume_t vol_r, st_volume_t vol_r,
st_sample_t *_buffer); st_sample_t *_buffer);
template<bool stereo, bool reverseStereo> template<bool stereo, bool reverseStereo>
class CopyRateConverter : public RateConverter { class CopyRateConverter : public RateConverter {
st_sample_t *_buffer; st_sample_t *_buffer;
st_size_t _bufferSize; st_size_t _bufferSize;
public: public:
CopyRateConverter() : _buffer(0), _bufferSize(0) {} CopyRateConverter() : _buffer(0), _bufferSize(0) {}
~CopyRateConverter() { ~CopyRateConverter() {
@ -399,7 +400,7 @@ public:
debug("Copy st=%d rev=%d", stereo, reverseStereo); debug("Copy st=%d rev=%d", stereo, reverseStereo);
#endif #endif
st_size_t len; st_size_t len;
st_sample_t *ostart = obuf; st_sample_t *ostart = obuf;
if (stereo) if (stereo)
osamp *= 2; osamp *= 2;
@ -424,8 +425,9 @@ public:
else else
obuf = ARM_CopyRate_M(len, obuf, vol_l, vol_r, _buffer); obuf = ARM_CopyRate_M(len, obuf, vol_l, vol_r, _buffer);
return (obuf-ostart)/2; return (obuf - ostart) / 2;
} }
virtual int drain(st_sample_t *obuf, st_size_t osamp, st_volume_t vol) { virtual int drain(st_sample_t *obuf, st_size_t osamp, st_volume_t vol) {
return (ST_SUCCESS); return (ST_SUCCESS);
} }
@ -469,3 +471,4 @@ RateConverter *makeRateConverter(st_rate_t inrate, st_rate_t outrate, bool stere
} }
} // End of namespace Audio } // End of namespace Audio