diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-12-05 12:38:14 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2013-12-05 12:38:14 -0800 |
| commit | e2d617f5ba7fb90f27b03e2593666b2c927e4dc9 (patch) | |
| tree | 187992f0c2d4bc565ca24b34aa0ee78e359a3f68 /media/libmediaplayerservice/MediaPlayerService.cpp | |
| parent | 92630351d265a61faae2dfe006a8bb330283aa7b (diff) | |
| parent | 2381f06f374ee0cb8bca0edf5388394432b00e6d (diff) | |
| download | frameworks_av-e2d617f5ba7fb90f27b03e2593666b2c927e4dc9.zip frameworks_av-e2d617f5ba7fb90f27b03e2593666b2c927e4dc9.tar.gz frameworks_av-e2d617f5ba7fb90f27b03e2593666b2c927e4dc9.tar.bz2 | |
Merge commit '2381f06f374ee0cb8bca0edf5388394432b00e6d' into HEAD
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.cpp')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 9553458..cd052e6 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -590,7 +590,7 @@ sp<MediaPlayerBase> MediaPlayerService::Client::setDataSource_pre( } if (!p->hardwareOutput()) { - mAudioOutput = new AudioOutput(mAudioSessionId); + mAudioOutput = new AudioOutput(mAudioSessionId, IPCThreadState::self()->getCallingUid()); static_cast<MediaPlayerInterface*>(p.get())->setAudioSink(mAudioOutput); } @@ -1296,12 +1296,13 @@ Exit: #undef LOG_TAG #define LOG_TAG "AudioSink" -MediaPlayerService::AudioOutput::AudioOutput(int sessionId) +MediaPlayerService::AudioOutput::AudioOutput(int sessionId, int uid) : mCallback(NULL), mCallbackCookie(NULL), mCallbackData(NULL), mBytesWritten(0), mSessionId(sessionId), + mUid(uid), mFlags(AUDIO_OUTPUT_FLAG_NONE) { ALOGV("AudioOutput(%d)", sessionId); mStreamType = AUDIO_STREAM_MUSIC; @@ -1549,7 +1550,8 @@ status_t MediaPlayerService::AudioOutput::open( 0, // notification frames mSessionId, AudioTrack::TRANSFER_CALLBACK, - offloadInfo); + offloadInfo, + mUid); } else { t = new AudioTrack( mStreamType, @@ -1558,10 +1560,13 @@ status_t MediaPlayerService::AudioOutput::open( channelMask, frameCount, flags, - NULL, - NULL, - 0, - mSessionId); + NULL, // callback + NULL, // user data + 0, // notification frames + mSessionId, + AudioTrack::TRANSFER_DEFAULT, + NULL, // offload info + mUid); } if ((t == 0) || (t->initCheck() != NO_ERROR)) { |