diff options
| author | Eric Laurent <elaurent@google.com> | 2013-12-17 14:11:13 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-17 14:11:13 -0800 |
| commit | 51d166ec7985949fa69262f213a4162708ebe81e (patch) | |
| tree | f2fb149165426fbc8e1805b8c8516f7353e8e126 /include | |
| parent | 5893736dc1776008026e660526d34943ea888fd6 (diff) | |
| parent | 9060d498be0c54d3caf84e2dbf1ba62516b3e76e (diff) | |
| download | frameworks_av-51d166ec7985949fa69262f213a4162708ebe81e.zip frameworks_av-51d166ec7985949fa69262f213a4162708ebe81e.tar.gz frameworks_av-51d166ec7985949fa69262f213a4162708ebe81e.tar.bz2 | |
am 9060d498: Merge "update offloaded audio track sampling rate"
* commit '9060d498be0c54d3caf84e2dbf1ba62516b3e76e':
update offloaded audio track sampling rate
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioTrack.h | 2 | ||||
| -rw-r--r-- | include/media/MediaPlayerInterface.h | 1 | ||||
| -rw-r--r-- | include/media/stagefright/AudioPlayer.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index f379ee5..f6646ab 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -661,7 +661,7 @@ protected: sp<AudioTrackThread> mAudioTrackThread; float mVolume[2]; float mSendLevel; - uint32_t mSampleRate; + mutable uint32_t mSampleRate; // mutable because getSampleRate() can update it. size_t mFrameCount; // corresponds to current IAudioTrack size_t mReqFrameCount; // frame count to request the next time a new // IAudioTrack is needed diff --git a/include/media/MediaPlayerInterface.h b/include/media/MediaPlayerInterface.h index cc244f0..26d8729 100644 --- a/include/media/MediaPlayerInterface.h +++ b/include/media/MediaPlayerInterface.h @@ -100,6 +100,7 @@ public: virtual status_t getFramesWritten(uint32_t *frameswritten) const = 0; virtual int getSessionId() const = 0; virtual audio_stream_type_t getAudioStreamType() const = 0; + virtual uint32_t getSampleRate() const = 0; // If no callback is specified, use the "write" API below to submit // audio data. diff --git a/include/media/stagefright/AudioPlayer.h b/include/media/stagefright/AudioPlayer.h index 912a43c..14afb85 100644 --- a/include/media/stagefright/AudioPlayer.h +++ b/include/media/stagefright/AudioPlayer.h @@ -129,7 +129,7 @@ private: void reset(); uint32_t getNumFramesPendingPlayout() const; - int64_t getOutputPlayPositionUs_l() const; + int64_t getOutputPlayPositionUs_l(); bool allowDeepBuffering() const { return (mCreateFlags & ALLOW_DEEP_BUFFERING) != 0; } bool useOffload() const { return (mCreateFlags & USE_OFFLOAD) != 0; } |