diff options
| author | Glenn Kasten <gkasten@google.com> | 2015-03-09 21:33:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-09 21:33:11 +0000 |
| commit | 172e2c5a41275efbd5a9c343fa8b8c4c653061b4 (patch) | |
| tree | ffb176c2537f9ca489e2166f2cb17ac165ce5d82 /media | |
| parent | 50b22c7717a1af8a1f2f90858b69431a3de468b5 (diff) | |
| parent | b46f394a85d704dd05287cf9bb77cf86e3c02a38 (diff) | |
| download | frameworks_av-172e2c5a41275efbd5a9c343fa8b8c4c653061b4.zip frameworks_av-172e2c5a41275efbd5a9c343fa8b8c4c653061b4.tar.gz frameworks_av-172e2c5a41275efbd5a9c343fa8b8c4c653061b4.tar.bz2 | |
Merge "AudioTrack::obtainBuffer() now returns number of non-contiguous frames"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 0713c66..720db17 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -1236,7 +1236,7 @@ release: return status; } -status_t AudioTrack::obtainBuffer(Buffer* audioBuffer, int32_t waitCount) +status_t AudioTrack::obtainBuffer(Buffer* audioBuffer, int32_t waitCount, size_t *nonContig) { if (audioBuffer == NULL) { return BAD_VALUE; @@ -1263,7 +1263,7 @@ status_t AudioTrack::obtainBuffer(Buffer* audioBuffer, int32_t waitCount) ALOGE("%s invalid waitCount %d", __func__, waitCount); requested = NULL; } - return obtainBuffer(audioBuffer, requested); + return obtainBuffer(audioBuffer, requested, NULL /*elapsed*/, nonContig); } status_t AudioTrack::obtainBuffer(Buffer* audioBuffer, const struct timespec *requested, |