diff options
| author | Ricardo Garcia <rago@google.com> | 2015-04-22 18:47:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-22 18:47:33 +0000 |
| commit | 983f2e02b342ef3ac4004471cbfd4cd8d5aecf7d (patch) | |
| tree | 7c2ec64cc3034b84348e96cfe120a9c87efe92e3 /media/libmedia/AudioTrackShared.cpp | |
| parent | d54514d5e4b326e5dcaaf8b3f336ef31e447f355 (diff) | |
| parent | 5a8a95de6dad1a3bcf3da5a37b35766e89086e13 (diff) | |
| download | frameworks_av-983f2e02b342ef3ac4004471cbfd4cd8d5aecf7d.zip frameworks_av-983f2e02b342ef3ac4004471cbfd4cd8d5aecf7d.tar.gz frameworks_av-983f2e02b342ef3ac4004471cbfd4cd8d5aecf7d.tar.bz2 | |
Merge "Use AudioPlaybackRate to hold TimestretchBufferProvider parameters"
Diffstat (limited to 'media/libmedia/AudioTrackShared.cpp')
| -rw-r--r-- | media/libmedia/AudioTrackShared.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/media/libmedia/AudioTrackShared.cpp b/media/libmedia/AudioTrackShared.cpp index aee9fc2..1d7aed2 100644 --- a/media/libmedia/AudioTrackShared.cpp +++ b/media/libmedia/AudioTrackShared.cpp @@ -794,14 +794,10 @@ void AudioTrackServerProxy::tallyUnderrunFrames(uint32_t frameCount) (void) android_atomic_or(CBLK_UNDERRUN, &cblk->mFlags); } -void AudioTrackServerProxy::getPlaybackRate(float *speed, float *pitch) +AudioPlaybackRate AudioTrackServerProxy::getPlaybackRate() { // do not call from multiple threads without holding lock - AudioTrackPlaybackRate playbackRate; - if (mPlaybackRateObserver.poll(playbackRate)) { - mPlaybackRate = playbackRate; - } - *speed = mPlaybackRate.mSpeed; - *pitch = mPlaybackRate.mPitch; + mPlaybackRateObserver.poll(mPlaybackRate); + return mPlaybackRate; } // --------------------------------------------------------------------------- |