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/MonoPipe.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/MonoPipe.cpp')
-rw-r--r-- | media/libnbaio/MonoPipe.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libnbaio/MonoPipe.cpp b/media/libnbaio/MonoPipe.cpp index b23967b..9c8461c 100644 --- a/media/libnbaio/MonoPipe.cpp +++ b/media/libnbaio/MonoPipe.cpp @@ -115,11 +115,11 @@ ssize_t MonoPipe::write(const void *buffer, size_t count) part1 = written; } if (CC_LIKELY(part1 > 0)) { - memcpy((char *) mBuffer + (rear << mBitShift), buffer, part1 << mBitShift); + memcpy((char *) mBuffer + (rear * mFrameSize), buffer, part1 * mFrameSize); if (CC_UNLIKELY(rear + part1 == mMaxFrames)) { size_t part2 = written - part1; if (CC_LIKELY(part2 > 0)) { - memcpy(mBuffer, (char *) buffer + (part1 << mBitShift), part2 << mBitShift); + memcpy(mBuffer, (char *) buffer + (part1 * mFrameSize), part2 * mFrameSize); } } android_atomic_release_store(written + mRear, &mRear); @@ -129,7 +129,7 @@ ssize_t MonoPipe::write(const void *buffer, size_t count) break; } count -= written; - buffer = (char *) buffer + (written << mBitShift); + buffer = (char *) buffer + (written * mFrameSize); // Simulate blocking I/O by sleeping at different rates, depending on a throttle. // The throttle tries to keep the mean pipe depth near the setpoint, with a slight jitter. uint32_t ns; |