Merge "Clean up AudioTrack::mActive and stopped()" (5c7b3bcc) · Commits · e / os / android_frameworks_av

include/media/AudioTrack.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -445,6 +445,7 @@ private:
		status_t setLoop_l(uint32_t loopStart, uint32_t loopEnd, int loopCount);
		audio_io_handle_t getOutput_l();
		status_t restoreTrack_l(audio_track_cblk_t*& cblk, bool fromStart);
		bool stopped_l() const { return !mActive; }

		sp<IAudioTrack> mAudioTrack;
		sp<IMemory> mCblkMemory;
		@@ -464,7 +465,7 @@ private:
		status_t mStatus;
		uint32_t mLatency;

		volatile int32_t mActive;
		bool mActive; // protected by mLock

		callback_t mCbf;
		void* mUserData;
		@@ -481,7 +482,7 @@ private:
		uint32_t mFlags;
		int mSessionId;
		int mAuxEffectId;
		Mutex mLock;
		mutable Mutex mLock;
		status_t mRestoreStatus;
		int mPreviousPriority; // before start()
		int mPreviousSchedulingGroup;

media/libmedia/AudioTrack.cpp

+18 −15

Original line number	Diff line number	Diff line
		@@ -252,7 +252,7 @@ status_t AudioTrack::set(
		mChannelCount = channelCount;
		mSharedBuffer = sharedBuffer;
		mMuted = false;
		mActive = 0;
		mActive = false;
		mCbf = cbf;
		mUserData = user;
		mLoopCount = 0;
		@@ -338,9 +338,9 @@ void AudioTrack::start()
		sp <IMemory> iMem = mCblkMemory;
		audio_track_cblk_t* cblk = mCblk;

		if (mActive == 0) {
		if (!mActive) {
		mFlushed = false;
		mActive = 1;
		mActive = true;
		mNewPosition = cblk->server + mUpdatePeriod;
		cblk->lock.lock();
		cblk->bufferTimeoutMs = MAX_STARTUP_TIMEOUT_MS;
		@@ -369,7 +369,7 @@ void AudioTrack::start()
		cblk->lock.unlock();
		if (status != NO_ERROR) {
		ALOGV("start() failed");
		mActive = 0;
		mActive = false;
		if (t != 0) {
		t->requestExit();
		} else {
		@@ -394,8 +394,8 @@ void AudioTrack::stop()
		}

		AutoMutex lock(mLock);
		if (mActive == 1) {
		mActive = 0;
		if (mActive) {
		mActive = false;
		mCblk->cv.signal();
		mAudioTrack->stop();
		// Cancel loops (If we are in the middle of a loop, playback
		@@ -424,7 +424,8 @@ void AudioTrack::stop()

		bool AudioTrack::stopped() const
		{
		return !mActive;
		AutoMutex lock(mLock);
		return stopped_l();
		}

		void AudioTrack::flush()
		@@ -456,8 +457,8 @@ void AudioTrack::pause()
		{
		ALOGV("pause");
		AutoMutex lock(mLock);
		if (mActive == 1) {
		mActive = 0;
		if (mActive) {
		mActive = false;
		mAudioTrack->pause();
		}
		}
		@@ -647,9 +648,10 @@ status_t AudioTrack::getPositionUpdatePeriod(uint32_t *updatePeriod)
		status_t AudioTrack::setPosition(uint32_t position)
		{
		AutoMutex lock(mLock);
		Mutex::Autolock _l(mCblk->lock);

		if (!stopped()) return INVALID_OPERATION;
		if (!stopped_l()) return INVALID_OPERATION;

		Mutex::Autolock _l(mCblk->lock);

		if (position > mCblk->user) return BAD_VALUE;

		@@ -672,7 +674,7 @@ status_t AudioTrack::reload()
		{
		AutoMutex lock(mLock);

		if (!stopped()) return INVALID_OPERATION;
		if (!stopped_l()) return INVALID_OPERATION;

		flush_l();

		@@ -832,7 +834,7 @@ status_t AudioTrack::createTrack_l(
		status_t AudioTrack::obtainBuffer(Buffer* audioBuffer, int32_t waitCount)
		{
		AutoMutex lock(mLock);
		int active;
		bool active;
		status_t result = NO_ERROR;
		audio_track_cblk_t* cblk = mCblk;
		uint32_t framesReq = audioBuffer->frameCount;
		@@ -868,7 +870,7 @@ status_t AudioTrack::obtainBuffer(Buffer* audioBuffer, int32_t waitCount)
		result = cblk->cv.waitRelative(cblk->lock, milliseconds(waitTimeMs));
		cblk->lock.unlock();
		mLock.lock();
		if (mActive == 0) {
		if (!mActive) {
		return status_t(STOPPED);
		}
		cblk->lock.lock();
		@@ -1035,10 +1037,11 @@ bool AudioTrack::processAudioBuffer(const sp<AudioTrackThread>& thread)
		sp <IAudioTrack> audioTrack = mAudioTrack;
		sp <IMemory> iMem = mCblkMemory;
		audio_track_cblk_t* cblk = mCblk;
		bool active = mActive;
		mLock.unlock();

		// Manage underrun callback
		if (mActive && (cblk->framesAvailable() == cblk->frameCount)) {
		if (active && (cblk->framesAvailable() == cblk->frameCount)) {
		ALOGV("Underrun user: %x, server: %x, flags %04x", cblk->user, cblk->server, cblk->flags);
		if (!(android_atomic_or(CBLK_UNDERRUN_ON, &cblk->flags) & CBLK_UNDERRUN_MSK)) {
		mCbf(EVENT_UNDERRUN, mUserData, 0);