diff options
| author | Eric Laurent <elaurent@google.com> | 2014-07-27 18:38:22 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2014-07-28 21:43:16 +0000 |
| commit | de3f8392fbf380ba6f09d009b00d7172477389a2 (patch) | |
| tree | 77687cb28cf7dfb34ebb6317e246b3cad5672b86 /media | |
| parent | 03524dcc1215b2c468f5c8c8abe6f1c26239fd71 (diff) | |
| download | frameworks_av-de3f8392fbf380ba6f09d009b00d7172477389a2.zip frameworks_av-de3f8392fbf380ba6f09d009b00d7172477389a2.tar.gz frameworks_av-de3f8392fbf380ba6f09d009b00d7172477389a2.tar.bz2 | |
rename AudioSystem::newAudioSessionId()
Rename AudioSystem::newAudioSessionId() to
AudioSystem::newAudioUniqueId() as it can be used
also for I/O handles.
Bug: 12378680.
Change-Id: I611ea3b5eb57a4b0774437f477ee87dc4ccc2cc2
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/AudioRecord.cpp | 2 | ||||
| -rw-r--r-- | media/libmedia/AudioSystem.cpp | 6 | ||||
| -rw-r--r-- | media/libmedia/IAudioFlinger.cpp | 6 | ||||
| -rw-r--r-- | media/libmedia/mediaplayer.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp index 80c8c5e..299a77c 100644 --- a/media/libmedia/AudioRecord.cpp +++ b/media/libmedia/AudioRecord.cpp @@ -214,7 +214,7 @@ status_t AudioRecord::set( // mNotificationFramesAct is initialized in openRecord_l if (sessionId == AUDIO_SESSION_ALLOCATE) { - mSessionId = AudioSystem::newAudioSessionId(); + mSessionId = AudioSystem::newAudioUniqueId(); } else { mSessionId = sessionId; } diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index fd5824b..0d61885 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -427,11 +427,11 @@ uint32_t AudioSystem::getInputFramesLost(audio_io_handle_t ioHandle) return result; } -int AudioSystem::newAudioSessionId() +audio_unique_id_t AudioSystem::newAudioUniqueId() { const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger(); - if (af == 0) return AUDIO_SESSION_ALLOCATE; - return af->newAudioSessionId(); + if (af == 0) return AUDIO_UNIQUE_ID_ALLOCATE; + return af->newAudioUniqueId(); } void AudioSystem::acquireAudioSessionId(int audioSession, pid_t pid) diff --git a/media/libmedia/IAudioFlinger.cpp b/media/libmedia/IAudioFlinger.cpp index 0f4e632..5331fce 100644 --- a/media/libmedia/IAudioFlinger.cpp +++ b/media/libmedia/IAudioFlinger.cpp @@ -604,12 +604,12 @@ public: return (uint32_t) reply.readInt32(); } - virtual int newAudioSessionId() + virtual audio_unique_id_t newAudioUniqueId() { Parcel data, reply; data.writeInterfaceToken(IAudioFlinger::getInterfaceDescriptor()); status_t status = remote()->transact(NEW_AUDIO_SESSION_ID, data, &reply); - int id = AUDIO_SESSION_ALLOCATE; + audio_unique_id_t id = AUDIO_SESSION_ALLOCATE; if (status == NO_ERROR) { id = reply.readInt32(); } @@ -1176,7 +1176,7 @@ status_t BnAudioFlinger::onTransact( } break; case NEW_AUDIO_SESSION_ID: { CHECK_INTERFACE(IAudioFlinger, data, reply); - reply->writeInt32(newAudioSessionId()); + reply->writeInt32(newAudioUniqueId()); return NO_ERROR; } break; case ACQUIRE_AUDIO_SESSION_ID: { diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp index 2b7ea97..6cd377a 100644 --- a/media/libmedia/mediaplayer.cpp +++ b/media/libmedia/mediaplayer.cpp @@ -59,7 +59,7 @@ MediaPlayer::MediaPlayer() mLeftVolume = mRightVolume = 1.0; mVideoWidth = mVideoHeight = 0; mLockThreadId = 0; - mAudioSessionId = AudioSystem::newAudioSessionId(); + mAudioSessionId = AudioSystem::newAudioUniqueId(); AudioSystem::acquireAudioSessionId(mAudioSessionId, -1); mSendLevel = 0; mRetransmitEndpointValid = false; |