Merge "Whitespace" (71534946) · Commits · e / os / android_frameworks_av

include/media/AudioTrack.h

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -468,6 +468,7 @@ protected:

	// body of AudioTrackThread::threadLoop()		// body of AudioTrackThread::threadLoop()
	bool processAudioBuffer(const sp<AudioTrackThread>& thread);		bool processAudioBuffer(const sp<AudioTrackThread>& thread);

	status_t createTrack_l(audio_stream_type_t streamType,		status_t createTrack_l(audio_stream_type_t streamType,
	uint32_t sampleRate,		uint32_t sampleRate,
	audio_format_t format,		audio_format_t format,

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -194,6 +194,7 @@ status_t AudioTrack::set(
	if (AudioSystem::getOutputSamplingRate(&afSampleRate, streamType) != NO_ERROR) {		if (AudioSystem::getOutputSamplingRate(&afSampleRate, streamType) != NO_ERROR) {
	return NO_INIT;		return NO_INIT;
	}		}

	uint32_t afLatency;		uint32_t afLatency;
	if (AudioSystem::getOutputLatency(&afLatency, streamType) != NO_ERROR) {		if (AudioSystem::getOutputLatency(&afLatency, streamType) != NO_ERROR) {
	return NO_INIT;		return NO_INIT;
	@@ -203,9 +204,11 @@ status_t AudioTrack::set(
	if (streamType == AUDIO_STREAM_DEFAULT) {		if (streamType == AUDIO_STREAM_DEFAULT) {
	streamType = AUDIO_STREAM_MUSIC;		streamType = AUDIO_STREAM_MUSIC;
	}		}

	if (sampleRate == 0) {		if (sampleRate == 0) {
	sampleRate = afSampleRate;		sampleRate = afSampleRate;
	}		}

	// these below should probably come from the audioFlinger too...		// these below should probably come from the audioFlinger too...
	if (format == AUDIO_FORMAT_DEFAULT) {		if (format == AUDIO_FORMAT_DEFAULT) {
	format = AUDIO_FORMAT_PCM_16_BIT;		format = AUDIO_FORMAT_PCM_16_BIT;

+17 −16

Original line number	Original line	Diff line number	Diff line
	@@ -2515,6 +2515,7 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::MixerThread::prepareTrac

	// reset retry count		// reset retry count
	track->mRetryCount = kMaxTrackRetries;		track->mRetryCount = kMaxTrackRetries;

	// If one track is ready, set the mixer ready if:		// If one track is ready, set the mixer ready if:
	// - the mixer was not ready during previous round OR		// - the mixer was not ready during previous round OR
	// - no other track is not ready		// - no other track is not ready

+1 −1

File changed.

Contains only whitespace changes.

+1 −1

File changed.

Contains only whitespace changes.