Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e962fb82 authored Mar 31, 2017 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Mar 31, 2017

Merge "hal: Ensure that native sample rate is configured on correct backend"

parents fbad4d93 7a17d749

hal/msm8916/platform.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -5326,7 +5326,9 @@ static bool platform_check_codec_backend_cfg(struct audio_device* adev,
		ALOGD("%s:becf: afe: true napb active set rate to 44.1 khz",
		__func__);
		}
		} else if (na_mode != NATIVE_AUDIO_MODE_MULTIPLE_44_1) {
		} else if (na_mode != NATIVE_AUDIO_MODE_MULTIPLE_44_1 \|\|
		((backend_idx != HEADPHONE_44_1_BACKEND) &&
		(backend_idx != DSD_NATIVE_BACKEND))) {
		/*
		* Map native sampling rates to upper limit range
		* if multiple of native sampling rates are not supported.

hal/msm8974/platform.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -5230,7 +5230,10 @@ static bool platform_check_codec_backend_cfg(struct audio_device* adev,
		ALOGD("%s:becf: afe: true napb active set rate to 44.1 khz",
		__func__);
		}
		} else if (na_mode != NATIVE_AUDIO_MODE_MULTIPLE_44_1) {

		} else if (na_mode != NATIVE_AUDIO_MODE_MULTIPLE_44_1 \|\|
		((backend_idx != HEADPHONE_44_1_BACKEND) &&
		(backend_idx != DSD_NATIVE_BACKEND))) {
		/*
		* Map native sampling rates to upper limit range
		* if multiple of native sampling rates are not supported.