summaryrefslogtreecommitdiffstats
path: root/media/libnbaio
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-03-06 08:23:11 -0800
committerGlenn Kasten <gkasten@google.com>2014-03-06 08:52:32 -0800
commit983f0578ccd2928af40c9689f6fe90110d02b92e (patch)
tree6db4203ee5171fe4f9a9ca2e8e5877a5c299bd95 /media/libnbaio
parent2b7b910f4b417ab3930379298f538d0dfc857e88 (diff)
downloadframeworks_av-983f0578ccd2928af40c9689f6fe90110d02b92e.zip
frameworks_av-983f0578ccd2928af40c9689f6fe90110d02b92e.tar.gz
frameworks_av-983f0578ccd2928af40c9689f6fe90110d02b92e.tar.bz2
Re-implement Format_frameSize(), to support non-power-of-2
Change-Id: I671bd4f03ce70de685770fd7992e2e023133c9b4
Diffstat (limited to 'media/libnbaio')
-rw-r--r--media/libnbaio/NBAIO.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/media/libnbaio/NBAIO.cpp b/media/libnbaio/NBAIO.cpp
index cfcd8b4..16e7df5 100644
--- a/media/libnbaio/NBAIO.cpp
+++ b/media/libnbaio/NBAIO.cpp
@@ -24,8 +24,7 @@ namespace android {
size_t Format_frameSize(const NBAIO_Format& format)
{
- // FIXME The sample format is hard-coded to AUDIO_FORMAT_PCM_16_BIT
- return Format_channelCount(format) * sizeof(short);
+ return format.mFrameSize;
}
int Format_frameBitShift(const NBAIO_Format& format)