am 5bb3090a: Merge "Use mul from audioutils"

* commit '5bb3090a18ce7d5b8910b8394516efc5fba7b817':
  Use mul from audioutils
This commit is contained in:
Glenn Kasten
2012-02-10 15:33:49 -08:00
committed by Android Git Automerger

View File

@@ -2504,21 +2504,6 @@ AudioFlinger::DirectOutputThread::~DirectOutputThread()
{
}
static inline
int32_t mul(int16_t in, int16_t v)
{
#if defined(__arm__) && !defined(__thumb__)
int32_t out;
asm( "smulbb %[out], %[in], %[v] \n"
: [out]"=r"(out)
: [in]"%r"(in), [v]"r"(v)
: );
return out;
#else
return in * int32_t(v);
#endif
}
void AudioFlinger::DirectOutputThread::applyVolume(uint16_t leftVol, uint16_t rightVol, bool ramp)
{
// Do not apply volume on compressed audio