summaryrefslogtreecommitdiffstats
path: root/media/libnbaio/MonoPipeReader.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/MonoPipeReader.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/MonoPipeReader.cpp')
-rw-r--r--media/libnbaio/MonoPipeReader.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libnbaio/MonoPipeReader.cpp b/media/libnbaio/MonoPipeReader.cpp
index 851341a..de82229 100644
--- a/media/libnbaio/MonoPipeReader.cpp
+++ b/media/libnbaio/MonoPipeReader.cpp
@@ -73,11 +73,11 @@ ssize_t MonoPipeReader::read(void *buffer, size_t count, int64_t readPTS)
part1 = red;
}
if (CC_LIKELY(part1 > 0)) {
- memcpy(buffer, (char *) mPipe->mBuffer + (front << mBitShift), part1 << mBitShift);
+ memcpy(buffer, (char *) mPipe->mBuffer + (front * mFrameSize), part1 * mFrameSize);
if (CC_UNLIKELY(front + part1 == mPipe->mMaxFrames)) {
size_t part2 = red - part1;
if (CC_LIKELY(part2 > 0)) {
- memcpy((char *) buffer + (part1 << mBitShift), mPipe->mBuffer, part2 << mBitShift);
+ memcpy((char *) buffer + (part1 * mFrameSize), mPipe->mBuffer, part2 * mFrameSize);
}
}
mPipe->updateFrontAndNRPTS(red + mPipe->mFront, nextReadPTS);