Merge "Use AUDIO_SESSION_ALLOCATE instead of 0" (5b27ccd6) · Commits · e / os / android_frameworks_av

include/media/AudioRecord.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -155,7 +155,7 @@ public:
		callback_t cbf = NULL,
		void* user = NULL,
		int notificationFrames = 0,
		int sessionId = 0,
		int sessionId = AUDIO_SESSION_ALLOCATE,
		transfer_type transferType = TRANSFER_DEFAULT,
		audio_input_flags_t flags = AUDIO_INPUT_FLAG_NONE);

		@@ -188,7 +188,7 @@ public:
		void* user = NULL,
		int notificationFrames = 0,
		bool threadCanCallJava = false,
		int sessionId = 0,
		int sessionId = AUDIO_SESSION_ALLOCATE,
		transfer_type transferType = TRANSFER_DEFAULT,
		audio_input_flags_t flags = AUDIO_INPUT_FLAG_NONE);

+3 −3

Original line number	Diff line number	Diff line
		@@ -187,7 +187,7 @@ public:
		callback_t cbf = NULL,
		void* user = NULL,
		int notificationFrames = 0,
		int sessionId = 0,
		int sessionId = AUDIO_SESSION_ALLOCATE,
		transfer_type transferType = TRANSFER_DEFAULT,
		const audio_offload_info_t *offloadInfo = NULL,
		int uid = -1);
		@@ -212,7 +212,7 @@ public:
		callback_t cbf = NULL,
		void* user = NULL,
		int notificationFrames = 0,
		int sessionId = 0,
		int sessionId = AUDIO_SESSION_ALLOCATE,
		transfer_type transferType = TRANSFER_DEFAULT,
		const audio_offload_info_t *offloadInfo = NULL,
		int uid = -1);
		@@ -250,7 +250,7 @@ public:
		int notificationFrames = 0,
		const sp<IMemory>& sharedBuffer = 0,
		bool threadCanCallJava = false,
		int sessionId = 0,
		int sessionId = AUDIO_SESSION_ALLOCATE,
		transfer_type transferType = TRANSFER_DEFAULT,
		const audio_offload_info_t *offloadInfo = NULL,
		int uid = -1);

+4 −4

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ status_t AudioRecord::getMinFrameCount(
		// ---------------------------------------------------------------------------

		AudioRecord::AudioRecord()
		: mStatus(NO_INIT), mSessionId(0),
		: mStatus(NO_INIT), mSessionId(AUDIO_SESSION_ALLOCATE),
		mPreviousPriority(ANDROID_PRIORITY_NORMAL), mPreviousSchedulingGroup(SP_DEFAULT)
		{
		}
		@@ -88,7 +88,7 @@ AudioRecord::AudioRecord(
		int sessionId,
		transfer_type transferType,
		audio_input_flags_t flags)
		: mStatus(NO_INIT), mSessionId(0),
		: mStatus(NO_INIT), mSessionId(AUDIO_SESSION_ALLOCATE),
		mPreviousPriority(ANDROID_PRIORITY_NORMAL),
		mPreviousSchedulingGroup(SP_DEFAULT),
		mProxy(NULL)
		@@ -233,7 +233,7 @@ status_t AudioRecord::set(
		mNotificationFramesReq = notificationFrames;
		mNotificationFramesAct = 0;

		if (sessionId == 0 ) {
		if (sessionId == AUDIO_SESSION_ALLOCATE) {
		mSessionId = AudioSystem::newAudioSessionId();
		} else {
		mSessionId = sessionId;
		@@ -471,7 +471,7 @@ status_t AudioRecord::openRecord_l(size_t epoch)
		tid,
		&mSessionId,
		&status);
		ALOGE_IF(originalSessionId != 0 && mSessionId != originalSessionId,
		ALOGE_IF(originalSessionId != AUDIO_SESSION_ALLOCATE && mSessionId != originalSessionId,
		"session ID changed from %d to %d", originalSessionId, mSessionId);

		if (record == 0 \|\| status != NO_ERROR) {

+2 −2

Original line number	Diff line number	Diff line
		@@ -117,7 +117,7 @@ public:
		}
		data.writeInt32((int32_t) output);
		data.writeInt32((int32_t) tid);
		int lSessionId = 0;
		int lSessionId = AUDIO_SESSION_ALLOCATE;
		if (sessionId != NULL) {
		lSessionId = *sessionId;
		}
		@@ -167,7 +167,7 @@ public:
		track_flags_t lFlags = flags != NULL ? *flags : (track_flags_t) TRACK_DEFAULT;
		data.writeInt32(lFlags);
		data.writeInt32((int32_t) tid);
		int lSessionId = 0;
		int lSessionId = AUDIO_SESSION_ALLOCATE;
		if (sessionId != NULL) {
		lSessionId = *sessionId;
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -534,7 +534,7 @@ sp<IAudioTrack> AudioFlinger::createTrack(
		client = registerPid_l(pid);

		ALOGV("createTrack() sessionId: %d", (sessionId == NULL) ? -2 : *sessionId);
		if (sessionId != NULL && *sessionId != AUDIO_SESSION_OUTPUT_MIX) {
		if (sessionId != NULL && *sessionId != AUDIO_SESSION_ALLOCATE) {
		// check if an effect chain with the same session ID is present on another
		// output thread and move it here.
		for (size_t i = 0; i < mPlaybackThreads.size(); i++) {
		@@ -1324,7 +1324,7 @@ sp<IAudioRecord> AudioFlinger::openRecord(
		client = registerPid_l(pid);

		// If no audio session id is provided, create one here
		if (sessionId != NULL && *sessionId != AUDIO_SESSION_OUTPUT_MIX) {
		if (sessionId != NULL && *sessionId != AUDIO_SESSION_ALLOCATE) {
		lSessionId = *sessionId;
		} else {
		lSessionId = nextUniqueId();