commit d13c1a3935a4674171a4f547b72444638916a096
author Sachin Mohan Gadag <sgadag@codeaurora.org> Wed Apr 19 19:17:31 2017 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue May 23 04:40:03 2017 -0700
tree c40da39bc54d174414bd69600b41c28b44595779
parent 642533f07112ee4bc7d502f948cbf4cfdf3d0fd1

qahw: test: Pass correct channel mask and wave header length

Incorrect function is invoked to assign channel
mask value which resulted in passing incorrect
bytes of data to below layers. Fix the issue
by invoking correct function to assign proper
channel mask value.
Calculate wave header length with generic formula
instead of switch case.

Change-Id: I99e633eb10188dafca4e1a2320e06891b890d35a

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 6578bff..2403e72 100644
--- a/qahw_api/test/qahw_playback_test.c
+++ b/qahw_api/test/qahw_playback_test.c
@@ -58,6 +58,10 @@
 #define KVPAIRS_MAX 100
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[1]))
 
+#define FORMAT_DESCRIPTOR_SIZE 12
+#define SUBCHUNK1_SIZE(x) ((8) + (x))
+#define SUBCHUNK2_SIZE 8
+
 static int get_wav_header_length (FILE* file_stream);
 static void init_streams(void);
 
@@ -1007,7 +1011,7 @@
     }
     stream_info->config.sample_rate = stream_info->config.offload_info.sample_rate;
     stream_info->config.format = stream_info->config.offload_info.format;
-    stream_info->config.channel_mask = stream_info->config.offload_info.channel_mask = audio_channel_in_mask_from_count(stream_info->channels);
+    stream_info->config.channel_mask = stream_info->config.offload_info.channel_mask = audio_channel_out_mask_from_count(stream_info->channels);
     return;
 }
 
@@ -1512,20 +1516,7 @@
         fprintf(log_file, "This is not a valid wav file \n");
         fprintf(stderr, "This is not a valid wav file \n");
     } else {
-          switch (subchunk_size) {
-          case 16:
-              fprintf(log_file, "44-byte wav header \n");
-              wav_header_len = 44;
-              break;
-          case 18:
-              fprintf(log_file, "46-byte wav header \n");
-              wav_header_len = 46;
-              break;
-          default:
-              fprintf(log_file, "Header contains extra data and is larger than 46 bytes: subchunk_size=%d \n", subchunk_size);
-              wav_header_len = subchunk_size;
-              break;
-          }
+         wav_header_len = FORMAT_DESCRIPTOR_SIZE + SUBCHUNK1_SIZE(subchunk_size) + SUBCHUNK2_SIZE;
     }
     return wav_header_len;
 }