Use audio_session_t consistently
Bug: 27562099
Change-Id: I328d8226191386b163f2ace41233607294c50dcd
diff --git a/media/libmedia/AudioEffect.cpp b/media/libmedia/AudioEffect.cpp
index ff82544..590952f 100644
--- a/media/libmedia/AudioEffect.cpp
+++ b/media/libmedia/AudioEffect.cpp
@@ -47,7 +47,7 @@
int32_t priority,
effect_callback_t cbf,
void* user,
- int sessionId,
+ audio_session_t sessionId,
audio_io_handle_t io
)
: mStatus(NO_INIT), mOpPackageName(opPackageName)
@@ -61,7 +61,7 @@
int32_t priority,
effect_callback_t cbf,
void* user,
- int sessionId,
+ audio_session_t sessionId,
audio_io_handle_t io
)
: mStatus(NO_INIT), mOpPackageName(opPackageName)
@@ -93,7 +93,7 @@
int32_t priority,
effect_callback_t cbf,
void* user,
- int sessionId,
+ audio_session_t sessionId,
audio_io_handle_t io)
{
sp<IEffect> iEffect;
@@ -433,7 +433,7 @@
}
-status_t AudioEffect::queryDefaultPreProcessing(int audioSession,
+status_t AudioEffect::queryDefaultPreProcessing(audio_session_t audioSession,
effect_descriptor_t *descriptors,
uint32_t *count)
{
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp
index 1767385..79ce75e 100644
--- a/media/libmedia/AudioRecord.cpp
+++ b/media/libmedia/AudioRecord.cpp
@@ -82,7 +82,7 @@
callback_t cbf,
void* user,
uint32_t notificationFrames,
- int sessionId,
+ audio_session_t sessionId,
transfer_type transferType,
audio_input_flags_t flags,
int uid,
@@ -139,7 +139,7 @@
void* user,
uint32_t notificationFrames,
bool threadCanCallJava,
- int sessionId,
+ audio_session_t sessionId,
transfer_type transferType,
audio_input_flags_t flags,
int uid,
@@ -227,7 +227,7 @@
// mNotificationFramesAct is initialized in openRecord_l
if (sessionId == AUDIO_SESSION_ALLOCATE) {
- mSessionId = AudioSystem::newAudioUniqueId(AUDIO_UNIQUE_ID_USE_SESSION);
+ mSessionId = (audio_session_t) AudioSystem::newAudioUniqueId(AUDIO_UNIQUE_ID_USE_SESSION);
} else {
mSessionId = sessionId;
}
@@ -288,7 +288,7 @@
// -------------------------------------------------------------------------
-status_t AudioRecord::start(AudioSystem::sync_event_t event, int triggerSession)
+status_t AudioRecord::start(AudioSystem::sync_event_t event, audio_session_t triggerSession)
{
ALOGV("start, sync event %d trigger session %d", event, triggerSession);
@@ -531,7 +531,7 @@
for (;;) {
status = AudioSystem::getInputForAttr(&mAttributes, &input,
- (audio_session_t)mSessionId,
+ mSessionId,
// FIXME compare to AudioTrack
IPCThreadState::self()->getCallingUid(),
mSampleRate, mFormat, mChannelMask,
@@ -582,7 +582,7 @@
mTransfer, mSampleRate, afSampleRate);
mFlags = (audio_input_flags_t) (mFlags & ~(AUDIO_INPUT_FLAG_FAST |
AUDIO_INPUT_FLAG_RAW));
- AudioSystem::releaseInput(input, (audio_session_t)mSessionId);
+ AudioSystem::releaseInput(input, mSessionId);
continue; // retry
}
}
@@ -604,7 +604,7 @@
size_t temp = frameCount; // temp may be replaced by a revised value of frameCount,
// but we will still need the original value also
- int originalSessionId = mSessionId;
+ audio_session_t originalSessionId = mSessionId;
sp<IMemory> iMem; // for cblk
sp<IMemory> bufferMem;
@@ -727,7 +727,7 @@
}
// Arrive here on error, via a break
- AudioSystem::releaseInput(input, (audio_session_t)mSessionId);
+ AudioSystem::releaseInput(input, mSessionId);
if (status == NO_ERROR) {
status = NO_INIT;
}
@@ -1169,7 +1169,7 @@
if (mActive) {
// callback thread or sync event hasn't changed
// FIXME this fails if we have a new AudioFlinger instance
- result = mAudioRecord->start(AudioSystem::SYNC_EVENT_SAME, 0);
+ result = mAudioRecord->start(AudioSystem::SYNC_EVENT_SAME, AUDIO_SESSION_NONE);
}
mFramesReadServerOffset = mFramesRead; // server resets to zero so we need an offset.
}
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp
index c55a90b..3a5dee6 100644
--- a/media/libmedia/AudioSystem.cpp
+++ b/media/libmedia/AudioSystem.cpp
@@ -399,7 +399,7 @@
return af->newAudioUniqueId(use);
}
-void AudioSystem::acquireAudioSessionId(int audioSession, pid_t pid)
+void AudioSystem::acquireAudioSessionId(audio_session_t audioSession, pid_t pid)
{
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af != 0) {
@@ -407,7 +407,7 @@
}
}
-void AudioSystem::releaseAudioSessionId(int audioSession, pid_t pid)
+void AudioSystem::releaseAudioSessionId(audio_session_t audioSession, pid_t pid)
{
const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();
if (af != 0) {
@@ -902,7 +902,7 @@
status_t AudioSystem::registerEffect(const effect_descriptor_t *desc,
audio_io_handle_t io,
uint32_t strategy,
- int session,
+ audio_session_t session,
int id)
{
const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index ab18c27..f663176 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -184,7 +184,7 @@
callback_t cbf,
void* user,
uint32_t notificationFrames,
- int sessionId,
+ audio_session_t sessionId,
transfer_type transferType,
const audio_offload_info_t *offloadInfo,
int uid,
@@ -213,7 +213,7 @@
callback_t cbf,
void* user,
uint32_t notificationFrames,
- int sessionId,
+ audio_session_t sessionId,
transfer_type transferType,
const audio_offload_info_t *offloadInfo,
int uid,
@@ -272,7 +272,7 @@
uint32_t notificationFrames,
const sp<IMemory>& sharedBuffer,
bool threadCanCallJava,
- int sessionId,
+ audio_session_t sessionId,
transfer_type transferType,
const audio_offload_info_t *offloadInfo,
int uid,
@@ -438,7 +438,7 @@
mNotificationFramesReq = notificationFrames;
mNotificationFramesAct = 0;
if (sessionId == AUDIO_SESSION_ALLOCATE) {
- mSessionId = AudioSystem::newAudioUniqueId(AUDIO_UNIQUE_ID_USE_SESSION);
+ mSessionId = (audio_session_t) AudioSystem::newAudioUniqueId(AUDIO_UNIQUE_ID_USE_SESSION);
} else {
mSessionId = sessionId;
}
@@ -1158,7 +1158,7 @@
status_t status;
status = AudioSystem::getOutputForAttr(attr, &output,
- (audio_session_t)mSessionId, &streamType, mClientUid,
+ mSessionId, &streamType, mClientUid,
mSampleRate, mFormat, mChannelMask,
mFlags, mSelectedDeviceId, mOffloadInfo);
@@ -1291,7 +1291,7 @@
size_t temp = frameCount; // temp may be replaced by a revised value of frameCount,
// but we will still need the original value also
- int originalSessionId = mSessionId;
+ audio_session_t originalSessionId = mSessionId;
sp<IAudioTrack> track = audioFlinger->createTrack(streamType,
mSampleRate,
mFormat,
@@ -1451,7 +1451,7 @@
}
release:
- AudioSystem::releaseOutput(output, streamType, (audio_session_t)mSessionId);
+ AudioSystem::releaseOutput(output, streamType, mSessionId);
if (status == NO_ERROR) {
status = NO_INIT;
}
diff --git a/media/libmedia/IAudioFlinger.cpp b/media/libmedia/IAudioFlinger.cpp
index 6da4524..042eac5 100644
--- a/media/libmedia/IAudioFlinger.cpp
+++ b/media/libmedia/IAudioFlinger.cpp
@@ -104,7 +104,7 @@
const sp<IMemory>& sharedBuffer,
audio_io_handle_t output,
pid_t tid,
- int *sessionId,
+ audio_session_t *sessionId,
int clientUid,
status_t *status)
{
@@ -128,7 +128,7 @@
}
data.writeInt32((int32_t) output);
data.writeInt32((int32_t) tid);
- int lSessionId = AUDIO_SESSION_ALLOCATE;
+ audio_session_t lSessionId = AUDIO_SESSION_ALLOCATE;
if (sessionId != NULL) {
lSessionId = *sessionId;
}
@@ -146,7 +146,7 @@
if (flags != NULL) {
*flags = lFlags;
}
- lSessionId = reply.readInt32();
+ lSessionId = (audio_session_t) reply.readInt32();
if (sessionId != NULL) {
*sessionId = lSessionId;
}
@@ -180,7 +180,7 @@
track_flags_t *flags,
pid_t tid,
int clientUid,
- int *sessionId,
+ audio_session_t *sessionId,
size_t *notificationFrames,
sp<IMemory>& cblk,
sp<IMemory>& buffers,
@@ -200,7 +200,7 @@
data.writeInt32(lFlags);
data.writeInt32((int32_t) tid);
data.writeInt32((int32_t) clientUid);
- int lSessionId = AUDIO_SESSION_ALLOCATE;
+ audio_session_t lSessionId = AUDIO_SESSION_ALLOCATE;
if (sessionId != NULL) {
lSessionId = *sessionId;
}
@@ -220,7 +220,7 @@
if (flags != NULL) {
*flags = lFlags;
}
- lSessionId = reply.readInt32();
+ lSessionId = (audio_session_t) reply.readInt32();
if (sessionId != NULL) {
*sessionId = lSessionId;
}
@@ -625,7 +625,7 @@
return id;
}
- virtual void acquireAudioSessionId(int audioSession, int pid)
+ virtual void acquireAudioSessionId(audio_session_t audioSession, int pid)
{
Parcel data, reply;
data.writeInterfaceToken(IAudioFlinger::getInterfaceDescriptor());
@@ -634,7 +634,7 @@
remote()->transact(ACQUIRE_AUDIO_SESSION_ID, data, &reply);
}
- virtual void releaseAudioSessionId(int audioSession, int pid)
+ virtual void releaseAudioSessionId(audio_session_t audioSession, int pid)
{
Parcel data, reply;
data.writeInterfaceToken(IAudioFlinger::getInterfaceDescriptor());
@@ -707,7 +707,7 @@
const sp<IEffectClient>& client,
int32_t priority,
audio_io_handle_t output,
- int sessionId,
+ audio_session_t sessionId,
const String16& opPackageName,
status_t *status,
int *id,
@@ -754,7 +754,7 @@
return effect;
}
- virtual status_t moveEffects(int session, audio_io_handle_t srcOutput,
+ virtual status_t moveEffects(audio_session_t session, audio_io_handle_t srcOutput,
audio_io_handle_t dstOutput)
{
Parcel data, reply;
@@ -936,7 +936,7 @@
}
audio_io_handle_t output = (audio_io_handle_t) data.readInt32();
pid_t tid = (pid_t) data.readInt32();
- int sessionId = data.readInt32();
+ audio_session_t sessionId = (audio_session_t) data.readInt32();
int clientUid = data.readInt32();
status_t status = NO_ERROR;
sp<IAudioTrack> track;
@@ -969,7 +969,7 @@
track_flags_t flags = (track_flags_t) data.readInt32();
pid_t tid = (pid_t) data.readInt32();
int clientUid = data.readInt32();
- int sessionId = data.readInt32();
+ audio_session_t sessionId = (audio_session_t) data.readInt32();
size_t notificationFrames = data.readInt64();
sp<IMemory> cblk;
sp<IMemory> buffers;
@@ -1214,14 +1214,14 @@
} break;
case ACQUIRE_AUDIO_SESSION_ID: {
CHECK_INTERFACE(IAudioFlinger, data, reply);
- int audioSession = data.readInt32();
+ audio_session_t audioSession = (audio_session_t) data.readInt32();
int pid = data.readInt32();
acquireAudioSessionId(audioSession, pid);
return NO_ERROR;
} break;
case RELEASE_AUDIO_SESSION_ID: {
CHECK_INTERFACE(IAudioFlinger, data, reply);
- int audioSession = data.readInt32();
+ audio_session_t audioSession = (audio_session_t) data.readInt32();
int pid = data.readInt32();
releaseAudioSessionId(audioSession, pid);
return NO_ERROR;
@@ -1267,7 +1267,7 @@
sp<IEffectClient> client = interface_cast<IEffectClient>(data.readStrongBinder());
int32_t priority = data.readInt32();
audio_io_handle_t output = (audio_io_handle_t) data.readInt32();
- int sessionId = data.readInt32();
+ audio_session_t sessionId = (audio_session_t) data.readInt32();
const String16 opPackageName = data.readString16();
status_t status = NO_ERROR;
int id = 0;
@@ -1284,7 +1284,7 @@
} break;
case MOVE_EFFECTS: {
CHECK_INTERFACE(IAudioFlinger, data, reply);
- int session = data.readInt32();
+ audio_session_t session = (audio_session_t) data.readInt32();
audio_io_handle_t srcOutput = (audio_io_handle_t) data.readInt32();
audio_io_handle_t dstOutput = (audio_io_handle_t) data.readInt32();
reply->writeInt32(moveEffects(session, srcOutput, dstOutput));
@@ -1411,7 +1411,7 @@
} break;
case GET_AUDIO_HW_SYNC: {
CHECK_INTERFACE(IAudioFlinger, data, reply);
- reply->writeInt32(getAudioHwSyncForSession((audio_session_t)data.readInt32()));
+ reply->writeInt32(getAudioHwSyncForSession((audio_session_t) data.readInt32()));
return NO_ERROR;
} break;
case SYSTEM_READY: {
diff --git a/media/libmedia/IAudioPolicyService.cpp b/media/libmedia/IAudioPolicyService.cpp
index c95d4c4..16e8f11 100644
--- a/media/libmedia/IAudioPolicyService.cpp
+++ b/media/libmedia/IAudioPolicyService.cpp
@@ -247,7 +247,7 @@
data.writeInterfaceToken(IAudioPolicyService::getInterfaceDescriptor());
data.writeInt32(output);
data.writeInt32((int32_t) stream);
- data.writeInt32((int32_t)session);
+ data.writeInt32((int32_t) session);
remote()->transact(START_OUTPUT, data, &reply);
return static_cast <status_t> (reply.readInt32());
}
@@ -260,7 +260,7 @@
data.writeInterfaceToken(IAudioPolicyService::getInterfaceDescriptor());
data.writeInt32(output);
data.writeInt32((int32_t) stream);
- data.writeInt32((int32_t)session);
+ data.writeInt32((int32_t) session);
remote()->transact(STOP_OUTPUT, data, &reply);
return static_cast <status_t> (reply.readInt32());
}
@@ -420,7 +420,7 @@
virtual status_t registerEffect(const effect_descriptor_t *desc,
audio_io_handle_t io,
uint32_t strategy,
- int session,
+ audio_session_t session,
int id)
{
Parcel data, reply;
@@ -482,7 +482,7 @@
return reply.readInt32();
}
- virtual status_t queryDefaultPreProcessing(int audioSession,
+ virtual status_t queryDefaultPreProcessing(audio_session_t audioSession,
effect_descriptor_t *descriptors,
uint32_t *count)
{
@@ -1065,7 +1065,7 @@
data.read(&desc, sizeof(effect_descriptor_t));
audio_io_handle_t io = data.readInt32();
uint32_t strategy = data.readInt32();
- int session = data.readInt32();
+ audio_session_t session = (audio_session_t) data.readInt32();
int id = data.readInt32();
reply->writeInt32(static_cast <int32_t>(registerEffect(&desc,
io,
@@ -1115,7 +1115,7 @@
case QUERY_DEFAULT_PRE_PROCESSING: {
CHECK_INTERFACE(IAudioPolicyService, data, reply);
- int audioSession = data.readInt32();
+ audio_session_t audioSession = (audio_session_t) data.readInt32();
uint32_t count = data.readInt32();
if (count > AudioEffect::kMaxPreProcessing) {
count = AudioEffect::kMaxPreProcessing;
diff --git a/media/libmedia/IAudioRecord.cpp b/media/libmedia/IAudioRecord.cpp
index 9d80753..ae66436 100644
--- a/media/libmedia/IAudioRecord.cpp
+++ b/media/libmedia/IAudioRecord.cpp
@@ -42,7 +42,7 @@
{
}
- virtual status_t start(int /*AudioSystem::sync_event_t*/ event, int triggerSession)
+ virtual status_t start(int /*AudioSystem::sync_event_t*/ event, audio_session_t triggerSession)
{
Parcel data, reply;
data.writeInterfaceToken(IAudioRecord::getInterfaceDescriptor());
@@ -77,7 +77,7 @@
case START: {
CHECK_INTERFACE(IAudioRecord, data, reply);
int /*AudioSystem::sync_event_t*/ event = data.readInt32();
- int triggerSession = data.readInt32();
+ audio_session_t triggerSession = (audio_session_t) data.readInt32();
reply->writeInt32(start(event, triggerSession));
return NO_ERROR;
} break;
diff --git a/media/libmedia/IMediaPlayerService.cpp b/media/libmedia/IMediaPlayerService.cpp
index afc94ab..27b9edd 100644
--- a/media/libmedia/IMediaPlayerService.cpp
+++ b/media/libmedia/IMediaPlayerService.cpp
@@ -68,7 +68,7 @@
}
virtual sp<IMediaPlayer> create(
- const sp<IMediaPlayerClient>& client, int audioSessionId) {
+ const sp<IMediaPlayerClient>& client, audio_session_t audioSessionId) {
Parcel data, reply;
data.writeInterfaceToken(IMediaPlayerService::getInterfaceDescriptor());
data.writeStrongBinder(IInterface::asBinder(client));
@@ -161,7 +161,7 @@
CHECK_INTERFACE(IMediaPlayerService, data, reply);
sp<IMediaPlayerClient> client =
interface_cast<IMediaPlayerClient>(data.readStrongBinder());
- int audioSessionId = data.readInt32();
+ audio_session_t audioSessionId = (audio_session_t) data.readInt32();
sp<IMediaPlayer> player = create(client, audioSessionId);
reply->writeStrongBinder(IInterface::asBinder(player));
return NO_ERROR;
diff --git a/media/libmedia/Visualizer.cpp b/media/libmedia/Visualizer.cpp
index f5c1b1f..31e310b 100644
--- a/media/libmedia/Visualizer.cpp
+++ b/media/libmedia/Visualizer.cpp
@@ -38,7 +38,7 @@
int32_t priority,
effect_callback_t cbf,
void* user,
- int sessionId)
+ audio_session_t sessionId)
: AudioEffect(SL_IID_VISUALIZATION, opPackageName, NULL, priority, cbf, user, sessionId),
mCaptureRate(CAPTURE_RATE_DEF),
mCaptureSize(CAPTURE_SIZE_DEF),
diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp
index 7e502af..53b6df6 100644
--- a/media/libmedia/mediaplayer.cpp
+++ b/media/libmedia/mediaplayer.cpp
@@ -63,7 +63,7 @@
mLeftVolume = mRightVolume = 1.0;
mVideoWidth = mVideoHeight = 0;
mLockThreadId = 0;
- mAudioSessionId = AudioSystem::newAudioUniqueId(AUDIO_UNIQUE_ID_USE_SESSION);
+ mAudioSessionId = (audio_session_t) AudioSystem::newAudioUniqueId(AUDIO_UNIQUE_ID_USE_SESSION);
AudioSystem::acquireAudioSessionId(mAudioSessionId, -1);
mSendLevel = 0;
mRetransmitEndpointValid = false;
@@ -648,7 +648,7 @@
return OK;
}
-status_t MediaPlayer::setAudioSessionId(int sessionId)
+status_t MediaPlayer::setAudioSessionId(audio_session_t sessionId)
{
ALOGV("MediaPlayer::setAudioSessionId(%d)", sessionId);
Mutex::Autolock _l(mLock);
@@ -667,7 +667,7 @@
return NO_ERROR;
}
-int MediaPlayer::getAudioSessionId()
+audio_session_t MediaPlayer::getAudioSessionId()
{
Mutex::Autolock _l(mLock);
return mAudioSessionId;