diff options
author | Glenn Kasten <gkasten@google.com> | 2014-03-07 00:54:14 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-07 00:54:14 +0000 |
commit | 1bdf803fde294017d8b504891618f688a21a2e75 (patch) | |
tree | f0f12e450aa1256985b7c6c15782032acaf514cc /include | |
parent | 570dd184541ad166ee97e7a849c27c4141ee2af7 (diff) | |
parent | c326e1c3d122917462f1cda4f03d9c639ad92902 (diff) | |
download | frameworks_av-1bdf803fde294017d8b504891618f688a21a2e75.zip frameworks_av-1bdf803fde294017d8b504891618f688a21a2e75.tar.gz frameworks_av-1bdf803fde294017d8b504891618f688a21a2e75.tar.bz2 |
Merge "Remove Format_frameBitShift()"
Diffstat (limited to 'include')
-rw-r--r-- | include/media/nbaio/NBAIO.h | 6 | ||||
-rw-r--r-- | include/media/nbaio/SourceAudioBufferProvider.h | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/include/media/nbaio/NBAIO.h b/include/media/nbaio/NBAIO.h index 2f63648..ab9a4a5 100644 --- a/include/media/nbaio/NBAIO.h +++ b/include/media/nbaio/NBAIO.h @@ -66,10 +66,6 @@ extern const NBAIO_Format Format_Invalid; // Return the frame size of an NBAIO_Format in bytes size_t Format_frameSize(const NBAIO_Format& format); -// Return the frame size of an NBAIO_Format as a bit shift -// or -1 if frame size is not a power of 2 -int Format_frameBitShift(const NBAIO_Format& format); - // Convert a sample rate in Hz and channel count to an NBAIO_Format // FIXME Remove the default value of AUDIO_FORMAT_PCM_16_BIT, and rename NBAIO_Format Format_from_SR_C(unsigned sampleRate, unsigned channelCount, @@ -131,7 +127,6 @@ public: protected: NBAIO_Port(const NBAIO_Format& format) : mNegotiated(false), mFormat(format), - mBitShift(Format_frameBitShift(format)), mFrameSize(Format_frameSize(format)) { } virtual ~NBAIO_Port() { } @@ -139,7 +134,6 @@ protected: bool mNegotiated; // mNegotiated implies (mFormat != Format_Invalid) NBAIO_Format mFormat; // (mFormat != Format_Invalid) does not imply mNegotiated - size_t mBitShift; // assign in parallel with any assignment to mFormat size_t mFrameSize; // assign in parallel with any assignment to mFormat }; diff --git a/include/media/nbaio/SourceAudioBufferProvider.h b/include/media/nbaio/SourceAudioBufferProvider.h index 7357aa5..daf6bc3 100644 --- a/include/media/nbaio/SourceAudioBufferProvider.h +++ b/include/media/nbaio/SourceAudioBufferProvider.h @@ -41,7 +41,6 @@ public: private: const sp<NBAIO_Source> mSource; // the wrapped source - /*const*/ size_t mFrameBitShift; // log2(frame size in bytes) /*const*/ size_t mFrameSize; // frame size in bytes void* mAllocated; // pointer to base of allocated memory size_t mSize; // size of mAllocated in frames |