am fe9611bd: Merge "Fix potential leak of audio input handle." into klp-dev (82278b2c) · Commits · e / os / android_frameworks_av

include/media/AudioRecord.h

+1 −8

Original line number	Original line	Diff line number	Diff line
	@@ -423,14 +423,7 @@ private:
	nsecs_t processAudioBuffer(const sp<AudioRecordThread>& thread);		nsecs_t processAudioBuffer(const sp<AudioRecordThread>& thread);

	// caller must hold lock on mLock for all _l methods		// caller must hold lock on mLock for all _l methods
	status_t openRecord_l(uint32_t sampleRate,		status_t openRecord_l(size_t epoch);
	audio_format_t format,
	size_t frameCount,
	audio_input_flags_t flags,
	audio_io_handle_t input,
	size_t epoch);

	audio_io_handle_t getInput_l();

	// FIXME enum is faster than strcmp() for parameter 'from'		// FIXME enum is faster than strcmp() for parameter 'from'
	status_t restoreRecord_l(const char *from);		status_t restoreRecord_l(const char *from);

media/libmedia/AudioRecord.cpp

+42 −61

Original line number	Original line	Diff line number	Diff line
	@@ -175,6 +175,7 @@ status_t AudioRecord::set(
	if (inputSource == AUDIO_SOURCE_DEFAULT) {		if (inputSource == AUDIO_SOURCE_DEFAULT) {
	inputSource = AUDIO_SOURCE_MIC;		inputSource = AUDIO_SOURCE_MIC;
	}		}
			mInputSource = inputSource;

	if (sampleRate == 0) {		if (sampleRate == 0) {
	ALOGE("Invalid sample rate %u", sampleRate);		ALOGE("Invalid sample rate %u", sampleRate);
	@@ -210,28 +211,10 @@ status_t AudioRecord::set(
	// Assumes audio_is_linear_pcm(format), else sizeof(uint8_t)		// Assumes audio_is_linear_pcm(format), else sizeof(uint8_t)
	mFrameSize = channelCount * audio_bytes_per_sample(format);		mFrameSize = channelCount * audio_bytes_per_sample(format);

	if (sessionId == 0 ) {
	mSessionId = AudioSystem::newAudioSessionId();
	} else {
	mSessionId = sessionId;
	}
	ALOGV("set(): mSessionId %d", mSessionId);

	mFlags = flags;

	audio_io_handle_t input = AudioSystem::getInput(inputSource,
	sampleRate,
	format,
	channelMask,
	mSessionId);
	if (input == 0) {
	ALOGE("Could not get audio input for record source %d", inputSource);
	return BAD_VALUE;
	}

	// validate framecount		// validate framecount
	size_t minFrameCount = 0;		size_t minFrameCount = 0;
	status_t status = getMinFrameCount(&minFrameCount, sampleRate, format, channelMask);		status_t status = AudioRecord::getMinFrameCount(&minFrameCount,
			sampleRate, format, channelMask);
	if (status != NO_ERROR) {		if (status != NO_ERROR) {
	ALOGE("getMinFrameCount() failed; status %d", status);		ALOGE("getMinFrameCount() failed; status %d", status);
	return status;		return status;
	@@ -244,13 +227,23 @@ status_t AudioRecord::set(
	ALOGE("frameCount %u < minFrameCount %u", frameCount, minFrameCount);		ALOGE("frameCount %u < minFrameCount %u", frameCount, minFrameCount);
	return BAD_VALUE;		return BAD_VALUE;
	}		}
			mFrameCount = frameCount;

	mNotificationFramesReq = notificationFrames;		mNotificationFramesReq = notificationFrames;
	mNotificationFramesAct = 0;		mNotificationFramesAct = 0;

			if (sessionId == 0 ) {
			mSessionId = AudioSystem::newAudioSessionId();
			} else {
			mSessionId = sessionId;
			}
			ALOGV("set(): mSessionId %d", mSessionId);

			mFlags = flags;

	// create the IAudioRecord		// create the IAudioRecord
	status = openRecord_l(sampleRate, format, frameCount, mFlags, input, 0 /epoch/);		status = openRecord_l(0 /epoch/);
	if (status != NO_ERROR) {		if (status) {
	return status;		return status;
	}		}

	@@ -274,8 +267,6 @@ status_t AudioRecord::set(
	mMarkerReached = false;		mMarkerReached = false;
	mNewPosition = 0;		mNewPosition = 0;
	mUpdatePeriod = 0;		mUpdatePeriod = 0;
	mInputSource = inputSource;
	mInput = input;
	AudioSystem::acquireAudioSessionId(mSessionId);		AudioSystem::acquireAudioSessionId(mSessionId);
	mSequence = 1;		mSequence = 1;
	mObservedSequence = mSequence;		mObservedSequence = mSequence;
	@@ -429,13 +420,7 @@ unsigned int AudioRecord::getInputFramesLost() const
	// -------------------------------------------------------------------------		// -------------------------------------------------------------------------

	// must be called with mLock held		// must be called with mLock held
	status_t AudioRecord::openRecord_l(		status_t AudioRecord::openRecord_l(size_t epoch)
	uint32_t sampleRate,
	audio_format_t format,
	size_t frameCount,
	audio_input_flags_t flags,
	audio_io_handle_t input,
	size_t epoch)
	{		{
	status_t status;		status_t status;
	const sp<IAudioFlinger>& audioFlinger = AudioSystem::get_audio_flinger();		const sp<IAudioFlinger>& audioFlinger = AudioSystem::get_audio_flinger();
	@@ -449,12 +434,11 @@ status_t AudioRecord::openRecord_l(

	// Client can only express a preference for FAST. Server will perform additional tests.		// Client can only express a preference for FAST. Server will perform additional tests.
	// The only supported use case for FAST is callback transfer mode.		// The only supported use case for FAST is callback transfer mode.
	if (flags & AUDIO_INPUT_FLAG_FAST) {		if (mFlags & AUDIO_INPUT_FLAG_FAST) {
	if ((mTransfer != TRANSFER_CALLBACK) \|\| (mAudioRecordThread == 0)) {		if ((mTransfer != TRANSFER_CALLBACK) \|\| (mAudioRecordThread == 0)) {
	ALOGW("AUDIO_INPUT_FLAG_FAST denied by client");		ALOGW("AUDIO_INPUT_FLAG_FAST denied by client");
	// once denied, do not request again if IAudioRecord is re-created		// once denied, do not request again if IAudioRecord is re-created
	flags = (audio_input_flags_t) (flags & ~AUDIO_INPUT_FLAG_FAST);		mFlags = (audio_input_flags_t) (mFlags & ~AUDIO_INPUT_FLAG_FAST);
	mFlags = flags;
	} else {		} else {
	trackFlags \|= IAudioFlinger::TRACK_FAST;		trackFlags \|= IAudioFlinger::TRACK_FAST;
	tid = mAudioRecordThread->getTid();		tid = mAudioRecordThread->getTid();
	@@ -463,18 +447,25 @@ status_t AudioRecord::openRecord_l(

	mNotificationFramesAct = mNotificationFramesReq;		mNotificationFramesAct = mNotificationFramesReq;

	if (!(flags & AUDIO_INPUT_FLAG_FAST)) {		if (!(mFlags & AUDIO_INPUT_FLAG_FAST)) {
	// Make sure that application is notified with sufficient margin before overrun		// Make sure that application is notified with sufficient margin before overrun
	if (mNotificationFramesAct == 0 \|\| mNotificationFramesAct > frameCount/2) {		if (mNotificationFramesAct == 0 \|\| mNotificationFramesAct > mFrameCount/2) {
	mNotificationFramesAct = frameCount/2;		mNotificationFramesAct = mFrameCount/2;
	}		}
	}		}

			audio_io_handle_t input = AudioSystem::getInput(mInputSource, mSampleRate, mFormat,
			mChannelMask, mSessionId);
			if (input == 0) {
			ALOGE("Could not get audio input for record source %d", mInputSource);
			return BAD_VALUE;
			}

	int originalSessionId = mSessionId;		int originalSessionId = mSessionId;
	sp<IAudioRecord> record = audioFlinger->openRecord(input,		sp<IAudioRecord> record = audioFlinger->openRecord(input,
	sampleRate, format,		mSampleRate, mFormat,
	mChannelMask,		mChannelMask,
	frameCount,		mFrameCount,
	&trackFlags,		&trackFlags,
	tid,		tid,
	&mSessionId,		&mSessionId,
	@@ -484,6 +475,7 @@ status_t AudioRecord::openRecord_l(

	if (record == 0) {		if (record == 0) {
	ALOGE("AudioFlinger could not create record track, status: %d", status);		ALOGE("AudioFlinger could not create record track, status: %d", status);
			AudioSystem::releaseInput(input);
	return status;		return status;
	}		}
	sp<IMemory> iMem = record->getCblk();		sp<IMemory> iMem = record->getCblk();
	@@ -495,27 +487,27 @@ status_t AudioRecord::openRecord_l(
	mAudioRecord->asBinder()->unlinkToDeath(mDeathNotifier, this);		mAudioRecord->asBinder()->unlinkToDeath(mDeathNotifier, this);
	mDeathNotifier.clear();		mDeathNotifier.clear();
	}		}
			mInput = input;
	mAudioRecord = record;		mAudioRecord = record;
	mCblkMemory = iMem;		mCblkMemory = iMem;
	audio_track_cblk_t* cblk = static_cast<audio_track_cblk_t*>(iMem->pointer());		audio_track_cblk_t* cblk = static_cast<audio_track_cblk_t*>(iMem->pointer());
	mCblk = cblk;		mCblk = cblk;
	// FIXME missing fast track frameCount logic		// FIXME missing fast track frameCount logic
	mAwaitBoost = false;		mAwaitBoost = false;
	if (flags & AUDIO_INPUT_FLAG_FAST) {		if (mFlags & AUDIO_INPUT_FLAG_FAST) {
	if (trackFlags & IAudioFlinger::TRACK_FAST) {		if (trackFlags & IAudioFlinger::TRACK_FAST) {
	ALOGV("AUDIO_INPUT_FLAG_FAST successful; frameCount %u", frameCount);		ALOGV("AUDIO_INPUT_FLAG_FAST successful; frameCount %u", mFrameCount);
	mAwaitBoost = true;		mAwaitBoost = true;
	// double-buffering is not required for fast tracks, due to tighter scheduling		// double-buffering is not required for fast tracks, due to tighter scheduling
	if (mNotificationFramesAct == 0 \|\| mNotificationFramesAct > frameCount) {		if (mNotificationFramesAct == 0 \|\| mNotificationFramesAct > mFrameCount) {
	mNotificationFramesAct = frameCount;		mNotificationFramesAct = mFrameCount;
	}		}
	} else {		} else {
	ALOGV("AUDIO_INPUT_FLAG_FAST denied by server; frameCount %u", frameCount);		ALOGV("AUDIO_INPUT_FLAG_FAST denied by server; frameCount %u", mFrameCount);
	// once denied, do not request again if IAudioRecord is re-created		// once denied, do not request again if IAudioRecord is re-created
	flags = (audio_input_flags_t) (flags & ~AUDIO_INPUT_FLAG_FAST);		mFlags = (audio_input_flags_t) (mFlags & ~AUDIO_INPUT_FLAG_FAST);
	mFlags = flags;		if (mNotificationFramesAct == 0 \|\| mNotificationFramesAct > mFrameCount/2) {
	if (mNotificationFramesAct == 0 \|\| mNotificationFramesAct > frameCount/2) {		mNotificationFramesAct = mFrameCount/2;
	mNotificationFramesAct = frameCount/2;
	}		}
	}		}
	}		}
	@@ -524,7 +516,7 @@ status_t AudioRecord::openRecord_l(
	void buffers = (char)cblk + sizeof(audio_track_cblk_t);		void buffers = (char)cblk + sizeof(audio_track_cblk_t);

	// update proxy		// update proxy
	mProxy = new AudioRecordClientProxy(cblk, buffers, frameCount, mFrameSize);		mProxy = new AudioRecordClientProxy(cblk, buffers, mFrameCount, mFrameSize);
	mProxy->setEpoch(epoch);		mProxy->setEpoch(epoch);
	mProxy->setMinimum(mNotificationFramesAct);		mProxy->setMinimum(mNotificationFramesAct);

	@@ -651,17 +643,6 @@ audio_io_handle_t AudioRecord::getInput() const
	return mInput;		return mInput;
	}		}

	// must be called with mLock held
	audio_io_handle_t AudioRecord::getInput_l()
	{
	mInput = AudioSystem::getInput(mInputSource,
	mSampleRate,
	mFormat,
	mChannelMask,
	mSessionId);
	return mInput;
	}

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

	ssize_t AudioRecord::read(void* buffer, size_t userSize)		ssize_t AudioRecord::read(void* buffer, size_t userSize)
	@@ -949,7 +930,7 @@ status_t AudioRecord::restoreRecord_l(const char *from)
	// It will also delete the strong references on previous IAudioRecord and IMemory		// It will also delete the strong references on previous IAudioRecord and IMemory
	size_t position = mProxy->getPosition();		size_t position = mProxy->getPosition();
	mNewPosition = position + mUpdatePeriod;		mNewPosition = position + mUpdatePeriod;
	result = openRecord_l(mSampleRate, mFormat, mFrameCount, mFlags, getInput_l(), position);		result = openRecord_l(position);
	if (result == NO_ERROR) {		if (result == NO_ERROR) {
	if (mActive) {		if (mActive) {
	// callback thread or sync event hasn't changed		// callback thread or sync event hasn't changed