hal: Limit pass-through sample rate to 192k for TrueHD and EC3
Limit pass-through sample rate to 192k for TrueHD and EC3.
192k is the highest sample rate supported by these formats
and both formats multiply the input sample rate by four
which may exceed the maximum supported.
Change-Id: I7f3516c24fdae18b3fb4cf53aa6e7c4c34eaed18
diff --git a/hal/audio_extn/audio_extn.h b/hal/audio_extn/audio_extn.h
index aeaab5f..8ed05fd 100644
--- a/hal/audio_extn/audio_extn.h
+++ b/hal/audio_extn/audio_extn.h
@@ -473,6 +473,9 @@
EXT_DISPLAY_TYPE_DP
};
+/* Used to limit sample rate for TrueHD & EC3 */
+#define HDMI_PASSTHROUGH_MAX_SAMPLE_RATE 192000
+
#ifndef HDMI_PASSTHROUGH_ENABLED
#define audio_extn_passthru_update_stream_configuration(adev, out) (0)
#define audio_extn_passthru_is_convert_supported(adev, out) (0)
diff --git a/hal/audio_extn/utils.c b/hal/audio_extn/utils.c
index 660bd6b..38cfe35 100644
--- a/hal/audio_extn/utils.c
+++ b/hal/audio_extn/utils.c
@@ -916,10 +916,13 @@
(usecase->stream.out->format == AUDIO_FORMAT_E_AC3_JOC) ||
(usecase->stream.out->format == AUDIO_FORMAT_DOLBY_TRUEHD))
&& audio_extn_passthru_is_passthrough_stream(usecase->stream.out)) {
- app_type_cfg[len++] = sample_rate * 4;
- } else {
- app_type_cfg[len++] = sample_rate;
+
+ sample_rate = sample_rate * 4;
+ if (sample_rate > HDMI_PASSTHROUGH_MAX_SAMPLE_RATE)
+ sample_rate = HDMI_PASSTHROUGH_MAX_SAMPLE_RATE;
}
+ app_type_cfg[len++] = sample_rate;
+
if (snd_device_be_idx > 0)
app_type_cfg[len++] = snd_device_be_idx;
diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index cacdd85..39da7e4 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -5449,11 +5449,12 @@
if ((usecase->stream.out->format == AUDIO_FORMAT_E_AC3) ||
(usecase->stream.out->format == AUDIO_FORMAT_E_AC3_JOC) ||
- (usecase->stream.out->format == AUDIO_FORMAT_DOLBY_TRUEHD))
- sample_rate = sample_rate * 4 ;
+ (usecase->stream.out->format == AUDIO_FORMAT_DOLBY_TRUEHD)) {
- if (!edid_is_supported_sr(edid_info, sample_rate))
- sample_rate = edid_get_highest_supported_sr(edid_info);
+ sample_rate = sample_rate * 4;
+ if (sample_rate > HDMI_PASSTHROUGH_MAX_SAMPLE_RATE)
+ sample_rate = HDMI_PASSTHROUGH_MAX_SAMPLE_RATE;
+ }
bit_width = CODEC_BACKEND_DEFAULT_BIT_WIDTH;
/* We force route so that the BE format can be set to Compr */
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index a2ca01f..e354deb 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -5210,11 +5210,12 @@
if ((usecase->stream.out->format == AUDIO_FORMAT_E_AC3) ||
(usecase->stream.out->format == AUDIO_FORMAT_E_AC3_JOC) ||
- (usecase->stream.out->format == AUDIO_FORMAT_DOLBY_TRUEHD))
- sample_rate = sample_rate * 4 ;
+ (usecase->stream.out->format == AUDIO_FORMAT_DOLBY_TRUEHD)) {
- if (!edid_is_supported_sr(edid_info, sample_rate))
- sample_rate = edid_get_highest_supported_sr(edid_info);
+ sample_rate = sample_rate * 4;
+ if (sample_rate > HDMI_PASSTHROUGH_MAX_SAMPLE_RATE)
+ sample_rate = HDMI_PASSTHROUGH_MAX_SAMPLE_RATE;
+ }
bit_width = CODEC_BACKEND_DEFAULT_BIT_WIDTH;
/* We force route so that the BE format can be set to Compr */
@@ -6162,6 +6163,20 @@
return false;
}
+int platform_edid_get_highest_supported_sr(void *platform)
+{
+ struct platform_data *my_data = (struct platform_data *)platform;
+ edid_audio_info *info = NULL;
+ int ret = 0;
+
+ ret = platform_get_edid_info(platform);
+ info = (edid_audio_info *)my_data->edid_info;
+ if (ret == 0 && info != NULL) {
+ return edid_get_highest_supported_sr(info);
+ }
+
+ return 0;
+}
int platform_set_edid_channels_configuration(void *platform, int channels) {