Snap for 7940976 from 2bd0adb2161feb340a1d4acde0d53db8f0f6a68c to sc-v2-release (4de3532c) · Commits · e / devices / smdk4412 / android_frameworks_av

media/libaudioclient/AudioTrack.cpp

+82 −35

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

	#include <android/media/IAudioPolicyService.h>		#include <android/media/IAudioPolicyService.h>
	#include <android-base/macros.h>		#include <android-base/macros.h>
			#include <android-base/stringprintf.h>
	#include <audio_utils/clock.h>		#include <audio_utils/clock.h>
	#include <audio_utils/primitives.h>		#include <audio_utils/primitives.h>
	#include <binder/IPCThreadState.h>		#include <binder/IPCThreadState.h>
	@@ -44,6 +45,7 @@
	static const int kMaxLoopCountNotifications = 32;		static const int kMaxLoopCountNotifications = 32;

	using ::android::aidl_utils::statusTFromBinderStatus;		using ::android::aidl_utils::statusTFromBinderStatus;
			using ::android::base::StringPrintf;

	namespace android {		namespace android {
	// ---------------------------------------------------------------------------		// ---------------------------------------------------------------------------
	@@ -394,6 +396,7 @@ status_t AudioTrack::set(
	pid_t myPid;		pid_t myPid;
	uid_t uid = VALUE_OR_FATAL(aidl2legacy_int32_t_uid_t(attributionSource.uid));		uid_t uid = VALUE_OR_FATAL(aidl2legacy_int32_t_uid_t(attributionSource.uid));
	pid_t pid = VALUE_OR_FATAL(aidl2legacy_int32_t_pid_t(attributionSource.pid));		pid_t pid = VALUE_OR_FATAL(aidl2legacy_int32_t_pid_t(attributionSource.pid));
			std::string errorMessage;

	// Note mPortId is not valid until the track is created, so omit mPortId in ALOG for set.		// Note mPortId is not valid until the track is created, so omit mPortId in ALOG for set.
	ALOGV("%s(): streamType %d, sampleRate %u, format %#x, channelMask %#x, frameCount %zu, "		ALOGV("%s(): streamType %d, sampleRate %u, format %#x, channelMask %#x, frameCount %zu, "
	@@ -419,32 +422,34 @@ status_t AudioTrack::set(
	case TRANSFER_CALLBACK:		case TRANSFER_CALLBACK:
	case TRANSFER_SYNC_NOTIF_CALLBACK:		case TRANSFER_SYNC_NOTIF_CALLBACK:
	if (cbf == NULL \|\| sharedBuffer != 0) {		if (cbf == NULL \|\| sharedBuffer != 0) {
	ALOGE("%s(): Transfer type %s but cbf == NULL \|\| sharedBuffer != 0",		errorMessage = StringPrintf(
			"%s: Transfer type %s but cbf == NULL \|\| sharedBuffer != 0",
	convertTransferToText(transferType), __func__);		convertTransferToText(transferType), __func__);
	status = BAD_VALUE;		status = BAD_VALUE;
	goto exit;		goto error;
	}		}
	break;		break;
	case TRANSFER_OBTAIN:		case TRANSFER_OBTAIN:
	case TRANSFER_SYNC:		case TRANSFER_SYNC:
	if (sharedBuffer != 0) {		if (sharedBuffer != 0) {
	ALOGE("%s(): Transfer type TRANSFER_OBTAIN but sharedBuffer != 0", __func__);		errorMessage = StringPrintf(
			"%s: Transfer type TRANSFER_OBTAIN but sharedBuffer != 0", __func__);
	status = BAD_VALUE;		status = BAD_VALUE;
	goto exit;		goto error;
	}		}
	break;		break;
	case TRANSFER_SHARED:		case TRANSFER_SHARED:
	if (sharedBuffer == 0) {		if (sharedBuffer == 0) {
	ALOGE("%s(): Transfer type TRANSFER_SHARED but sharedBuffer == 0", __func__);		errorMessage = StringPrintf(
			"%s: Transfer type TRANSFER_SHARED but sharedBuffer == 0", __func__);
	status = BAD_VALUE;		status = BAD_VALUE;
	goto exit;		goto error;
	}		}
	break;		break;
	default:		default:
	ALOGE("%s(): Invalid transfer type %d",		errorMessage = StringPrintf("%s: Invalid transfer type %d", __func__, transferType);
	__func__, transferType);
	status = BAD_VALUE;		status = BAD_VALUE;
	goto exit;		goto error;
	}		}
	mSharedBuffer = sharedBuffer;		mSharedBuffer = sharedBuffer;
	mTransfer = transferType;		mTransfer = transferType;
	@@ -458,9 +463,9 @@ status_t AudioTrack::set(

	// invariant that mAudioTrack != 0 is true only after set() returns successfully		// invariant that mAudioTrack != 0 is true only after set() returns successfully
	if (mAudioTrack != 0) {		if (mAudioTrack != 0) {
	ALOGE("%s(): Track already in use", __func__);		errorMessage = StringPrintf("%s: Track already in use", __func__);
	status = INVALID_OPERATION;		status = INVALID_OPERATION;
	goto exit;		goto error;
	}		}

	// handle default values first.		// handle default values first.
	@@ -469,9 +474,9 @@ status_t AudioTrack::set(
	}		}
	if (pAttributes == NULL) {		if (pAttributes == NULL) {
	if (uint32_t(streamType) >= AUDIO_STREAM_PUBLIC_CNT) {		if (uint32_t(streamType) >= AUDIO_STREAM_PUBLIC_CNT) {
	ALOGE("%s(): Invalid stream type %d", __func__, streamType);		errorMessage = StringPrintf("%s: Invalid stream type %d", __func__, streamType);
	status = BAD_VALUE;		status = BAD_VALUE;
	goto exit;		goto error;
	}		}
	mOriginalStreamType = streamType;		mOriginalStreamType = streamType;

	@@ -495,16 +500,16 @@ status_t AudioTrack::set(

	// validate parameters		// validate parameters
	if (!audio_is_valid_format(format)) {		if (!audio_is_valid_format(format)) {
	ALOGE("%s(): Invalid format %#x", __func__, format);		errorMessage = StringPrintf("%s: Invalid format %#x", __func__, format);
	status = BAD_VALUE;		status = BAD_VALUE;
	goto exit;		goto error;
	}		}
	mFormat = format;		mFormat = format;

	if (!audio_is_output_channel(channelMask)) {		if (!audio_is_output_channel(channelMask)) {
	ALOGE("%s(): Invalid channel mask %#x", __func__, channelMask);		errorMessage = StringPrintf("%s: Invalid channel mask %#x", __func__, channelMask);
	status = BAD_VALUE;		status = BAD_VALUE;
	goto exit;		goto error;
	}		}
	mChannelMask = channelMask;		mChannelMask = channelMask;
	channelCount = audio_channel_count_from_out_mask(channelMask);		channelCount = audio_channel_count_from_out_mask(channelMask);
	@@ -543,8 +548,10 @@ status_t AudioTrack::set(

	// sampling rate must be specified for direct outputs		// sampling rate must be specified for direct outputs
	if (sampleRate == 0 && (flags & AUDIO_OUTPUT_FLAG_DIRECT) != 0) {		if (sampleRate == 0 && (flags & AUDIO_OUTPUT_FLAG_DIRECT) != 0) {
			errorMessage = StringPrintf(
			"%s: sample rate must be specified for direct outputs", __func__);
	status = BAD_VALUE;		status = BAD_VALUE;
	goto exit;		goto error;
	}		}
	mSampleRate = sampleRate;		mSampleRate = sampleRate;
	mOriginalSampleRate = sampleRate;		mOriginalSampleRate = sampleRate;
	@@ -574,16 +581,17 @@ status_t AudioTrack::set(
	mNotificationsPerBufferReq = 0;		mNotificationsPerBufferReq = 0;
	} else {		} else {
	if (!(flags & AUDIO_OUTPUT_FLAG_FAST)) {		if (!(flags & AUDIO_OUTPUT_FLAG_FAST)) {
	ALOGE("%s(): notificationFrames=%d not permitted for non-fast track",		errorMessage = StringPrintf(
			"%s: notificationFrames=%d not permitted for non-fast track",
	__func__, notificationFrames);		__func__, notificationFrames);
	status = BAD_VALUE;		status = BAD_VALUE;
	goto exit;		goto error;
	}		}
	if (frameCount > 0) {		if (frameCount > 0) {
	ALOGE("%s(): notificationFrames=%d not permitted with non-zero frameCount=%zu",		ALOGE("%s(): notificationFrames=%d not permitted with non-zero frameCount=%zu",
	__func__, notificationFrames, frameCount);		__func__, notificationFrames, frameCount);
	status = BAD_VALUE;		status = BAD_VALUE;
	goto exit;		goto error;
	}		}
	mNotificationFramesReq = 0;		mNotificationFramesReq = 0;
	const uint32_t minNotificationsPerBuffer = 1;		const uint32_t minNotificationsPerBuffer = 1;
	@@ -628,6 +636,7 @@ status_t AudioTrack::set(
	mAudioTrackThread->requestExitAndWait();		mAudioTrackThread->requestExitAndWait();
	mAudioTrackThread.clear();		mAudioTrackThread.clear();
	}		}
			// We do not goto error to prevent double-logging errors.
	goto exit;		goto exit;
	}		}

	@@ -662,6 +671,12 @@ status_t AudioTrack::set(
	mFramesWrittenAtRestore = -1; // -1 is a unique initializer.		mFramesWrittenAtRestore = -1; // -1 is a unique initializer.
	mVolumeHandler = new media::VolumeHandler();		mVolumeHandler = new media::VolumeHandler();

			error:
			if (status != NO_ERROR) {
			ALOGE_IF(!errorMessage.empty(), "%s", errorMessage.c_str());
			reportError(status, AMEDIAMETRICS_PROP_EVENT_VALUE_CREATE, errorMessage.c_str());
			}
			// fall through
	exit:		exit:
	mStatus = status;		mStatus = status;
	return status;		return status;
	@@ -1687,12 +1702,13 @@ status_t AudioTrack::createTrack_l()
	{		{
	status_t status;		status_t status;
	bool callbackAdded = false;		bool callbackAdded = false;
			std::string errorMessage;

	const sp<IAudioFlinger>& audioFlinger = AudioSystem::get_audio_flinger();		const sp<IAudioFlinger>& audioFlinger = AudioSystem::get_audio_flinger();
	if (audioFlinger == 0) {		if (audioFlinger == 0) {
	ALOGE("%s(%d): Could not get audioflinger",		errorMessage = StringPrintf("%s(%d): Could not get audioflinger",
	__func__, mPortId);		__func__, mPortId);
	status = NO_INIT;		status = DEAD_OBJECT;
	goto exit;		goto exit;
	}		}

	@@ -1769,10 +1785,11 @@ status_t AudioTrack::createTrack_l()
	}		}

	if (status != NO_ERROR \|\| output.outputId == AUDIO_IO_HANDLE_NONE) {		if (status != NO_ERROR \|\| output.outputId == AUDIO_IO_HANDLE_NONE) {
	ALOGE("%s(%d): AudioFlinger could not create track, status: %d output %d",		errorMessage = StringPrintf(
			"%s(%d): AudioFlinger could not create track, status: %d output %d",
	__func__, mPortId, status, output.outputId);		__func__, mPortId, status, output.outputId);
	if (status == NO_ERROR) {		if (status == NO_ERROR) {
	status = NO_INIT;		status = INVALID_OPERATION; // device not ready
	}		}
	goto exit;		goto exit;
	}		}
	@@ -1803,8 +1820,8 @@ status_t AudioTrack::createTrack_l()
	output.audioTrack->getCblk(&sfr);		output.audioTrack->getCblk(&sfr);
	sp<IMemory> iMem = VALUE_OR_FATAL(aidl2legacy_NullableSharedFileRegion_IMemory(sfr));		sp<IMemory> iMem = VALUE_OR_FATAL(aidl2legacy_NullableSharedFileRegion_IMemory(sfr));
	if (iMem == 0) {		if (iMem == 0) {
	ALOGE("%s(%d): Could not get control block", __func__, mPortId);		errorMessage = StringPrintf("%s(%d): Could not get control block", __func__, mPortId);
	status = NO_INIT;		status = FAILED_TRANSACTION;
	goto exit;		goto exit;
	}		}
	// TODO: Using unsecurePointer() has some associated security pitfalls		// TODO: Using unsecurePointer() has some associated security pitfalls
	@@ -1813,8 +1830,9 @@ status_t AudioTrack::createTrack_l()
	// issue (e.g. by copying).		// issue (e.g. by copying).
	void *iMemPointer = iMem->unsecurePointer();		void *iMemPointer = iMem->unsecurePointer();
	if (iMemPointer == NULL) {		if (iMemPointer == NULL) {
	ALOGE("%s(%d): Could not get control block pointer", __func__, mPortId);		errorMessage = StringPrintf(
	status = NO_INIT;		"%s(%d): Could not get control block pointer", __func__, mPortId);
			status = FAILED_TRANSACTION;
	goto exit;		goto exit;
	}		}
	// invariant that mAudioTrack != 0 is true only after set() returns successfully		// invariant that mAudioTrack != 0 is true only after set() returns successfully
	@@ -1872,8 +1890,10 @@ status_t AudioTrack::createTrack_l()
	// issue (e.g. by copying).		// issue (e.g. by copying).
	buffers = mSharedBuffer->unsecurePointer();		buffers = mSharedBuffer->unsecurePointer();
	if (buffers == NULL) {		if (buffers == NULL) {
	ALOGE("%s(%d): Could not get buffer pointer", __func__, mPortId);		errorMessage = StringPrintf(
	status = NO_INIT;		"%s(%d): Could not get buffer pointer", __func__, mPortId);
			ALOGE("%s", errorMessage.c_str());
			status = FAILED_TRANSACTION;
	goto exit;		goto exit;
	}		}
	}		}
	@@ -1971,17 +1991,44 @@ status_t AudioTrack::createTrack_l()
	}		}

	exit:		exit:
	if (status != NO_ERROR && callbackAdded) {		if (status != NO_ERROR) {
			if (callbackAdded) {
	// note: mOutput is always valid is callbackAdded is true		// note: mOutput is always valid is callbackAdded is true
	AudioSystem::removeAudioDeviceCallback(this, mOutput, mPortId);		AudioSystem::removeAudioDeviceCallback(this, mOutput, mPortId);
	}		}
			ALOGE_IF(!errorMessage.empty(), "%s", errorMessage.c_str());
			reportError(status, AMEDIAMETRICS_PROP_EVENT_VALUE_CREATE, errorMessage.c_str());
			}
	mStatus = status;		mStatus = status;

	// sp<IAudioTrack> track destructor will cause releaseOutput() to be called by AudioFlinger		// sp<IAudioTrack> track destructor will cause releaseOutput() to be called by AudioFlinger
	return status;		return status;
	}		}

			void AudioTrack::reportError(status_t status, const char event, const char message) const
			{
			if (status == NO_ERROR) return;
			// We report error on the native side because some callers do not come
			// from Java.
			mediametrics::LogItem(std::string(AMEDIAMETRICS_KEY_PREFIX_AUDIO_TRACK) + "error")
			.set(AMEDIAMETRICS_PROP_EVENT, event)
			.set(AMEDIAMETRICS_PROP_ERROR, mediametrics::statusToErrorString(status))
			.set(AMEDIAMETRICS_PROP_ERRORMESSAGE, message)
			.set(AMEDIAMETRICS_PROP_ORIGINALFLAGS, toString(mOrigFlags).c_str())
			.set(AMEDIAMETRICS_PROP_SESSIONID, (int32_t)mSessionId)
			.set(AMEDIAMETRICS_PROP_CONTENTTYPE, toString(mAttributes.content_type).c_str())
			.set(AMEDIAMETRICS_PROP_USAGE, toString(mAttributes.usage).c_str())
			.set(AMEDIAMETRICS_PROP_SELECTEDDEVICEID, (int32_t)mSelectedDeviceId)
			.set(AMEDIAMETRICS_PROP_ENCODING, toString(mFormat).c_str())
			.set(AMEDIAMETRICS_PROP_CHANNELMASK, (int32_t)mChannelMask)
			.set(AMEDIAMETRICS_PROP_FRAMECOUNT, (int32_t)mReqFrameCount) // requested frame count
			// the following are NOT immutable
			.set(AMEDIAMETRICS_PROP_SAMPLERATE, (int32_t)mSampleRate)
			.set(AMEDIAMETRICS_PROP_PLAYBACK_SPEED, (double)mPlaybackRate.mSpeed)
			.set(AMEDIAMETRICS_PROP_PLAYBACK_PITCH, (double)mPlaybackRate.mPitch)
			.record();
			}

	status_t AudioTrack::obtainBuffer(Buffer* audioBuffer, int32_t waitCount, size_t *nonContig)		status_t AudioTrack::obtainBuffer(Buffer* audioBuffer, int32_t waitCount, size_t *nonContig)
	{		{
	if (audioBuffer == NULL) {		if (audioBuffer == NULL) {

media/libaudioclient/include/media/AudioTrack.h

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1390,6 +1390,9 @@ private:
	std::string mMetricsId; // GUARDED_BY(mLock), could change in createTrack_l().		std::string mMetricsId; // GUARDED_BY(mLock), could change in createTrack_l().
	std::string mCallerName; // for example "aaudio"		std::string mCallerName; // for example "aaudio"

			// report error to mediametrics.
			void reportError(status_t status, const char event, const char message) const;

	private:		private:
	class AudioTrackCallback : public media::BnAudioTrackCallback {		class AudioTrackCallback : public media::BnAudioTrackCallback {
	public:		public: