summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/MediaPlayerService.cpp
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-03-03 15:28:00 -0800
committerWei Jia <wjia@google.com>2015-03-03 15:28:00 -0800
commit7d3f4df0a77e052a7d37de9268aff8c2ed0909cc (patch)
tree060550294c95fe8a35ba5c7c0c9d476d7c91d788 /media/libmediaplayerservice/MediaPlayerService.cpp
parent1ba399206f6a99fec17331186041b55c3733c8d8 (diff)
downloadframeworks_av-7d3f4df0a77e052a7d37de9268aff8c2ed0909cc.zip
frameworks_av-7d3f4df0a77e052a7d37de9268aff8c2ed0909cc.tar.gz
frameworks_av-7d3f4df0a77e052a7d37de9268aff8c2ed0909cc.tar.bz2
mediaplayer: use non-blocking mode for AudioSink::write().
This cherry picks https://googleplex-android-review.git.corp.google.com/#/c/643541/ to master. Bug: 19448263 Change-Id: I43dea830212de79c2b080185b6c6b36078f517d2
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.cpp')
-rw-r--r--media/libmediaplayerservice/MediaPlayerService.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 0b18ae0..5e5d099 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -1672,13 +1672,13 @@ void MediaPlayerService::AudioOutput::switchToNextOutput() {
}
}
-ssize_t MediaPlayerService::AudioOutput::write(const void* buffer, size_t size)
+ssize_t MediaPlayerService::AudioOutput::write(const void* buffer, size_t size, bool blocking)
{
LOG_ALWAYS_FATAL_IF(mCallback != NULL, "Don't call write if supplying a callback.");
//ALOGV("write(%p, %u)", buffer, size);
if (mTrack != 0) {
- ssize_t ret = mTrack->write(buffer, size);
+ ssize_t ret = mTrack->write(buffer, size, blocking);
if (ret >= 0) {
mBytesWritten += ret;
}