Add format parameter to Format_from_SR_C

Change-Id: I891138b7754342fe2a4f02de30ee616dbd078474

diff --git a/include/media/nbaio/NBAIO.h b/include/media/nbaio/NBAIO.h
index be91c3a..8afacec 100644 (file)
--- 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 (file)
--- 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) {