Use audio_session_t consistently
Bug: 27562099
Change-Id: I328d8226191386b163f2ace41233607294c50dcd
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index bb24403..0025660 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -321,7 +321,7 @@
}
sp<IMediaPlayer> MediaPlayerService::create(const sp<IMediaPlayerClient>& client,
- int audioSessionId)
+ audio_session_t audioSessionId)
{
pid_t pid = IPCThreadState::self()->getCallingPid();
int32_t connId = android_atomic_inc(&mNextConnId);
@@ -556,7 +556,7 @@
MediaPlayerService::Client::Client(
const sp<MediaPlayerService>& service, pid_t pid,
int32_t connId, const sp<IMediaPlayerClient>& client,
- int audioSessionId, uid_t uid)
+ audio_session_t audioSessionId, uid_t uid)
{
ALOGV("Client(%d) constructor", connId);
mPid = pid;
@@ -1332,7 +1332,7 @@
#undef LOG_TAG
#define LOG_TAG "AudioSink"
-MediaPlayerService::AudioOutput::AudioOutput(int sessionId, int uid, int pid,
+MediaPlayerService::AudioOutput::AudioOutput(audio_session_t sessionId, int uid, int pid,
const audio_attributes_t* attr)
: mCallback(NULL),
mCallbackCookie(NULL),
@@ -2111,7 +2111,7 @@
data->unlock();
}
-int MediaPlayerService::AudioOutput::getSessionId() const
+audio_session_t MediaPlayerService::AudioOutput::getSessionId() const
{
Mutex::Autolock lock(mLock);
return mSessionId;
diff --git a/media/libmediaplayerservice/MediaPlayerService.h b/media/libmediaplayerservice/MediaPlayerService.h
index bd98ef1..1dd2ddd 100644
--- a/media/libmediaplayerservice/MediaPlayerService.h
+++ b/media/libmediaplayerservice/MediaPlayerService.h
@@ -75,7 +75,7 @@
class CallbackData;
public:
- AudioOutput(int sessionId, int uid, int pid,
+ AudioOutput(audio_session_t sessionId, int uid, int pid,
const audio_attributes_t * attr);
virtual ~AudioOutput();
@@ -90,7 +90,7 @@
virtual status_t getTimestamp(AudioTimestamp &ts) const;
virtual int64_t getPlayedOutDurationUs(int64_t nowUs) const;
virtual status_t getFramesWritten(uint32_t *frameswritten) const;
- virtual int getSessionId() const;
+ virtual audio_session_t getSessionId() const;
virtual uint32_t getSampleRate() const;
virtual status_t open(
@@ -150,7 +150,7 @@
uint32_t mSampleRateHz; // sample rate of the content, as set in open()
float mMsecsPerFrame;
size_t mFrameSize;
- int mSessionId;
+ audio_session_t mSessionId;
int mUid;
int mPid;
float mSendLevel;
@@ -214,7 +214,8 @@
void removeMediaRecorderClient(wp<MediaRecorderClient> client);
virtual sp<IMediaMetadataRetriever> createMetadataRetriever();
- virtual sp<IMediaPlayer> create(const sp<IMediaPlayerClient>& client, int audioSessionId);
+ virtual sp<IMediaPlayer> create(const sp<IMediaPlayerClient>& client,
+ audio_session_t audioSessionId);
virtual sp<IMediaCodecList> getCodecList() const;
virtual sp<IOMX> getOMX();
@@ -332,7 +333,7 @@
pid_t pid() const { return mPid; }
virtual status_t dump(int fd, const Vector<String16>& args);
- int getAudioSessionId() { return mAudioSessionId; }
+ audio_session_t getAudioSessionId() { return mAudioSessionId; }
private:
friend class MediaPlayerService;
@@ -340,7 +341,7 @@
pid_t pid,
int32_t connId,
const sp<IMediaPlayerClient>& client,
- int audioSessionId,
+ audio_session_t audioSessionId,
uid_t uid);
Client();
virtual ~Client();
@@ -375,7 +376,7 @@
status_t mStatus;
bool mLoop;
int32_t mConnId;
- int mAudioSessionId;
+ audio_session_t mAudioSessionId;
audio_attributes_t * mAudioAttributes;
uid_t mUID;
sp<ANativeWindow> mConnectedWindow;