diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-03-06 22:18:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-06 22:18:27 +0000 |
| commit | 810219ba83571d66149068bb8d35651988ba9b2f (patch) | |
| tree | 521e540d4b55297e55f52b4c4254b6783d3f8e97 | |
| parent | e53c9b8d8130518f37a47635c4cd0ae529ecd7e1 (diff) | |
| parent | f95a3c4122d67273d930c7d83c3df99f136603ed (diff) | |
| download | frameworks_av-810219ba83571d66149068bb8d35651988ba9b2f.zip frameworks_av-810219ba83571d66149068bb8d35651988ba9b2f.tar.gz frameworks_av-810219ba83571d66149068bb8d35651988ba9b2f.tar.bz2 | |
Merge "Add format parameter to Format_from_SR_C"
| -rw-r--r-- | include/media/nbaio/NBAIO.h | 6 | ||||
| -rw-r--r-- | media/libnbaio/NBAIO.cpp | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/media/nbaio/NBAIO.h b/include/media/nbaio/NBAIO.h index be91c3a..8afacec 100644 --- a/include/media/nbaio/NBAIO.h +++ b/include/media/nbaio/NBAIO.h @@ -29,6 +29,7 @@ #include <utils/Errors.h> #include <utils/RefBase.h> #include <media/AudioTimestamp.h> +#include <system/audio.h> namespace android { @@ -67,8 +68,9 @@ size_t Format_frameSize(const NBAIO_Format& format); int 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); +// FIXME Remove the default value of AUDIO_FORMAT_PCM_16_BIT, and rename +NBAIO_Format Format_from_SR_C(unsigned sampleRate, unsigned channelCount, + audio_format_t format = AUDIO_FORMAT_PCM_16_BIT); // Return the sample rate in Hz of an NBAIO_Format unsigned Format_sampleRate(const NBAIO_Format& format); diff --git a/media/libnbaio/NBAIO.cpp b/media/libnbaio/NBAIO.cpp index 51514de..a15d41c 100644 --- a/media/libnbaio/NBAIO.cpp +++ b/media/libnbaio/NBAIO.cpp @@ -98,7 +98,8 @@ unsigned Format_channelCount(const NBAIO_Format& format) } } -NBAIO_Format Format_from_SR_C(unsigned sampleRate, unsigned channelCount) +NBAIO_Format Format_from_SR_C(unsigned sampleRate, unsigned channelCount, + audio_format_t format_ __unused) { unsigned format; switch (sampleRate) { |