diff options
author | Glenn Kasten <gkasten@google.com> | 2012-07-10 08:23:55 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-07-10 08:23:55 -0700 |
commit | a51b4acf038ecd7728a98b85749eefc165aa358a (patch) | |
tree | b4e60ffb250f412f26e4d6e5e65f9439cf2009a5 | |
parent | f89a0deef1ecafcba164045b76d4d6c7bf8eb24d (diff) | |
parent | 6648821933dc06c0b09ab2c8b32135edddcd4291 (diff) | |
download | frameworks_av-a51b4acf038ecd7728a98b85749eefc165aa358a.zip frameworks_av-a51b4acf038ecd7728a98b85749eefc165aa358a.tar.gz frameworks_av-a51b4acf038ecd7728a98b85749eefc165aa358a.tar.bz2 |
Merge "AudioFlinger::getBuffer() always returns non-NULL"
-rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 4 | ||||
-rw-r--r-- | services/audioflinger/AudioFlinger.h | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index ceaf27d..59c7f84 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -4462,8 +4462,6 @@ status_t AudioFlinger::PlaybackThread::Track::getNextBuffer( } buffer->raw = getBuffer(s, framesReq); - if (buffer->raw == NULL) goto getNextBuffer_exit; - buffer->frameCount = framesReq; return NO_ERROR; } @@ -5355,8 +5353,6 @@ status_t AudioFlinger::RecordThread::RecordTrack::getNextBuffer(AudioBufferProvi } buffer->raw = getBuffer(s, framesReq); - if (buffer->raw == NULL) goto getNextBuffer_exit; - buffer->frameCount = framesReq; return NO_ERROR; } diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index b8bb69e..56d5a15 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -417,6 +417,13 @@ private: int sampleRate() const; // FIXME inline after cblk sr moved + // Return a pointer to the start of a contiguous slice of the track buffer. + // Parameter 'offset' is the requested start position, expressed in + // monotonically increasing frame units relative to the track epoch. + // Parameter 'frames' is the requested length, also in frame units. + // Always returns non-NULL. It is the caller's responsibility to + // verify that this will be successful; the result of calling this + // function with invalid 'offset' or 'frames' is undefined. void* getBuffer(uint32_t offset, uint32_t frames) const; bool isStopped() const { |