Merge changes I37711f42,I2212cdc5 (cff0b1dd) · Commits · e / os / android_frameworks_av

services/audioflinger/AudioFlinger.cpp

+13 −11

Original line number	Diff line number	Diff line
		@@ -1262,18 +1262,19 @@ status_t AudioFlinger::createTrack(const media::CreateTrackRequest& _input,
		}

		// Look for sync events awaiting for a session to be used.
		for (size_t i = 0; i < mPendingSyncEvents.size(); i++) {
		if (mPendingSyncEvents[i]->triggerSession() == sessionId) {
		if (thread->isValidSyncEvent(mPendingSyncEvents[i])) {
		for (auto it = mPendingSyncEvents.begin(); it != mPendingSyncEvents.end();) {
		if ((*it)->triggerSession() == sessionId) {
		if (thread->isValidSyncEvent(*it)) {
		if (lStatus == NO_ERROR) {
		(void) track->setSyncEvent(mPendingSyncEvents[i]);
		(void) track->setSyncEvent(*it);
		} else {
		mPendingSyncEvents[i]->cancel();
		(*it)->cancel();
		}
		mPendingSyncEvents.removeAt(i);
		i--;
		it = mPendingSyncEvents.erase(it);
		continue;
		}
		}
		++it;
		}
		if ((output.flags & AUDIO_OUTPUT_FLAG_HW_AV_SYNC) == AUDIO_OUTPUT_FLAG_HW_AV_SYNC) {
		setAudioHwSyncForSession_l(thread, sessionId);
		@@ -4003,15 +4004,16 @@ void AudioFlinger::updateSecondaryOutputsForTrack_l(
		track->setTeePatchesToUpdate(std::move(teePatches));
		}

		sp<AudioFlinger::SyncEvent> AudioFlinger::createSyncEvent(AudioSystem::sync_event_t type,
		sp<audioflinger::SyncEvent> AudioFlinger::createSyncEvent(AudioSystem::sync_event_t type,
		audio_session_t triggerSession,
		audio_session_t listenerSession,
		sync_event_callback_t callBack,
		audioflinger::SyncEventCallback callBack,
		const wp<RefBase>& cookie)
		{
		Mutex::Autolock _l(mLock);

		sp<SyncEvent> event = new SyncEvent(type, triggerSession, listenerSession, callBack, cookie);
		auto event = sp<audioflinger::SyncEvent>::make(
		type, triggerSession, listenerSession, callBack, cookie);
		status_t playStatus = NAME_NOT_FOUND;
		status_t recStatus = NAME_NOT_FOUND;
		for (size_t i = 0; i < mPlaybackThreads.size(); i++) {
		@@ -4027,7 +4029,7 @@ sp<AudioFlinger::SyncEvent> AudioFlinger::createSyncEvent(AudioSystem::sync_even
		}
		}
		if (playStatus == NAME_NOT_FOUND \|\| recStatus == NAME_NOT_FOUND) {
		mPendingSyncEvents.add(event);
		mPendingSyncEvents.emplace_back(event);
		} else {
		ALOGV("createSyncEvent() invalid event %d", event->type());
		event.clear();

services/audioflinger/AudioFlinger.h

+5 −41

Original line number	Diff line number	Diff line
		@@ -89,6 +89,7 @@

		#include <sounddose/SoundDoseManager.h>
		#include <timing/MonotonicFrameCounter.h>
		#include <timing/SyncEvent.h>

		#include "FastCapture.h"
		#include "FastMixer.h"
		@@ -383,47 +384,10 @@ public:

		static inline std::atomic<AudioFlinger *> gAudioFlinger = nullptr;

		class SyncEvent;

		typedef void (*sync_event_callback_t)(const wp<SyncEvent>& event) ;

		class SyncEvent : public RefBase {
		public:
		SyncEvent(AudioSystem::sync_event_t type,
		audio_session_t triggerSession,
		audio_session_t listenerSession,
		sync_event_callback_t callBack,
		const wp<RefBase>& cookie)
		: mType(type), mTriggerSession(triggerSession), mListenerSession(listenerSession),
		mCallback(callBack), mCookie(cookie)
		{}

		virtual ~SyncEvent() {}

		void trigger() {
		Mutex::Autolock _l(mLock);
		if (mCallback) mCallback(wp<SyncEvent>(this));
		}
		bool isCancelled() const { Mutex::Autolock _l(mLock); return (mCallback == NULL); }
		void cancel() { Mutex::Autolock _l(mLock); mCallback = NULL; }
		AudioSystem::sync_event_t type() const { return mType; }
		audio_session_t triggerSession() const { return mTriggerSession; }
		audio_session_t listenerSession() const { return mListenerSession; }
		wp<RefBase> cookie() const { return mCookie; }

		private:
		const AudioSystem::sync_event_t mType;
		const audio_session_t mTriggerSession;
		const audio_session_t mListenerSession;
		sync_event_callback_t mCallback;
		const wp<RefBase> mCookie;
		mutable Mutex mLock;
		};

		sp<SyncEvent> createSyncEvent(AudioSystem::sync_event_t type,
		sp<audioflinger::SyncEvent> createSyncEvent(AudioSystem::sync_event_t type,
		audio_session_t triggerSession,
		audio_session_t listenerSession,
		sync_event_callback_t callBack,
		audioflinger::SyncEventCallback callBack,
		const wp<RefBase>& cookie);

		bool btNrecIsOff() const { return mBtNrecIsOff.load(); }
		@@ -994,8 +958,8 @@ using effect_buffer_t = int16_t;
		bool masterMute_l() const;
		AudioHwDevice* loadHwModule_l(const char *name);

		Vector < sp<SyncEvent> > mPendingSyncEvents; // sync events awaiting for a session
		// to be created
		// sync events awaiting for a session to be created.
		std::list<sp<audioflinger::SyncEvent>> mPendingSyncEvents;

		// Effect chains without a valid thread
		DefaultKeyedVector< audio_session_t , sp<EffectChain> > mOrphanEffectChains;

services/audioflinger/PlaybackTracks.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -132,7 +132,7 @@ public:
		// implement FastMixerState::VolumeProvider interface
		virtual gain_minifloat_packed_t getVolumeLR();

		virtual status_t setSyncEvent(const sp<SyncEvent>& event);
		status_t setSyncEvent(const sp<audioflinger::SyncEvent>& event) override;

		virtual bool isFastTrack() const { return (mFlags & AUDIO_OUTPUT_FLAG_FAST) != 0; }

services/audioflinger/RecordTracks.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ public:
		void appendDumpHeader(String8& result);
		void appendDump(String8& result, bool active);

		void handleSyncStartEvent(const sp<SyncEvent>& event);
		void handleSyncStartEvent(const sp<audioflinger::SyncEvent>& event);
		void clearSyncStartEvent();

		void updateTrackFrameInfo(int64_t trackFramesReleased,
		@@ -107,7 +107,7 @@ private:

		// sync event triggering actual audio capture. Frames read before this event will
		// be dropped and therefore not read by the application.
		sp<SyncEvent> mSyncStartEvent;
		sp<audioflinger::SyncEvent> mSyncStartEvent;

		// number of captured frames to drop after the start sync event has been received.
		// when < 0, maximum frames to drop before starting capture even if sync event is

services/audioflinger/Threads.cpp

+12 −8

Original line number	Diff line number	Diff line
		@@ -3357,7 +3357,7 @@ uint32_t AudioFlinger::PlaybackThread::activeSleepTimeUs() const
		return (uint32_t)((uint32_t)((mNormalFrameCount * 1000) / mSampleRate) * 1000);
		}

		status_t AudioFlinger::PlaybackThread::setSyncEvent(const sp<SyncEvent>& event)
		status_t AudioFlinger::PlaybackThread::setSyncEvent(const sp<audioflinger::SyncEvent>& event)
		{
		if (!isValidSyncEvent(event)) {
		return BAD_VALUE;
		@@ -3376,7 +3376,8 @@ status_t AudioFlinger::PlaybackThread::setSyncEvent(const sp<SyncEvent>& event)
		return NAME_NOT_FOUND;
		}

		bool AudioFlinger::PlaybackThread::isValidSyncEvent(const sp<SyncEvent>& event) const
		bool AudioFlinger::PlaybackThread::isValidSyncEvent(
		const sp<audioflinger::SyncEvent>& event) const
		{
		return event->type() == AudioSystem::SYNC_EVENT_PRESENTATION_COMPLETE;
		}
		@@ -8927,9 +8928,9 @@ status_t AudioFlinger::RecordThread::start(RecordThread::RecordTrack* recordTrac
		}
		}

		void AudioFlinger::RecordThread::syncStartEventCallback(const wp<SyncEvent>& event)
		void AudioFlinger::RecordThread::syncStartEventCallback(const wp<audioflinger::SyncEvent>& event)
		{
		sp<SyncEvent> strongEvent = event.promote();
		sp<audioflinger::SyncEvent> strongEvent = event.promote();

		if (strongEvent != 0) {
		sp<RefBase> ptr = strongEvent->cookie().promote();
		@@ -8968,12 +8969,14 @@ bool AudioFlinger::RecordThread::stop(RecordThread::RecordTrack* recordTrack) {
		return false;
		}

		bool AudioFlinger::RecordThread::isValidSyncEvent(const sp<SyncEvent>& event __unused) const
		bool AudioFlinger::RecordThread::isValidSyncEvent(
		const sp<audioflinger::SyncEvent>& /* event */) const
		{
		return false;
		}

		status_t AudioFlinger::RecordThread::setSyncEvent(const sp<SyncEvent>& event __unused)
		status_t AudioFlinger::RecordThread::setSyncEvent(
		const sp<audioflinger::SyncEvent>& event __unused)
		{
		#if 0 // This branch is currently dead code, but is preserved in case it will be needed in future
		if (!isValidSyncEvent(event)) {
		@@ -10540,12 +10543,13 @@ void AudioFlinger::MmapThread::threadLoop_exit()
		// and because it can cause a recursive mutex lock on stop().
		}

		status_t AudioFlinger::MmapThread::setSyncEvent(const sp<SyncEvent>& event __unused)
		status_t AudioFlinger::MmapThread::setSyncEvent(const sp<audioflinger::SyncEvent>& /* event */)
		{
		return BAD_VALUE;
		}

		bool AudioFlinger::MmapThread::isValidSyncEvent(const sp<SyncEvent>& event __unused) const
		bool AudioFlinger::MmapThread::isValidSyncEvent(
		const sp<audioflinger::SyncEvent>& /* event */) const
		{
		return false;
		}