commit ac3e9db88ddb1f24bc6c8fb744a37dfdeec332bb
author Glenn Kasten <gkasten@google.com> Thu Mar 06 08:00:31 2014 -0800
committer Glenn Kasten <gkasten@google.com> Thu Mar 06 08:40:37 2014 -0800
tree 7e569cdaab0966b7e3c1c02118361f223fdaaf98
parent 7a0662afeba50b78f43ce24539230cace30c3cfd

Add mFrameSize but do not remove mFrameBitShift yet

Change-Id: Icb1edefeb6a0e659503f6b7a92c9d15784df9865

media/libnbaio/AudioStreamInSource.cpp

diff --git a/media/libnbaio/AudioStreamInSource.cpp b/media/libnbaio/AudioStreamInSource.cpp
index ae8fac8..ca7b8e0 100644
--- a/media/libnbaio/AudioStreamInSource.cpp
+++ b/media/libnbaio/AudioStreamInSource.cpp
@@ -49,6 +49,7 @@
                     (audio_channel_mask_t) mStream->common.get_channels(&mStream->common);
             mFormat = Format_from_SR_C(sampleRate, popcount(channelMask));
             mBitShift = Format_frameBitShift(mFormat);
+            mFrameSize = Format_frameSize(mFormat);
         }
     }
     return NBAIO_Source::negotiate(offers, numOffers, counterOffers, numCounterOffers);

media/libnbaio/AudioStreamOutSink.cpp

diff --git a/media/libnbaio/AudioStreamOutSink.cpp b/media/libnbaio/AudioStreamOutSink.cpp
index aa9810e..5158f01 100644
--- a/media/libnbaio/AudioStreamOutSink.cpp
+++ b/media/libnbaio/AudioStreamOutSink.cpp
@@ -46,6 +46,7 @@
                     (audio_channel_mask_t) mStream->common.get_channels(&mStream->common);
             mFormat = Format_from_SR_C(sampleRate, popcount(channelMask));
             mBitShift = Format_frameBitShift(mFormat);
+            mFrameSize = Format_frameSize(mFormat);
         }
     }
     return NBAIO_Sink::negotiate(offers, numOffers, counterOffers, numCounterOffers);

media/libnbaio/SourceAudioBufferProvider.cpp

diff --git a/media/libnbaio/SourceAudioBufferProvider.cpp b/media/libnbaio/SourceAudioBufferProvider.cpp
index 062fa0f..0e77795 100644
--- a/media/libnbaio/SourceAudioBufferProvider.cpp
+++ b/media/libnbaio/SourceAudioBufferProvider.cpp
@@ -24,7 +24,7 @@
 
 SourceAudioBufferProvider::SourceAudioBufferProvider(const sp<NBAIO_Source>& source) :
     mSource(source),
-    // mFrameBitShiftFormat below
+    // mFrameSize below
     mAllocated(NULL), mSize(0), mOffset(0), mRemaining(0), mGetCount(0), mFramesReleased(0)
 {
     ALOG_ASSERT(source != 0);
@@ -38,6 +38,7 @@
     index = source->negotiate(counterOffers, 1, NULL, numCounterOffers);
     ALOG_ASSERT(index == 0);
     mFrameBitShift = Format_frameBitShift(source->format());
+    mFrameSize = Format_frameSize(source->format());
 }
 
 SourceAudioBufferProvider::~SourceAudioBufferProvider()