commit 65780b5fc282d12d9e9d612347b9b476a9733e58
author Aalique Grahame <agrahame@codeaurora.org> Wed Sep 27 14:59:56 2017 -0700
committer Aalique Grahame <agrahame@codeaurora.org> Wed Sep 27 14:59:56 2017 -0700
tree d271d4998980889390048aacf7e820ac9cf73342
parent ea9a7c5248e6e2164c7c7e4aa5968f7ef046456b

hal: use hal_op_format when querying app_type

Use out->hal_op_format when querying app_type. This ensures that
we are always using the same format used to configure the driver.
This prevents any app_type mismatches.

CRs-Fixed: 2110259
Change-Id: I3f59be08255ed48adffde20e861b5ceecd908a3b

hal/audio_extn/utils.c

diff --git a/hal/audio_extn/utils.c b/hal/audio_extn/utils.c
index a236ccd..522143d 100644
--- a/hal/audio_extn/utils.c
+++ b/hal/audio_extn/utils.c
@@ -822,7 +822,7 @@
                                                 &adev->streams_output_cfg_list,
                                                 usecase->stream.out->devices,
                                                 usecase->stream.out->flags,
-                                                usecase->stream.out->format,
+                                                usecase->stream.out->hal_op_format,
                                                 usecase->stream.out->sample_rate,
                                                 usecase->stream.out->bit_width,
                                                 usecase->stream.out->channel_mask,

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 6653f6a..4b698b8 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -3383,7 +3383,7 @@
         lock_output_stream(out);
         audio_extn_utils_update_stream_output_app_type_cfg(adev->platform,
                                                           &adev->streams_output_cfg_list,
-                                                          out->devices, out->flags, out->format,
+                                                          out->devices, out->flags, out->hal_op_format,
                                                           out->sample_rate, out->bit_width,
                                                           out->channel_mask, out->profile,
                                                           &out->app_type_cfg);
@@ -5040,7 +5040,7 @@
     out->flags = flags;
     out->devices = devices;
     out->dev = adev;
-    format = out->format = config->format;
+    out->hal_op_format = out->hal_ip_format = format = out->format = config->format;
     out->sample_rate = config->sample_rate;
     out->channel_mask = config->channel_mask;
     if (out->channel_mask == AUDIO_CHANNEL_NONE)
@@ -5469,7 +5469,7 @@
         out->bit_width = 16;
     audio_extn_utils_update_stream_output_app_type_cfg(adev->platform,
                                                 &adev->streams_output_cfg_list,
-                                                devices, out->flags, format, out->sample_rate,
+                                                devices, out->flags, out->hal_op_format, out->sample_rate,
                                                 out->bit_width, out->channel_mask, out->profile,
                                                 &out->app_type_cfg);
     if ((out->usecase == USECASE_AUDIO_PLAYBACK_PRIMARY) ||