Merge "Remove warnings in Audio mixer resampler compilation." (e983e0a0) · Commits · e / os / android_frameworks_av

services/audioflinger/AudioMixer.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -229,7 +229,7 @@ status_t AudioMixer::initTrackDownmix(track_t* pTrack, int trackNum, audio_chann
		return status;
		}

		void AudioMixer::unprepareTrackForDownmix(track_t* pTrack, int trackName) {
		void AudioMixer::unprepareTrackForDownmix(track_t* pTrack, int trackName __unused) {
		ALOGV("AudioMixer::unprepareTrackForDownmix(%d)", trackName);

		if (pTrack->downmixerBufferProvider != NULL) {
		@@ -783,8 +783,8 @@ void AudioMixer::track__genericResample(track_t* t, int32_t* out, size_t outFram
		}
		}

		void AudioMixer::track__nop(track_t* t, int32_t* out, size_t outFrameCount, int32_t* temp,
		int32_t* aux)
		void AudioMixer::track__nop(track_t* t __unused, int32_t* out __unused,
		size_t outFrameCount __unused, int32_t* temp __unused, int32_t* aux __unused)
		{
		}

		@@ -860,8 +860,8 @@ void AudioMixer::volumeStereo(track_t* t, int32_t* out, size_t frameCount, int32
		}
		}

		void AudioMixer::track__16BitsStereo(track_t* t, int32_t* out, size_t frameCount, int32_t* temp,
		int32_t* aux)
		void AudioMixer::track__16BitsStereo(track_t* t, int32_t* out, size_t frameCount,
		int32_t* temp __unused, int32_t* aux)
		{
		const int16_t in = static_cast<const int16_t >(t->in);

		@@ -951,8 +951,8 @@ void AudioMixer::track__16BitsStereo(track_t* t, int32_t* out, size_t frameCount
		t->in = in;
		}

		void AudioMixer::track__16BitsMono(track_t* t, int32_t* out, size_t frameCount, int32_t* temp,
		int32_t* aux)
		void AudioMixer::track__16BitsMono(track_t* t, int32_t* out, size_t frameCount,
		int32_t* temp __unused, int32_t* aux)
		{
		const int16_t in = static_cast<int16_t const >(t->in);

services/audioflinger/AudioResampler.cpp

+20 −0

Original line number	Diff line number	Diff line
		@@ -541,6 +541,16 @@ void AudioResamplerOrder1::AsmMono16Loop(int16_t in, int32_t maxOutPt, int32_t
		size_t &outputIndex, int32_t* out, size_t &inputIndex, int32_t vl, int32_t vr,
		uint32_t &phaseFraction, uint32_t phaseIncrement)
		{
		(void)maxOutPt; // remove unused parameter warnings
		(void)maxInIdx;
		(void)outputIndex;
		(void)out;
		(void)inputIndex;
		(void)vl;
		(void)vr;
		(void)phaseFraction;
		(void)phaseIncrement;
		(void)in;
		#define MO_PARAM5 "36" // offset of parameter 5 (outputIndex)

		asm(
		@@ -652,6 +662,16 @@ void AudioResamplerOrder1::AsmStereo16Loop(int16_t in, int32_t maxOutPt, int32
		size_t &outputIndex, int32_t* out, size_t &inputIndex, int32_t vl, int32_t vr,
		uint32_t &phaseFraction, uint32_t phaseIncrement)
		{
		(void)maxOutPt; // remove unused parameter warnings
		(void)maxInIdx;
		(void)outputIndex;
		(void)out;
		(void)inputIndex;
		(void)vl;
		(void)vr;
		(void)phaseFraction;
		(void)phaseIncrement;
		(void)in;
		#define ST_PARAM5 "40" // offset of parameter 5 (outputIndex)
		asm(
		"stmfd sp!, {r4, r5, r6, r7, r8, r9, r10, r11, r12, lr}\n"