commit b8c55cefb115cb37e997355ad40a3d38d9b3d89c
author Linux Build Service Account <lnxbuild@localhost> Mon Oct 15 08:15:56 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Oct 15 08:15:56 2018 -0700
tree 87fd79ce6829dafd21c2e18a87b8caa669b8d5bd
parent ba8507f52a485eaf55ca8722e2999d7e89fc7b71
parent efab6197660367b286993c04c53bf3ca8db11ea9

Merge "hal: Add new parameter in SA+ effects and resolve compilation issue"

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 128a458..b265ce8 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -2672,6 +2672,9 @@
     /* free acdb_meta_key_list */
     platform_release_acdb_metainfo_key(platform);
 
+    if (my_data->acdb_deallocate)
+        my_data->acdb_deallocate();
+
     free(platform);
     /* deinit usb */
     audio_extn_usb_deinit();

qahw_api/test/qahw_playback_test.c

diff --git a/qahw_api/test/qahw_playback_test.c b/qahw_api/test/qahw_playback_test.c
index 253d59e..556f520 100644
--- a/qahw_api/test/qahw_playback_test.c
+++ b/qahw_api/test/qahw_playback_test.c
@@ -2571,6 +2571,7 @@
         fprintf(log_file, "stream %d: Output Flags:%d\n", stream->stream_index, stream->flags);
         fprintf(log_file, "stream %d: Sample Rate:%d\n", stream->stream_index, stream->config.offload_info.sample_rate);
         fprintf(log_file, "stream %d: Channels:%d\n", stream->stream_index, stream->channels);
+        fprintf(log_file, "stream %d: Channel Mask:%x\n", stream->stream_index, stream->config.channel_mask);
         fprintf(log_file, "stream %d: Bitwidth:%d\n", stream->stream_index, stream->config.offload_info.bit_width);
         fprintf(log_file, "stream %d: AAC Format Type:%d\n", stream->stream_index, stream->aac_fmt_type);
         fprintf(log_file, "stream %d: Kvpair Values:%s\n", stream->stream_index, stream->kvpair_values);