summaryrefslogtreecommitdiffstats
path: root/media/libnbaio/Pipe.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-03-06 07:53:11 -0800
committerGlenn Kasten <gkasten@google.com>2014-03-06 08:40:43 -0800
commit4d693d6b8cc1283f92f5301daf19a07abc772a2b (patch)
treed377025ddacd76f5e923390236a70424897fdf6e /media/libnbaio/Pipe.cpp
parentac3e9db88ddb1f24bc6c8fb744a37dfdeec332bb (diff)
downloadframeworks_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/Pipe.cpp')
-rw-r--r--media/libnbaio/Pipe.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libnbaio/Pipe.cpp b/media/libnbaio/Pipe.cpp
index 115f311..28a034c 100644
--- a/media/libnbaio/Pipe.cpp
+++ b/media/libnbaio/Pipe.cpp
@@ -52,13 +52,13 @@ ssize_t Pipe::write(const void *buffer, size_t count)
if (CC_LIKELY(written > count)) {
written = count;
}
- memcpy((char *) mBuffer + (rear << mBitShift), buffer, written << mBitShift);
+ memcpy((char *) mBuffer + (rear * mFrameSize), buffer, written * mFrameSize);
if (CC_UNLIKELY(rear + written == mMaxFrames)) {
if (CC_UNLIKELY((count -= written) > rear)) {
count = rear;
}
if (CC_LIKELY(count > 0)) {
- memcpy(mBuffer, (char *) buffer + (written << mBitShift), count << mBitShift);
+ memcpy(mBuffer, (char *) buffer + (written * mFrameSize), count * mFrameSize);
written += count;
}
}