diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-02-07 21:49:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-07 21:49:24 +0000 |
| commit | c99144dd2766c499701a7bd7db2d9d8697127186 (patch) | |
| tree | 8b8e96c191387c4e1454945c2a5a31b2b4164c71 /media/libnbaio | |
| parent | ddc0630dd80847dad5253bb285a16e3ed9cc0320 (diff) | |
| parent | 4d7b3f876b21997680ae32a340d746ed1cae6ab1 (diff) | |
| download | frameworks_av-c99144dd2766c499701a7bd7db2d9d8697127186.zip frameworks_av-c99144dd2766c499701a7bd7db2d9d8697127186.tar.gz frameworks_av-c99144dd2766c499701a7bd7db2d9d8697127186.tar.bz2 | |
Merge "Change Format_frameBitShift() API for non-power-of-2 sizes"
Diffstat (limited to 'media/libnbaio')
| -rw-r--r-- | media/libnbaio/NBAIO.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libnbaio/NBAIO.cpp b/media/libnbaio/NBAIO.cpp index 26ef8c4..51514de 100644 --- a/media/libnbaio/NBAIO.cpp +++ b/media/libnbaio/NBAIO.cpp @@ -28,11 +28,12 @@ size_t Format_frameSize(const NBAIO_Format& format) return Format_channelCount(format) * sizeof(short); } -size_t Format_frameBitShift(const NBAIO_Format& format) +int Format_frameBitShift(const NBAIO_Format& format) { // FIXME The sample format is hard-coded to AUDIO_FORMAT_PCM_16_BIT // sizeof(short) == 2, so frame size == 1 << channels return Format_channelCount(format); + // FIXME must return -1 for non-power of 2 } const NBAIO_Format Format_Invalid = { 0 }; |