resolved conflicts for merge of 05683c85 to master (aeeb7e21) · Commits · e / os / android_frameworks_av

services/audioflinger/AudioFlinger.cpp

+18 −5

Original line number	Diff line number	Diff line
		@@ -1849,7 +1849,7 @@ uint32_t AudioFlinger::PlaybackThread::activeSleepTimeUs()

		AudioFlinger::MixerThread::MixerThread(const sp<AudioFlinger>& audioFlinger, AudioStreamOut* output, int id, uint32_t device)
		: PlaybackThread(audioFlinger, output, id, device),
		mAudioMixer(NULL)
		mAudioMixer(NULL), mPrevMixerStatus(MIXER_IDLE)
		{
		mType = ThreadBase::MIXER;
		mAudioMixer = new AudioMixer(mFrameCount, mSampleRate);
		@@ -1962,6 +1962,7 @@ bool AudioFlinger::MixerThread::threadLoop()
		ALOGV("MixerThread %p TID %d waking up\n", this, gettid());
		acquireWakeLock_l();

		mPrevMixerStatus = MIXER_IDLE;
		if (!mMasterMute) {
		char value[PROPERTY_VALUE_MAX];
		property_get("ro.audio.silent", value, "0");
		@@ -2121,11 +2122,11 @@ uint32_t AudioFlinger::MixerThread::prepareTracks_l(const SortedVector< wp<Track
		// make sure that we have enough frames to mix one full buffer.
		// enforce this condition only once to enable draining the buffer in case the client
		// app does not call stop() and relies on underrun to stop:
		// hence the test on (track->mRetryCount >= kMaxTrackRetries) meaning the track was mixed
		// hence the test on (mPrevMixerStatus == MIXER_TRACKS_READY) meaning the track was mixed
		// during last round
		uint32_t minFrames = 1;
		if (!track->isStopped() && !track->isPausing() &&
		(track->mRetryCount >= kMaxTrackRetries)) {
		(mPrevMixerStatus == MIXER_TRACKS_READY)) {
		if (t->sampleRate() == (int)mSampleRate) {
		minFrames = mFrameCount;
		} else {
		@@ -2274,7 +2275,13 @@ uint32_t AudioFlinger::MixerThread::prepareTracks_l(const SortedVector< wp<Track

		// reset retry count
		track->mRetryCount = kMaxTrackRetries;
		// If one track is ready, set the mixer ready if:
		// - the mixer was not ready during previous round OR
		// - no other track is not ready
		if (mPrevMixerStatus != MIXER_TRACKS_READY \|\|
		mixerStatus != MIXER_TRACKS_ENABLED) {
		mixerStatus = MIXER_TRACKS_READY;
		}
		} else {
		//ALOGV("track %d u=%08x, s=%08x [NOT READY] on thread %p", name, cblk->user, cblk->server, this);
		if (track->isStopped()) {
		@@ -2292,7 +2299,11 @@ uint32_t AudioFlinger::MixerThread::prepareTracks_l(const SortedVector< wp<Track
		tracksToRemove->add(track);
		// indicate to client process that the track was disabled because of underrun
		android_atomic_or(CBLK_DISABLED_ON, &cblk->flags);
		} else if (mixerStatus != MIXER_TRACKS_READY) {
		// If one track is not ready, mark the mixer also not ready if:
		// - the mixer was ready during previous round OR
		// - no other track is ready
		} else if (mPrevMixerStatus == MIXER_TRACKS_READY \|\|
		mixerStatus != MIXER_TRACKS_READY) {
		mixerStatus = MIXER_TRACKS_ENABLED;
		}
		}
		@@ -2326,6 +2337,7 @@ uint32_t AudioFlinger::MixerThread::prepareTracks_l(const SortedVector< wp<Track
		memset(mMixBuffer, 0, mFrameCount * mChannelCount * sizeof(int16_t));
		}

		mPrevMixerStatus = mixerStatus;
		return mixerStatus;
		}

		@@ -3054,6 +3066,7 @@ bool AudioFlinger::DuplicatingThread::threadLoop()
		ALOGV("DuplicatingThread %p TID %d waking up\n", this, gettid());
		acquireWakeLock_l();

		mPrevMixerStatus = MIXER_IDLE;
		if (!mMasterMute) {
		char value[PROPERTY_VALUE_MAX];
		property_get("ro.audio.silent", value, "0");

services/audioflinger/AudioFlinger.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -831,6 +831,8 @@ private:
		virtual uint32_t suspendSleepTimeUs();

		AudioMixer* mAudioMixer;
		uint32_t mPrevMixerStatus; // previous status (mixer_state) returned by
		// prepareTracks_l()
		};

		class DirectOutputThread : public PlaybackThread {