diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-03-06 20:28:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-06 20:28:04 +0000 |
| commit | e53c9b8d8130518f37a47635c4cd0ae529ecd7e1 (patch) | |
| tree | 857d81b5ac9991c63705cff41d71a77eb1cdab6f /include | |
| parent | c514c9cba45ea5ed0a45900ea6a17389901e5181 (diff) | |
| parent | 4d693d6b8cc1283f92f5301daf19a07abc772a2b (diff) | |
| download | frameworks_av-e53c9b8d8130518f37a47635c4cd0ae529ecd7e1.zip frameworks_av-e53c9b8d8130518f37a47635c4cd0ae529ecd7e1.tar.gz frameworks_av-e53c9b8d8130518f37a47635c4cd0ae529ecd7e1.tar.bz2 | |
Merge "Use mFrameSize instead of mBitShift"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/nbaio/AudioStreamInSource.h | 2 | ||||
| -rw-r--r-- | include/media/nbaio/AudioStreamOutSink.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/media/nbaio/AudioStreamInSource.h b/include/media/nbaio/AudioStreamInSource.h index 07d8c89..eaea63c 100644 --- a/include/media/nbaio/AudioStreamInSource.h +++ b/include/media/nbaio/AudioStreamInSource.h @@ -43,7 +43,7 @@ public: // This is an over-estimate, and could dupe the caller into making a blocking read() // FIXME Use an audio HAL API to query the buffer filling status when it's available. - virtual ssize_t availableToRead() { return mStreamBufferSizeBytes >> mBitShift; } + virtual ssize_t availableToRead() { return mStreamBufferSizeBytes / mFrameSize; } virtual ssize_t read(void *buffer, size_t count); diff --git a/include/media/nbaio/AudioStreamOutSink.h b/include/media/nbaio/AudioStreamOutSink.h index 7948d40..9949b88 100644 --- a/include/media/nbaio/AudioStreamOutSink.h +++ b/include/media/nbaio/AudioStreamOutSink.h @@ -43,7 +43,7 @@ public: // This is an over-estimate, and could dupe the caller into making a blocking write() // FIXME Use an audio HAL API to query the buffer emptying status when it's available. - virtual ssize_t availableToWrite() const { return mStreamBufferSizeBytes >> mBitShift; } + virtual ssize_t availableToWrite() const { return mStreamBufferSizeBytes / mFrameSize; } virtual ssize_t write(const void *buffer, size_t count); |