Merge "Remove dead code" (bdb0cee0) · Commits · e / os / android_frameworks_base

services/audioflinger/AudioMixer.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -1017,6 +1017,7 @@ void AudioMixer::process__OneTrack16BitsStereoNoResampling(state_t* state)
		}
		}

		#if 0
		// 2 tracks is also a common case
		// NEVER used in current implementation of process__validate()
		// only use if the 2 tracks have the same output buffer
		@@ -1114,6 +1115,7 @@ void AudioMixer::process__TwoTracks16BitsStereoNoResampling(state_t* state)
		delete [] buff;
		}
		}
		#endif

		// ----------------------------------------------------------------------------
		}; // namespace android

+2 −5

Original line number	Diff line number	Diff line
		@@ -114,11 +114,6 @@ private:
		NEEDS_AUX_ENABLED = 0x00010000,
		};

		static inline int32_t applyVolume(int32_t in, int32_t v) {
		return in * v;
		}


		struct state_t;
		struct track_t;

		@@ -198,7 +193,9 @@ private:
		static void process__genericNoResampling(state_t* state);
		static void process__genericResampling(state_t* state);
		static void process__OneTrack16BitsStereoNoResampling(state_t* state);
		#if 0
		static void process__TwoTracks16BitsStereoNoResampling(state_t* state);
		#endif
		};

		// ----------------------------------------------------------------------------