From 0e4eace1075a79f295ae59cc4fb0f59fee643fe0 Mon Sep 17 00:00:00 2001 From: Dean Wheatley Date: Sun, 17 Dec 2023 06:35:13 +1100 Subject: [PATCH] Support 192kHz remote submix paths for E-AC-3(-JOC) IEC 61937 Explicitly reject remote submix non PCM input or output streams, so that AudioFlinger can retry opening compressed audio streams using IEC61937 encapsulation. Remove the Format_from_SR_C() comment from sample_rate_supported as that function no longer limits by sample rate. A complete cleanup of audio_hw.cpp to remove stale references to Format_from_SR_C() is deferred. Change-Id: I15a70f8533dadeb9e19b10d0d95b526e1fe2d8b2 --- modules/audio_remote_submix/audio_hw.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/audio_remote_submix/audio_hw.cpp b/modules/audio_remote_submix/audio_hw.cpp index 5019ae5b..d6c8c7b6 100644 --- a/modules/audio_remote_submix/audio_hw.cpp +++ b/modules/audio_remote_submix/audio_hw.cpp @@ -199,9 +199,9 @@ struct submix_stream_in { // Determine whether the specified sample rate is supported by the submix module. static bool sample_rate_supported(const uint32_t sample_rate) { - // Set of sample rates supported by Format_from_SR_C() frameworks/av/media/libnbaio/NAIO.cpp. static const unsigned int supported_sample_rates[] = { 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000, + 192000 /* for IEC 61937 encapsulated E-AC-3(-JOC) */ }; bool return_value; SUBMIX_VALUE_IN_SET(sample_rate, supported_sample_rates, &return_value); @@ -1240,6 +1240,10 @@ static int adev_open_output_stream(struct audio_hw_device *dev, *stream_out = NULL; // Make sure it's possible to open the device given the current audio config. + if (!audio_is_linear_pcm(config->format)) { + ALOGD("adev_open_output_stream(): not supported for audio format %#x", config->format); + return -EINVAL; + } submix_sanitize_config(config, false); int route_idx = -1; @@ -1455,6 +1459,11 @@ static int adev_open_input_stream(struct audio_hw_device *dev, *stream_in = NULL; + if (!audio_is_linear_pcm(config->format)) { + ALOGD("adev_open_input_stream(): not supported for audio format %#x", config->format); + return -EINVAL; + } + // Do we already have a route for this address int route_idx = -1;