resolved conflicts for merge of 9a7d11f0 to master (35295078) · Commits · e / os / android_frameworks_av

include/media/IAudioFlinger.h

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -53,6 +53,9 @@ public:
	};		};
	typedef uint32_t track_flags_t;		typedef uint32_t track_flags_t;

			// invariant on exit for all APIs that return an sp<>:
			// (return value != 0) == (*status == NO_ERROR)

	/* create an audio track and registers it with AudioFlinger.		/* create an audio track and registers it with AudioFlinger.
	* return null if the track cannot be created.		* return null if the track cannot be created.
	*/		*/

media/libmedia/AudioRecord.cpp

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -474,7 +474,7 @@ status_t AudioRecord::openRecord_l(size_t epoch)
	ALOGE_IF(originalSessionId != 0 && mSessionId != originalSessionId,		ALOGE_IF(originalSessionId != 0 && mSessionId != originalSessionId,
	"session ID changed from %d to %d", originalSessionId, mSessionId);		"session ID changed from %d to %d", originalSessionId, mSessionId);

	if (record == 0) {		if (record == 0 \|\| status != NO_ERROR) {
	ALOGE("AudioFlinger could not create record track, status: %d", status);		ALOGE("AudioFlinger could not create record track, status: %d", status);
	AudioSystem::releaseInput(input);		AudioSystem::releaseInput(input);
	return status;		return status;
	@@ -484,6 +484,11 @@ status_t AudioRecord::openRecord_l(size_t epoch)
	ALOGE("Could not get control block");		ALOGE("Could not get control block");
	return NO_INIT;		return NO_INIT;
	}		}
			void *iMemPointer = iMem->pointer();
			if (iMemPointer == NULL) {
			ALOGE("Could not get control block pointer");
			return NO_INIT;
			}
	if (mAudioRecord != 0) {		if (mAudioRecord != 0) {
	mAudioRecord->asBinder()->unlinkToDeath(mDeathNotifier, this);		mAudioRecord->asBinder()->unlinkToDeath(mDeathNotifier, this);
	mDeathNotifier.clear();		mDeathNotifier.clear();
	@@ -491,7 +496,7 @@ status_t AudioRecord::openRecord_l(size_t epoch)
	mInput = input;		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*>(iMemPointer);
	mCblk = cblk;		mCblk = cblk;
	// FIXME missing fast track frameCount logic		// FIXME missing fast track frameCount logic
	mAwaitBoost = false;		mAwaitBoost = false;

media/libmedia/IAudioFlinger.cpp

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -184,6 +184,17 @@ public:
	}		}
	lStatus = reply.readInt32();		lStatus = reply.readInt32();
	record = interface_cast<IAudioRecord>(reply.readStrongBinder());		record = interface_cast<IAudioRecord>(reply.readStrongBinder());
			if (lStatus == NO_ERROR) {
			if (record == 0) {
			ALOGE("openRecord should have returned an IAudioRecord");
			lStatus = UNKNOWN_ERROR;
			}
			} else {
			if (record != 0) {
			ALOGE("openRecord returned an IAudioRecord but with status %d", lStatus);
			record.clear();
			}
			}
	}		}
	if (status != NULL) {		if (status != NULL) {
	*status = lStatus;		*status = lStatus;
	@@ -802,6 +813,7 @@ status_t BnAudioFlinger::onTransact(
	status_t status;		status_t status;
	sp<IAudioRecord> record = openRecord(input,		sp<IAudioRecord> record = openRecord(input,
	sampleRate, format, channelMask, frameCount, &flags, tid, &sessionId, &status);		sampleRate, format, channelMask, frameCount, &flags, tid, &sessionId, &status);
			LOG_ALWAYS_FATAL_IF((record != 0) != (status == NO_ERROR));
	reply->writeInt32(flags);		reply->writeInt32(flags);
	reply->writeInt32(sessionId);		reply->writeInt32(sessionId);
	reply->writeInt32(status);		reply->writeInt32(status);

services/audioflinger/AudioFlinger.cpp

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1247,6 +1247,7 @@ sp<IAudioRecord> AudioFlinger::openRecord(

	// check calling permissions		// check calling permissions
	if (!recordingAllowed()) {		if (!recordingAllowed()) {
			ALOGE("openRecord() permission denied: recording not allowed");
	lStatus = PERMISSION_DENIED;		lStatus = PERMISSION_DENIED;
	goto Exit;		goto Exit;
	}		}
	@@ -1262,12 +1263,14 @@ sp<IAudioRecord> AudioFlinger::openRecord(
	Mutex::Autolock _l(mLock);		Mutex::Autolock _l(mLock);
	thread = checkRecordThread_l(input);		thread = checkRecordThread_l(input);
	if (thread == NULL) {		if (thread == NULL) {
			ALOGE("openRecord() checkRecordThread_l failed");
	lStatus = BAD_VALUE;		lStatus = BAD_VALUE;
	goto Exit;		goto Exit;
	}		}

	if (deviceRequiresCaptureAudioOutputPermission(thread->inDevice())		if (deviceRequiresCaptureAudioOutputPermission(thread->inDevice())
	&& !captureAudioOutputAllowed()) {		&& !captureAudioOutputAllowed()) {
			ALOGE("openRecord() permission denied: capture not allowed");
	lStatus = PERMISSION_DENIED;		lStatus = PERMISSION_DENIED;
	goto Exit;		goto Exit;
	}		}
	@@ -1288,6 +1291,7 @@ sp<IAudioRecord> AudioFlinger::openRecord(
	// The record track uses one track in mHardwareMixerThread by convention.		// The record track uses one track in mHardwareMixerThread by convention.
	recordTrack = thread->createRecordTrack_l(client, sampleRate, format, channelMask,		recordTrack = thread->createRecordTrack_l(client, sampleRate, format, channelMask,
	frameCount, lSessionId, flags, tid, &lStatus);		frameCount, lSessionId, flags, tid, &lStatus);
			LOG_ALWAYS_FATAL_IF((recordTrack != 0) != (lStatus == NO_ERROR));
	}		}

	if (lStatus != NO_ERROR) {		if (lStatus != NO_ERROR) {

services/audioflinger/Threads.cpp

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4607,7 +4607,7 @@ sp<AudioFlinger::RecordThread::RecordTrack> AudioFlinger::RecordThread::createRe

	lStatus = initCheck();		lStatus = initCheck();
	if (lStatus != NO_ERROR) {		if (lStatus != NO_ERROR) {
	ALOGE("Audio driver not initialized.");		ALOGE("createRecordTrack_l() audio driver not initialized");
	goto Exit;		goto Exit;
	}		}
	// client expresses a preference for FAST, but we get the final say		// client expresses a preference for FAST, but we get the final say
	@@ -4671,6 +4671,7 @@ sp<AudioFlinger::RecordThread::RecordTrack> AudioFlinger::RecordThread::createRe

	lStatus = track->initCheck();		lStatus = track->initCheck();
	if (lStatus != NO_ERROR) {		if (lStatus != NO_ERROR) {
			ALOGE("createRecordTrack_l() initCheck failed %d; no control block?", lStatus);
	track.clear();		track.clear();
	goto Exit;		goto Exit;
	}		}