Merge "AudioFlinger: add dump of audio pre processing." (2df1f092) · Commits · e / os / android_frameworks_base

services/audioflinger/AudioFlinger.cpp

+20 −18

Original line number	Diff line number	Diff line
		@@ -1043,6 +1043,25 @@ status_t AudioFlinger::ThreadBase::dumpBase(int fd, const Vector<String16>& args
		return NO_ERROR;
		}

		status_t AudioFlinger::ThreadBase::dumpEffectChains(int fd, const Vector<String16>& args)
		{
		const size_t SIZE = 256;
		char buffer[SIZE];
		String8 result;

		snprintf(buffer, SIZE, "\n- %d Effect Chains:\n", mEffectChains.size());
		write(fd, buffer, strlen(buffer));

		for (size_t i = 0; i < mEffectChains.size(); ++i) {
		sp<EffectChain> chain = mEffectChains[i];
		if (chain != 0) {
		chain->dump(fd, args);
		}
		}
		return NO_ERROR;
		}


		// ----------------------------------------------------------------------------

		AudioFlinger::PlaybackThread::PlaybackThread(const sp<AudioFlinger>& audioFlinger,
		@@ -1111,24 +1130,6 @@ status_t AudioFlinger::PlaybackThread::dumpTracks(int fd, const Vector<String16>
		return NO_ERROR;
		}

		status_t AudioFlinger::PlaybackThread::dumpEffectChains(int fd, const Vector<String16>& args)
		{
		const size_t SIZE = 256;
		char buffer[SIZE];
		String8 result;

		snprintf(buffer, SIZE, "\n- %d Effect Chains:\n", mEffectChains.size());
		write(fd, buffer, strlen(buffer));

		for (size_t i = 0; i < mEffectChains.size(); ++i) {
		sp<EffectChain> chain = mEffectChains[i];
		if (chain != 0) {
		chain->dump(fd, args);
		}
		}
		return NO_ERROR;
		}

		status_t AudioFlinger::PlaybackThread::dumpInternals(int fd, const Vector<String16>& args)
		{
		const size_t SIZE = 256;
		@@ -4178,6 +4179,7 @@ status_t AudioFlinger::RecordThread::dump(int fd, const Vector<String16>& args)
		write(fd, result.string(), result.size());

		dumpBase(fd, args);
		dumpEffectChains(fd, args);

		return NO_ERROR;
		}

services/audioflinger/AudioFlinger.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -285,6 +285,7 @@ private:
		};

		status_t dumpBase(int fd, const Vector<String16>& args);
		status_t dumpEffectChains(int fd, const Vector<String16>& args);

		// base for record and playback
		class TrackBase : public AudioBufferProvider, public RefBase {
		@@ -724,7 +725,6 @@ private:

		virtual status_t dumpInternals(int fd, const Vector<String16>& args);
		status_t dumpTracks(int fd, const Vector<String16>& args);
		status_t dumpEffectChains(int fd, const Vector<String16>& args);

		SortedVector< sp<Track> > mTracks;
		// mStreamTypes[] uses 1 additionnal stream type internally for the OutputTrack used by DuplicatingThread