Merge "libmediaplayerservice: Check for a possible divide by 0" am: caa0b29253 (ca655c34) · Commits · e / os / android_frameworks_av

media/libmediaplayerservice/MediaPlayerService.cpp

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1906,10 +1906,16 @@ status_t MediaPlayerService::AudioOutput::open(
	if (AudioSystem::getOutputSamplingRate(&afSampleRate, mStreamType) != NO_ERROR) {		if (AudioSystem::getOutputSamplingRate(&afSampleRate, mStreamType) != NO_ERROR) {
	return NO_INIT;		return NO_INIT;
	}		}
			if (afSampleRate == 0) {
			return NO_INIT;
			}
	const size_t framesPerBuffer =		const size_t framesPerBuffer =
	(unsigned long long)sampleRate * afFrameCount / afSampleRate;		(unsigned long long)sampleRate * afFrameCount / afSampleRate;

	if (bufferCount == 0) {		if (bufferCount == 0) {
			if (framesPerBuffer == 0) {
			return NO_INIT;
			}
	// use suggestedFrameCount		// use suggestedFrameCount
	bufferCount = (suggestedFrameCount + framesPerBuffer - 1) / framesPerBuffer;		bufferCount = (suggestedFrameCount + framesPerBuffer - 1) / framesPerBuffer;
	}		}