summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/MediaPlayerService.cpp
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2013-07-26 17:16:50 -0700
committerEric Laurent <elaurent@google.com>2013-11-22 09:09:51 -0800
commit6f59db12a64f4496866952a251122ccb77a36c6b (patch)
tree29fcb69aa1f491974ec2b2ea5a01155b53940be5 /media/libmediaplayerservice/MediaPlayerService.cpp
parent23700debf767ef7fdfc30d96612771c3a03ad40d (diff)
downloadframeworks_av-6f59db12a64f4496866952a251122ccb77a36c6b.zip
frameworks_av-6f59db12a64f4496866952a251122ccb77a36c6b.tar.gz
frameworks_av-6f59db12a64f4496866952a251122ccb77a36c6b.tar.bz2
update offloaded audio track sampling rate
AudioPlayer must read the sampling rate from offloaded audio sinks whenever a new time position is computed as the decoder can update the sampling rate on the fly. Change-Id: I997e5248cfd4017aeceb4e11689324ded2a5bc88
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.cpp')
-rw-r--r--media/libmediaplayerservice/MediaPlayerService.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index cd052e6..9ac9105 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -1813,6 +1813,12 @@ int MediaPlayerService::AudioOutput::getSessionId() const
return mSessionId;
}
+uint32_t MediaPlayerService::AudioOutput::getSampleRate() const
+{
+ if (mTrack == 0) return 0;
+ return mTrack->getSampleRate();
+}
+
#undef LOG_TAG
#define LOG_TAG "AudioCache"
MediaPlayerService::AudioCache::AudioCache(const sp<IMemoryHeap>& heap) :
@@ -2015,6 +2021,14 @@ int MediaPlayerService::AudioCache::getSessionId() const
return 0;
}
+uint32_t MediaPlayerService::AudioCache::getSampleRate() const
+{
+ if (mMsecsPerFrame == 0) {
+ return 0;
+ }
+ return (uint32_t)(1.e3 / mMsecsPerFrame);
+}
+
void MediaPlayerService::addBatteryData(uint32_t params)
{
Mutex::Autolock lock(mLock);