diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-03-06 07:53:11 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2014-03-06 08:40:43 -0800 |
| commit | 4d693d6b8cc1283f92f5301daf19a07abc772a2b (patch) | |
| tree | d377025ddacd76f5e923390236a70424897fdf6e /media/libnbaio/AudioBufferProviderSource.cpp | |
| parent | ac3e9db88ddb1f24bc6c8fb744a37dfdeec332bb (diff) | |
| download | frameworks_av-4d693d6b8cc1283f92f5301daf19a07abc772a2b.zip frameworks_av-4d693d6b8cc1283f92f5301daf19a07abc772a2b.tar.gz frameworks_av-4d693d6b8cc1283f92f5301daf19a07abc772a2b.tar.bz2 | |
Use mFrameSize instead of mBitShift
Change-Id: Idac335ae70cc9300bb3325839fe8ef1e9e097245
Diffstat (limited to 'media/libnbaio/AudioBufferProviderSource.cpp')
| -rw-r--r-- | media/libnbaio/AudioBufferProviderSource.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libnbaio/AudioBufferProviderSource.cpp b/media/libnbaio/AudioBufferProviderSource.cpp index 4a69104..551f516 100644 --- a/media/libnbaio/AudioBufferProviderSource.cpp +++ b/media/libnbaio/AudioBufferProviderSource.cpp @@ -68,7 +68,7 @@ ssize_t AudioBufferProviderSource::read(void *buffer, } // count could be zero, either because count was zero on entry or // available is zero, but both are unlikely so don't check for that - memcpy(buffer, (char *) mBuffer.raw + (mConsumed << mBitShift), count << mBitShift); + memcpy(buffer, (char *) mBuffer.raw + (mConsumed * mFrameSize), count * mFrameSize); if (CC_UNLIKELY((mConsumed += count) >= mBuffer.frameCount)) { mProvider->releaseBuffer(&mBuffer); mBuffer.raw = NULL; @@ -120,7 +120,7 @@ ssize_t AudioBufferProviderSource::readVia(readVia_t via, size_t total, void *us count = available; } if (CC_LIKELY(count > 0)) { - char* readTgt = (char *) mBuffer.raw + (mConsumed << mBitShift); + char* readTgt = (char *) mBuffer.raw + (mConsumed * mFrameSize); ssize_t ret = via(user, readTgt, count, readPTS); if (CC_UNLIKELY(ret <= 0)) { if (CC_LIKELY(accumulator > 0)) { |