diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-02-07 21:30:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-07 21:30:56 +0000 |
| commit | ddc0630dd80847dad5253bb285a16e3ed9cc0320 (patch) | |
| tree | aad7fff243b29ad9d73c0bb43e1779065606d31e | |
| parent | c7a38829841b764f509e6a688a507b8c0da82c2e (diff) | |
| parent | 1ec712f180072a7eb2131be09862921ae62dc2b4 (diff) | |
| download | frameworks_av-ddc0630dd80847dad5253bb285a16e3ed9cc0320.zip frameworks_av-ddc0630dd80847dad5253bb285a16e3ed9cc0320.tar.gz frameworks_av-ddc0630dd80847dad5253bb285a16e3ed9cc0320.tar.bz2 | |
Merge "Add FIXMEs about audio_format_t assumption"
| -rw-r--r-- | include/media/nbaio/NBAIO.h | 1 | ||||
| -rw-r--r-- | media/libnbaio/NBAIO.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/media/nbaio/NBAIO.h b/include/media/nbaio/NBAIO.h index 4150a09..cdeb4ca 100644 --- a/include/media/nbaio/NBAIO.h +++ b/include/media/nbaio/NBAIO.h @@ -66,6 +66,7 @@ size_t Format_frameSize(const NBAIO_Format& format); size_t Format_frameBitShift(const NBAIO_Format& format); // Convert a sample rate in Hz and channel count to an NBAIO_Format +// FIXME The sample format is hard-coded to AUDIO_FORMAT_PCM_16_BIT NBAIO_Format Format_from_SR_C(unsigned sampleRate, unsigned channelCount); // Return the sample rate in Hz of an NBAIO_Format diff --git a/media/libnbaio/NBAIO.cpp b/media/libnbaio/NBAIO.cpp index f630236..26ef8c4 100644 --- a/media/libnbaio/NBAIO.cpp +++ b/media/libnbaio/NBAIO.cpp @@ -24,11 +24,13 @@ 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); } size_t 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); } |