const methods (106e8a42) · Commits · e / os / android_frameworks_av

services/audioflinger/AudioFlinger.cpp

+6 −6

Original line number	Diff line number	Diff line
		@@ -2097,7 +2097,7 @@ status_t AudioFlinger::PlaybackThread::getRenderPosition(uint32_t *halFrames, ui
		return mOutput->stream->get_render_position(mOutput->stream, dspFrames);
		}

		uint32_t AudioFlinger::PlaybackThread::hasAudioSession(int sessionId)
		uint32_t AudioFlinger::PlaybackThread::hasAudioSession(int sessionId) const
		{
		Mutex::Autolock _l(mLock);
		uint32_t result = 0;
		@@ -2187,7 +2187,7 @@ status_t AudioFlinger::PlaybackThread::setSyncEvent(const sp<SyncEvent>& event)
		return NAME_NOT_FOUND;
		}

		bool AudioFlinger::PlaybackThread::isValidSyncEvent(const sp<SyncEvent>& event)
		bool AudioFlinger::PlaybackThread::isValidSyncEvent(const sp<SyncEvent>& event) const
		{
		return event->type() == AudioSystem::SYNC_EVENT_PRESENTATION_COMPLETE;
		}
		@@ -6352,7 +6352,7 @@ bool AudioFlinger::RecordThread::stop_l(RecordThread::RecordTrack* recordTrack)
		return false;
		}

		bool AudioFlinger::RecordThread::isValidSyncEvent(const sp<SyncEvent>& event)
		bool AudioFlinger::RecordThread::isValidSyncEvent(const sp<SyncEvent>& event) const
		{
		return false;
		}
		@@ -6711,7 +6711,7 @@ unsigned int AudioFlinger::RecordThread::getInputFramesLost()
		return mInput->stream->get_input_frames_lost(mInput->stream);
		}

		uint32_t AudioFlinger::RecordThread::hasAudioSession(int sessionId)
		uint32_t AudioFlinger::RecordThread::hasAudioSession(int sessionId) const
		{
		Mutex::Autolock _l(mLock);
		uint32_t result = 0;
		@@ -6729,7 +6729,7 @@ uint32_t AudioFlinger::RecordThread::hasAudioSession(int sessionId)
		return result;
		}

		KeyedVector<int, bool> AudioFlinger::RecordThread::sessionIds()
		KeyedVector<int, bool> AudioFlinger::RecordThread::sessionIds() const
		{
		KeyedVector<int, bool> ids;
		Mutex::Autolock _l(mLock);
		@@ -7854,7 +7854,7 @@ sp<AudioFlinger::EffectChain> AudioFlinger::ThreadBase::getEffectChain(int sessi
		return getEffectChain_l(sessionId);
		}

		sp<AudioFlinger::EffectChain> AudioFlinger::ThreadBase::getEffectChain_l(int sessionId)
		sp<AudioFlinger::EffectChain> AudioFlinger::ThreadBase::getEffectChain_l(int sessionId) const
		{
		size_t size = mEffectChains.size();
		for (size_t i = 0; i < size; i++) {

services/audioflinger/AudioFlinger.h

+11 −11

Original line number	Diff line number	Diff line
		@@ -233,7 +233,7 @@ public:
		virtual ~SyncEvent() {}

		void trigger() { Mutex::Autolock _l(mLock); if (mCallback) mCallback(this); }
		bool isCancelled() { Mutex::Autolock _l(mLock); return (mCallback == NULL); }
		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; }
		int triggerSession() const { return mTriggerSession; }
		@@ -246,7 +246,7 @@ public:
		const int mListenerSession;
		sync_event_callback_t mCallback;
		void * const mCookie;
		Mutex mLock;
		mutable Mutex mLock;
		};

		sp<SyncEvent> createSyncEvent(AudioSystem::sync_event_t type,
		@@ -547,7 +547,7 @@ private:
		// get effect chain corresponding to session Id.
		sp<EffectChain> getEffectChain(int sessionId);
		// same as getEffectChain() but must be called with ThreadBase mutex locked
		sp<EffectChain> getEffectChain_l(int sessionId);
		sp<EffectChain> getEffectChain_l(int sessionId) const;
		// add an effect chain to the chain list (mEffectChains)
		virtual status_t addEffectChain_l(const sp<EffectChain>& chain) = 0;
		// remove an effect chain from the chain list (mEffectChains)
		@@ -574,7 +574,7 @@ private:
		virtual void detachAuxEffect_l(int effectId) {}
		// returns either EFFECT_SESSION if effects on this audio session exist in one
		// chain, or TRACK_SESSION if tracks on this audio session exist, or both
		virtual uint32_t hasAudioSession(int sessionId) = 0;
		virtual uint32_t hasAudioSession(int sessionId) const = 0;
		// the value returned by default implementation is not important as the
		// strategy is only meaningful for PlaybackThread which implements this method
		virtual uint32_t getStrategyForSession_l(int sessionId) { return 0; }
		@@ -594,7 +594,7 @@ private:
		int sessionId = AUDIO_SESSION_OUTPUT_MIX);

		virtual status_t setSyncEvent(const sp<SyncEvent>& event) = 0;
		virtual bool isValidSyncEvent(const sp<SyncEvent>& event) = 0;
		virtual bool isValidSyncEvent(const sp<SyncEvent>& event) const = 0;


		mutable Mutex mLock;
		@@ -1050,12 +1050,12 @@ public:

		virtual status_t addEffectChain_l(const sp<EffectChain>& chain);
		virtual size_t removeEffectChain_l(const sp<EffectChain>& chain);
		virtual uint32_t hasAudioSession(int sessionId);
		virtual uint32_t hasAudioSession(int sessionId) const;
		virtual uint32_t getStrategyForSession_l(int sessionId);


		virtual status_t setSyncEvent(const sp<SyncEvent>& event);
		virtual bool isValidSyncEvent(const sp<SyncEvent>& event);
		virtual bool isValidSyncEvent(const sp<SyncEvent>& event) const;
		void invalidateTracks(audio_stream_type_t streamType);


		@@ -1463,15 +1463,15 @@ private:

		virtual status_t addEffectChain_l(const sp<EffectChain>& chain);
		virtual size_t removeEffectChain_l(const sp<EffectChain>& chain);
		virtual uint32_t hasAudioSession(int sessionId);
		virtual uint32_t hasAudioSession(int sessionId) const;

		// Return the set of unique session IDs across all tracks.
		// The keys are the session IDs, and the associated values are meaningless.
		// FIXME replace by Set [and implement Bag/Multiset for other uses].
		KeyedVector<int, bool> sessionIds();
		KeyedVector<int, bool> sessionIds() const;

		virtual status_t setSyncEvent(const sp<SyncEvent>& event);
		virtual bool isValidSyncEvent(const sp<SyncEvent>& event);
		virtual bool isValidSyncEvent(const sp<SyncEvent>& event) const;

		static void syncStartEventCallback(const wp<SyncEvent>& event);
		void handleSyncStartEvent(const sp<SyncEvent>& event);