summaryrefslogtreecommitdiffstats
path: root/media/libnbaio/SourceAudioBufferProvider.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/SourceAudioBufferProvider.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/SourceAudioBufferProvider.cpp')
-rw-r--r--media/libnbaio/SourceAudioBufferProvider.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libnbaio/SourceAudioBufferProvider.cpp b/media/libnbaio/SourceAudioBufferProvider.cpp
index 0e77795..791fe7c 100644
--- a/media/libnbaio/SourceAudioBufferProvider.cpp
+++ b/media/libnbaio/SourceAudioBufferProvider.cpp
@@ -55,14 +55,14 @@ status_t SourceAudioBufferProvider::getNextBuffer(Buffer *buffer, int64_t pts)
if (mRemaining < buffer->frameCount) {
buffer->frameCount = mRemaining;
}
- buffer->raw = (char *) mAllocated + (mOffset << mFrameBitShift);
+ buffer->raw = (char *) mAllocated + (mOffset * mFrameSize);
mGetCount = buffer->frameCount;
return OK;
}
// do we need to reallocate?
if (buffer->frameCount > mSize) {
free(mAllocated);
- mAllocated = malloc(buffer->frameCount << mFrameBitShift);
+ mAllocated = malloc(buffer->frameCount * mFrameSize);
mSize = buffer->frameCount;
}
// read from source
@@ -85,7 +85,7 @@ status_t SourceAudioBufferProvider::getNextBuffer(Buffer *buffer, int64_t pts)
void SourceAudioBufferProvider::releaseBuffer(Buffer *buffer)
{
ALOG_ASSERT((buffer != NULL) &&
- (buffer->raw == (char *) mAllocated + (mOffset << mFrameBitShift)) &&
+ (buffer->raw == (char *) mAllocated + (mOffset * mFrameSize)) &&
(buffer->frameCount <= mGetCount) &&
(mGetCount <= mRemaining) &&
(mOffset + mRemaining <= mSize));