Merge "Clean up assertion checks" (f4c072d4) · Commits · e / os / android_frameworks_base

services/audioflinger/AudioFlinger.cpp

+7 −6

Original line number	Diff line number	Diff line
		@@ -723,8 +723,9 @@ float AudioFlinger::masterVolume_l() const
		AutoMutex lock(mHardwareLock);

		mHardwareStatus = AUDIO_HW_GET_MASTER_VOLUME;
		assert(NULL != mPrimaryHardwareDev);
		assert(NULL != mPrimaryHardwareDev->get_master_volume);
		ALOG_ASSERT((NULL != mPrimaryHardwareDev) &&
		(NULL != mPrimaryHardwareDev->get_master_volume),
		"can't get master volume");

		mPrimaryHardwareDev->get_master_volume(mPrimaryHardwareDev, &ret_val);
		mHardwareStatus = AUDIO_HW_IDLE;
		@@ -2855,7 +2856,7 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::DirectOutputThread::prep
		tracksToRemove->add(trackToRemove);
		mActiveTracks.remove(trackToRemove);
		if (!mEffectChains.isEmpty()) {
		ALOGV("stopping track on chain %p for session Id: %d", effectChains[0].get(),
		ALOGV("stopping track on chain %p for session Id: %d", mEffectChains[0].get(),
		trackToRemove->sessionId());
		mEffectChains[0]->decActiveTrackCnt();
		}
		@@ -3884,7 +3885,7 @@ status_t AudioFlinger::PlaybackThread::TimedTrack::getNextBuffer(
		{
		Mutex::Autolock mttLock(mMediaTimeTransformLock);

		assert(mMediaTimeTransformValid);
		ALOG_ASSERT(mMediaTimeTransformValid, "media time transform invalid");

		if (mMediaTimeTransform.a_to_b_denom == 0) {
		// the transform represents a pause, so yield silence
		@@ -5486,7 +5487,7 @@ status_t AudioFlinger::closeOutput(audio_io_handle_t output)

		if (thread->type() != ThreadBase::DUPLICATING) {
		AudioStreamOut *out = thread->clearOutput();
		assert(out != NULL);
		ALOG_ASSERT(out != NULL, "out shouldn't be NULL");
		// from now on thread->mOutput is NULL
		out->hwDev->close_output_stream(out->hwDev, out->stream);
		delete out;
		@@ -5629,7 +5630,7 @@ status_t AudioFlinger::closeInput(audio_io_handle_t input)
		// but the ThreadBase container still exists.

		AudioStreamIn *in = thread->clearInput();
		assert(in != NULL);
		ALOG_ASSERT(in != NULL, "in shouldn't be NULL");
		// from now on thread->mInput is NULL
		in->hwDev->close_input_stream(in->hwDev, in->stream);
		delete in;

services/audioflinger/AudioMixer.cpp

+18 −21

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@
		#define LOG_TAG "AudioMixer"
		//#define LOG_NDEBUG 0

		#include <assert.h>
		#include <stdint.h>
		#include <string.h>
		#include <stdlib.h>
		@@ -29,6 +28,7 @@

		#include <cutils/bitops.h>
		#include <cutils/compiler.h>
		#include <utils/Debug.h>

		#include <system/audio.h>

		@@ -46,7 +46,7 @@ AudioMixer::AudioMixer(size_t frameCount, uint32_t sampleRate)
		: mTrackNames(0), mSampleRate(sampleRate)
		{
		// AudioMixer is not yet capable of multi-channel beyond stereo
		assert(2 == MAX_NUM_CHANNELS);
		COMPILE_TIME_ASSERT_FUNCTION_SCOPE(2 == MAX_NUM_CHANNELS);

		LocalClock lc;

		@@ -124,7 +124,7 @@ void AudioMixer::invalidateState(uint32_t mask)
		void AudioMixer::deleteTrackName(int name)
		{
		name -= TRACK0;
		assert(uint32_t(name) < MAX_NUM_TRACKS);
		ALOG_ASSERT(uint32_t(name) < MAX_NUM_TRACKS, "bad track name %d", name);
		ALOGV("deleteTrackName(%d)", name);
		track_t& track(mState.tracks[ name ]);
		if (track.enabled) {
		@@ -146,7 +146,7 @@ void AudioMixer::deleteTrackName(int name)
		void AudioMixer::enable(int name)
		{
		name -= TRACK0;
		assert(uint32_t(name) < MAX_NUM_TRACKS);
		ALOG_ASSERT(uint32_t(name) < MAX_NUM_TRACKS, "bad track name %d", name);
		track_t& track = mState.tracks[name];

		if (!track.enabled) {
		@@ -159,7 +159,7 @@ void AudioMixer::enable(int name)
		void AudioMixer::disable(int name)
		{
		name -= TRACK0;
		assert(uint32_t(name) < MAX_NUM_TRACKS);
		ALOG_ASSERT(uint32_t(name) < MAX_NUM_TRACKS, "bad track name %d", name);
		track_t& track = mState.tracks[name];

		if (track.enabled) {
		@@ -172,7 +172,7 @@ void AudioMixer::disable(int name)
		void AudioMixer::setParameter(int name, int target, int param, void *value)
		{
		name -= TRACK0;
		assert(uint32_t(name) < MAX_NUM_TRACKS);
		ALOG_ASSERT(uint32_t(name) < MAX_NUM_TRACKS, "bad track name %d", name);
		track_t& track = mState.tracks[name];

		int valueInt = (int)value;
		@@ -185,8 +185,9 @@ void AudioMixer::setParameter(int name, int target, int param, void *value)
		case CHANNEL_MASK: {
		uint32_t mask = (uint32_t)value;
		if (track.channelMask != mask) {
		uint8_t channelCount = popcount(mask);
		assert((channelCount <= MAX_NUM_CHANNELS) && (channelCount));
		uint32_t channelCount = popcount(mask);
		ALOG_ASSERT((channelCount <= MAX_NUM_CHANNELS) && (channelCount),
		"bad channel count %u", channelCount);
		track.channelMask = mask;
		track.channelCount = channelCount;
		ALOGV("setParameter(TRACK, CHANNEL_MASK, %x)", mask);
		@@ -208,15 +209,14 @@ void AudioMixer::setParameter(int name, int target, int param, void *value)
		}
		break;
		default:
		// bad param
		assert(false);
		LOG_FATAL("bad param");
		}
		break;

		case RESAMPLE:
		switch (param) {
		case SAMPLE_RATE:
		assert(valueInt > 0);
		ALOG_ASSERT(valueInt > 0, "bad sample rate %d", valueInt);
		if (track.setResampler(uint32_t(valueInt), mSampleRate)) {
		ALOGV("setParameter(RESAMPLE, SAMPLE_RATE, %u)",
		uint32_t(valueInt));
		@@ -228,8 +228,7 @@ void AudioMixer::setParameter(int name, int target, int param, void *value)
		invalidateState(1 << name);
		break;
		default:
		// bad param
		assert(false);
		LOG_FATAL("bad param");
		}
		break;

		@@ -257,7 +256,7 @@ void AudioMixer::setParameter(int name, int target, int param, void *value)
		}
		break;
		case AUXLEVEL:
		//assert(0 <= valueInt && valueInt <= MAX_GAIN_INT);
		//ALOG_ASSERT(0 <= valueInt && valueInt <= MAX_GAIN_INT, "bad aux level %d", valueInt);
		if (track.auxLevel != valueInt) {
		ALOGV("setParameter(VOLUME, AUXLEVEL: %04x)", valueInt);
		track.prevAuxLevel = track.auxLevel << 16;
		@@ -277,14 +276,12 @@ void AudioMixer::setParameter(int name, int target, int param, void *value)
		}
		break;
		default:
		// bad param
		assert(false);
		LOG_FATAL("bad param");
		}
		break;

		default:
		// bad target
		assert(false);
		LOG_FATAL("bad target");
		}
		}

		@@ -335,7 +332,7 @@ size_t AudioMixer::getUnreleasedFrames(int name) const
		void AudioMixer::setBufferProvider(int name, AudioBufferProvider* bufferProvider)
		{
		name -= TRACK0;
		assert(uint32_t(name) < MAX_NUM_TRACKS);
		ALOG_ASSERT(uint32_t(name) < MAX_NUM_TRACKS, "bad track name %d", name);
		mState.tracks[name].bufferProvider = bufferProvider;
		}

		@@ -979,9 +976,9 @@ void AudioMixer::process__OneTrack16BitsStereoNoResampling(state_t* state,
		// This method is only called when state->enabledTracks has exactly
		// one bit set. The asserts below would verify this, but are commented out
		// since the whole point of this method is to optimize performance.
		//assert(0 != state->enabledTracks);
		//ALOG_ASSERT(0 != state->enabledTracks, "no tracks enabled");
		const int i = 31 - __builtin_clz(state->enabledTracks);
		//assert((1 << i) == state->enabledTracks);
		//ALOG_ASSERT((1 << i) == state->enabledTracks, "more than 1 track enabled");
		const track_t& t = state->tracks[i];

		AudioBufferProvider::Buffer& b(t.buffer);