Merge "Use audio_format_t consistently"

4 files changed, 22 insertions, 20 deletions

diff --git a/audio/AudioPolicyCompatClient.cpp b/audio/AudioPolicyCompatClient.cpp
index 08c31c5..45b6b19 100644
--- a/audio/AudioPolicyCompatClient.cpp
+++ b/audio/AudioPolicyCompatClient.cpp
@@ -37,7 +37,7 @@ audio_io_handle_t AudioPolicyCompatClient::openOutput(uint32_t *pDevices,
                                 uint32_t *pLatencyMs,
                                 AudioSystem::output_flags flags)
 {
-    return mServiceOps->open_output(mService, pDevices, pSamplingRate, pFormat,
+    return mServiceOps->open_output(mService, pDevices, pSamplingRate, (audio_format_t *) pFormat,
                                     pChannels, pLatencyMs,
                                     (audio_policy_output_flags_t)flags);
 }
@@ -69,7 +69,7 @@ audio_io_handle_t AudioPolicyCompatClient::openInput(uint32_t *pDevices,
                                 uint32_t *pChannels,
                                 uint32_t acoustics)
 {
-    return mServiceOps->open_input(mService, pDevices, pSamplingRate, pFormat,
+    return mServiceOps->open_input(mService, pDevices, pSamplingRate, (audio_format_t *) pFormat,
                                    pChannels, acoustics);
 }
 
diff --git a/audio/audio_hw_hal.cpp b/audio/audio_hw_hal.cpp
index 5fdfdb8..a87db2f 100644
--- a/audio/audio_hw_hal.cpp
+++ b/audio/audio_hw_hal.cpp
@@ -84,14 +84,15 @@ static uint32_t out_get_channels(const struct audio_stream *stream)
     return out->legacy_out->channels();
 }
 
-static int out_get_format(const struct audio_stream *stream)
+static audio_format_t out_get_format(const struct audio_stream *stream)
 {
     const struct legacy_stream_out *out =
         reinterpret_cast<const struct legacy_stream_out *>(stream);
-    return out->legacy_out->format();
+    // legacy API, don't change return type
+    return (audio_format_t) out->legacy_out->format();
 }
 
-static int out_set_format(struct audio_stream *stream, int format)
+static int out_set_format(struct audio_stream *stream, audio_format_t format)
 {
     struct legacy_stream_out *out =
         reinterpret_cast<struct legacy_stream_out *>(stream);
@@ -204,14 +205,15 @@ static uint32_t in_get_channels(const struct audio_stream *stream)
     return in->legacy_in->channels();
 }
 
-static int in_get_format(const struct audio_stream *stream)
+static audio_format_t in_get_format(const struct audio_stream *stream)
 {
     const struct legacy_stream_in *in =
         reinterpret_cast<const struct legacy_stream_in *>(stream);
-    return in->legacy_in->format();
+    // legacy API, don't change return type
+    return (audio_format_t) in->legacy_in->format();
 }
 
-static int in_set_format(struct audio_stream *stream, int format)
+static int in_set_format(struct audio_stream *stream, audio_format_t format)
 {
     struct legacy_stream_in *in =
         reinterpret_cast<struct legacy_stream_in *>(stream);
@@ -382,16 +384,16 @@ static char * adev_get_parameters(const struct audio_hw_device *dev,
 }
 
 static size_t adev_get_input_buffer_size(const struct audio_hw_device *dev,
-                                         uint32_t sample_rate, int format,
+                                         uint32_t sample_rate, audio_format_t format,
                                          int channel_count)
 {
     const struct legacy_audio_device *ladev = to_cladev(dev);
-    return ladev->hwif->getInputBufferSize(sample_rate, format, channel_count);
+    return ladev->hwif->getInputBufferSize(sample_rate, (int) format, channel_count);
 }
 
 static int adev_open_output_stream(struct audio_hw_device *dev,
                                    uint32_t devices,
-                                   int *format,
+                                   audio_format_t *format,
                                    uint32_t *channels,
                                    uint32_t *sample_rate,
                                    struct audio_stream_out **stream_out)
@@ -405,7 +407,7 @@ static int adev_open_output_stream(struct audio_hw_device *dev,
     if (!out)
         return -ENOMEM;
 
-    out->legacy_out = ladev->hwif->openOutputStream(devices, format, channels,
+    out->legacy_out = ladev->hwif->openOutputStream(devices, (int *) format, channels,
                                                     sample_rate, &status);
     if (!out->legacy_out) {
         ret = status;
@@ -450,7 +452,7 @@ static void adev_close_output_stream(struct audio_hw_device *dev,
 
 /** This method creates and opens the audio hardware input stream */
 static int adev_open_input_stream(struct audio_hw_device *dev,
-                                  uint32_t devices, int *format,
+                                  uint32_t devices, audio_format_t *format,
                                   uint32_t *channels, uint32_t *sample_rate,
                                   audio_in_acoustics_t acoustics,
                                   struct audio_stream_in **stream_in)
@@ -464,7 +466,7 @@ static int adev_open_input_stream(struct audio_hw_device *dev,
     if (!in)
         return -ENOMEM;
 
-    in->legacy_in = ladev->hwif->openInputStream(devices, format, channels,
+    in->legacy_in = ladev->hwif->openInputStream(devices, (int *) format, channels,
                                     sample_rate, &status,
                                     (AudioSystem::audio_in_acoustics)acoustics);
     if (!in->legacy_in) {
diff --git a/audio/audio_policy_hal.cpp b/audio/audio_policy_hal.cpp
index e997a81..ae631f5 100644
--- a/audio/audio_policy_hal.cpp
+++ b/audio/audio_policy_hal.cpp
@@ -136,7 +136,7 @@ static int ap_init_check(const struct audio_policy *pol)
 static audio_io_handle_t ap_get_output(struct audio_policy *pol,
                                        audio_stream_type_t stream,
                                        uint32_t sampling_rate,
-                                       uint32_t format,
+                                       audio_format_t format,
                                        uint32_t channels,
                                        audio_policy_output_flags_t flags)
 {
@@ -144,7 +144,7 @@ static audio_io_handle_t ap_get_output(struct audio_policy *pol,
 
     ALOGV("%s: tid %d", __func__, gettid());
     return lap->apm->getOutput((AudioSystem::stream_type)stream,
-                               sampling_rate, format, channels,
+                               sampling_rate, (int) format, channels,
                                (AudioSystem::output_flags)flags);
 }
 
@@ -173,12 +173,12 @@ static void ap_release_output(struct audio_policy *pol,
 
 static audio_io_handle_t ap_get_input(struct audio_policy *pol, int inputSource,
                                       uint32_t sampling_rate,
-                                      uint32_t format,
+                                      audio_format_t format,
                                       uint32_t channels,
                                       audio_in_acoustics_t acoustics)
 {
     struct legacy_audio_policy *lap = to_lap(pol);
-    return lap->apm->getInput(inputSource, sampling_rate, format, channels,
+    return lap->apm->getInput(inputSource, sampling_rate, (int) format, channels,
                               (AudioSystem::audio_in_acoustics)acoustics);
 }
 
diff --git a/include/hardware_legacy/AudioSystemLegacy.h b/include/hardware_legacy/AudioSystemLegacy.h
index 4b78f58..6d90896 100644
--- a/include/hardware_legacy/AudioSystemLegacy.h
+++ b/include/hardware_legacy/AudioSystemLegacy.h
@@ -332,10 +332,10 @@ public:
         return audio_is_low_visibility((audio_stream_type_t)stream);
     }
     static bool isValidFormat(uint32_t format) {
-        return audio_is_valid_format(format);
+        return audio_is_valid_format((audio_format_t) format);
     }
     static bool isLinearPCM(uint32_t format) {
-        return audio_is_linear_pcm(format);
+        return audio_is_linear_pcm((audio_format_t) format);
     }
     static bool isOutputChannel(uint32_t channel) {
         return audio_is_output_channel(channel);