Merge "ALOGW when failing to open audio track because of playback rate" (296ee17c) · Commits · e / os / android_frameworks_av

media/libaudioclient/AudioTrack.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -908,13 +908,13 @@ status_t AudioTrack::setPlaybackRate(const AudioPlaybackRate &playbackRate)
		effectiveRate, effectiveSpeed, effectivePitch);

		if (!isAudioPlaybackRateValid(playbackRateTemp)) {
		ALOGV("setPlaybackRate(%f, %f) failed (effective rate out of bounds)",
		ALOGW("setPlaybackRate(%f, %f) failed (effective rate out of bounds)",
		playbackRate.mSpeed, playbackRate.mPitch);
		return BAD_VALUE;
		}
		// Check if the buffer size is compatible.
		if (!isSampleRateSpeedAllowed_l(effectiveRate, effectiveSpeed)) {
		ALOGV("setPlaybackRate(%f, %f) failed (buffer size)",
		ALOGW("setPlaybackRate(%f, %f) failed (buffer size)",
		playbackRate.mSpeed, playbackRate.mPitch);
		return BAD_VALUE;
		}
		@@ -922,13 +922,13 @@ status_t AudioTrack::setPlaybackRate(const AudioPlaybackRate &playbackRate)
		// Check resampler ratios are within bounds
		if ((uint64_t)effectiveRate > (uint64_t)mSampleRate *
		(uint64_t)AUDIO_RESAMPLER_DOWN_RATIO_MAX) {
		ALOGV("setPlaybackRate(%f, %f) failed. Resample rate exceeds max accepted value",
		ALOGW("setPlaybackRate(%f, %f) failed. Resample rate exceeds max accepted value",
		playbackRate.mSpeed, playbackRate.mPitch);
		return BAD_VALUE;
		}

		if ((uint64_t)effectiveRate * (uint64_t)AUDIO_RESAMPLER_UP_RATIO_MAX < (uint64_t)mSampleRate) {
		ALOGV("setPlaybackRate(%f, %f) failed. Resample rate below min accepted value",
		ALOGW("setPlaybackRate(%f, %f) failed. Resample rate below min accepted value",
		playbackRate.mSpeed, playbackRate.mPitch);
		return BAD_VALUE;
		}