commit 4d693d6b8cc1283f92f5301daf19a07abc772a2b
author Glenn Kasten <gkasten@google.com> Thu Mar 06 07:53:11 2014 -0800
committer Glenn Kasten <gkasten@google.com> Thu Mar 06 08:40:43 2014 -0800
tree d377025ddacd76f5e923390236a70424897fdf6e
parent ac3e9db88ddb1f24bc6c8fb744a37dfdeec332bb

Use mFrameSize instead of mBitShift

Change-Id: Idac335ae70cc9300bb3325839fe8ef1e9e097245

media/libnbaio/SourceAudioBufferProvider.cpp

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 @@
         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 @@
 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));