Merge "hal: Use deep buffer output as primary" (abca4b12) · Commits · e / os / android_hardware_qcom_audio

hal/audio_hw.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -1932,10 +1932,6 @@ static int adev_open_output_stream(struct audio_hw_device *dev,
		out->config.rate = config->sample_rate;
		out->config.channels = popcount(out->channel_mask);
		out->config.period_size = HDMI_MULTI_PERIOD_BYTES / (out->config.channels * 2);
		} else if (out->flags & AUDIO_OUTPUT_FLAG_DEEP_BUFFER) {
		out->usecase = USECASE_AUDIO_PLAYBACK_DEEP_BUFFER;
		out->config = pcm_config_deep_buffer;
		out->sample_rate = out->config.rate;
		} else if (out->flags & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD) {
		if (config->offload_info.version != AUDIO_INFO_INITIALIZER.version \|\|
		config->offload_info.size != AUDIO_INFO_INITIALIZER.size) {
		@@ -1993,10 +1989,14 @@ static int adev_open_output_stream(struct audio_hw_device *dev,
		__func__, ret);
		goto error_open;
		}
		} else {
		} else if (out->flags & AUDIO_OUTPUT_FLAG_FAST) {
		out->usecase = USECASE_AUDIO_PLAYBACK_LOW_LATENCY;
		out->config = pcm_config_low_latency;
		out->sample_rate = out->config.rate;
		} else {
		out->usecase = USECASE_AUDIO_PLAYBACK_DEEP_BUFFER;
		out->config = pcm_config_deep_buffer;
		out->sample_rate = out->config.rate;
		}

		if (flags & AUDIO_OUTPUT_FLAG_PRIMARY) {