Merge "MediaMetrics: Track AudioTrack and AudioRecord callers" into rvc-dev am: 2578a95a57 (47144e50) · Commits · e / os / android_frameworks_av

media/libaaudio/src/legacy/AudioStreamLegacy.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -129,6 +129,7 @@ protected:
		}

		// This is used for exact matching by MediaMetrics. So do not change it.
		// MediaMetricsConstants.h: AMEDIAMETRICS_PROP_CALLERNAME_VALUE_AAUDIO
		static constexpr char kCallerName[] = "aaudio";

		MonotonicCounter mFramesWritten;

media/libaudioclient/AudioRecord.cpp

+5 −1

Original line number	Diff line number	Diff line
		@@ -172,7 +172,7 @@ AudioRecord::~AudioRecord()
		.set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_DTOR)
		.set(AMEDIAMETRICS_PROP_CALLERNAME,
		mCallerName.empty()
		? AMEDIAMETRICS_PROP_VALUE_UNKNOWN
		? AMEDIAMETRICS_PROP_CALLERNAME_VALUE_UNKNOWN
		: mCallerName.c_str())
		.set(AMEDIAMETRICS_PROP_STATUS, (int32_t)mStatus)
		.record();
		@@ -400,6 +400,10 @@ status_t AudioRecord::start(AudioSystem::sync_event_t event, audio_session_t tri
		status_t status = NO_ERROR;
		mediametrics::Defer defer([&] {
		mediametrics::LogItem(mMetricsId)
		.set(AMEDIAMETRICS_PROP_CALLERNAME,
		mCallerName.empty()
		? AMEDIAMETRICS_PROP_CALLERNAME_VALUE_UNKNOWN
		: mCallerName.c_str())
		.set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_START)
		.set(AMEDIAMETRICS_PROP_DURATIONNS, (int64_t)(systemTime() - beginNs))
		.set(AMEDIAMETRICS_PROP_STATE, stateToString(mActive))

media/libaudioclient/AudioTrack.cpp

+7 −3

Original line number	Diff line number	Diff line
		@@ -303,7 +303,7 @@ AudioTrack::~AudioTrack()
		.set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_DTOR)
		.set(AMEDIAMETRICS_PROP_CALLERNAME,
		mCallerName.empty()
		? AMEDIAMETRICS_PROP_VALUE_UNKNOWN
		? AMEDIAMETRICS_PROP_CALLERNAME_VALUE_UNKNOWN
		: mCallerName.c_str())
		.set(AMEDIAMETRICS_PROP_STATE, stateToString(mState))
		.set(AMEDIAMETRICS_PROP_STATUS, (int32_t)mStatus)
		@@ -645,6 +645,10 @@ status_t AudioTrack::start()
		status_t status = NO_ERROR; // logged: make sure to set this before returning.
		mediametrics::Defer defer([&] {
		mediametrics::LogItem(mMetricsId)
		.set(AMEDIAMETRICS_PROP_CALLERNAME,
		mCallerName.empty()
		? AMEDIAMETRICS_PROP_CALLERNAME_VALUE_UNKNOWN
		: mCallerName.c_str())
		.set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_START)
		.set(AMEDIAMETRICS_PROP_DURATIONNS, (int64_t)(systemTime() - beginNs))
		.set(AMEDIAMETRICS_PROP_STATE, stateToString(mState))
		@@ -879,7 +883,7 @@ void AudioTrack::pause()
		{
		const int64_t beginNs = systemTime();
		AutoMutex lock(mLock);
		mediametrics::Defer([&]() {
		mediametrics::Defer defer([&]() {
		mediametrics::LogItem(mMetricsId)
		.set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_PAUSE)
		.set(AMEDIAMETRICS_PROP_DURATIONNS, (int64_t)(systemTime() - beginNs))
		@@ -2433,7 +2437,7 @@ status_t AudioTrack::restoreTrack_l(const char *from)
		{
		status_t result = NO_ERROR; // logged: make sure to set this before returning.
		const int64_t beginNs = systemTime();
		mediametrics::Defer([&] {
		mediametrics::Defer defer([&] {
		mediametrics::LogItem(mMetricsId)
		.set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_RESTORE)
		.set(AMEDIAMETRICS_PROP_DURATIONNS, (int64_t)(systemTime() - beginNs))

media/libaudioclient/ToneGenerator.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -1262,7 +1262,9 @@ bool ToneGenerator::initAudioTrack() {
		AUDIO_UID_INVALID,
		-1,
		&attr);

		// Set caller name so it can be logged in destructor.
		// MediaMetricsConstants.h: AMEDIAMETRICS_PROP_CALLERNAME_VALUE_TONEGENERATOR
		mpAudioTrack->setCallerName("tonegenerator");
		if (status != NO_ERROR) {
		ALOGE("AudioTrack(%p) set failed with error %d", mpAudioTrack.get(), status);
		mpAudioTrack.clear();

media/libmediametrics/include/MediaMetricsConstants.h

+12 −2

Original line number	Diff line number	Diff line
		@@ -133,8 +133,6 @@
		#define AMEDIAMETRICS_PROP_VOLUME_RIGHT "volume.right" // double (AudioTrack)
		#define AMEDIAMETRICS_PROP_WHERE "where" // string value

		#define AMEDIAMETRICS_PROP_VALUE_UNKNOWN "unknown" // string for callerName

		// Timing values: millisecond values are suffixed with MS and the type is double
		// nanosecond values are suffixed with NS and the type is int64.

		@@ -159,4 +157,16 @@
		#define AMEDIAMETRICS_PROP_EVENT_VALUE_STOP "stop" // AudioTrack, AudioRecord
		#define AMEDIAMETRICS_PROP_EVENT_VALUE_UNDERRUN "underrun" // from Thread

		// Possible values for AMEDIAMETRICS_PROP_CALLERNAME
		// Check within the framework for these strings as this header file may not be explicitly
		// included to avoid unnecessary cross-project dependencies.
		#define AMEDIAMETRICS_PROP_CALLERNAME_VALUE_AAUDIO "aaudio" // Native AAudio
		#define AMEDIAMETRICS_PROP_CALLERNAME_VALUE_JAVA "java" // Java API layer
		#define AMEDIAMETRICS_PROP_CALLERNAME_VALUE_MEDIA "media" // libmedia
		#define AMEDIAMETRICS_PROP_CALLERNAME_VALUE_OPENSLES "opensles" // Open SLES
		#define AMEDIAMETRICS_PROP_CALLERNAME_VALUE_RTP "rtp" // RTP communication
		#define AMEDIAMETRICS_PROP_CALLERNAME_VALUE_SOUNDPOOL "soundpool" // SoundPool
		#define AMEDIAMETRICS_PROP_CALLERNAME_VALUE_TONEGENERATOR "tonegenerator" // dial tones
		#define AMEDIAMETRICS_PROP_CALLERNAME_VALUE_UNKNOWN "unknown" // callerName not set

		#endif // ANDROID_MEDIA_MEDIAMETRICSCONSTANTS_H