merge in jb-mr2-release history after reset to jb-mr2-dev
diff --git a/hal/audio_hw.h b/hal/audio_hw.h
index 0733e71..dec6ef2 100644
--- a/hal/audio_hw.h
+++ b/hal/audio_hw.h
@@ -148,8 +148,13 @@
#define HDMI_MULTI_DEFAULT_CHANNEL_COUNT 6
#define HDMI_MULTI_PERIOD_BYTES (HDMI_MULTI_PERIOD_SIZE * HDMI_MULTI_DEFAULT_CHANNEL_COUNT * 2)
+#ifdef MSM8974
+#define AUDIO_CAPTURE_PERIOD_SIZE 512
+#define AUDIO_CAPTURE_PERIOD_COUNT 16
+#else
#define AUDIO_CAPTURE_PERIOD_SIZE 320
#define AUDIO_CAPTURE_PERIOD_COUNT 2
+#endif
#define MAX_SUPPORTED_CHANNEL_MASKS 2