Merge "Revert "audio policy: add support for ro.audio.media_deep_buffer"" into lmp-dev (9286354c) · Commits · e / os / android_frameworks_av

services/audiopolicy/AudioPolicyManager.cpp

+1 −11

Original line number	Diff line number	Diff line
		@@ -926,10 +926,6 @@ audio_io_handle_t AudioPolicyManager::getOutputForDevice(
		if ((flags & AUDIO_OUTPUT_FLAG_HW_AV_SYNC) != 0) {
		flags = (audio_output_flags_t)(flags \| AUDIO_OUTPUT_FLAG_DIRECT);
		}
		if (mForceDeepBufferForMedia && (flags & AUDIO_OUTPUT_FLAG_DIRECT) == 0 &&
		stream == AUDIO_STREAM_MUSIC) {
		flags = (audio_output_flags_t)(flags \| AUDIO_OUTPUT_FLAG_DEEP_BUFFER);
		}

		sp<IOProfile> profile;

		@@ -2657,14 +2653,8 @@ AudioPolicyManager::AudioPolicyManager(AudioPolicyClientInterface *clientInterfa
		mTotalEffectsCpuLoad(0), mTotalEffectsMemory(0),
		mA2dpSuspended(false),
		mSpeakerDrcEnabled(false), mNextUniqueId(1),
		mAudioPortGeneration(1),
		mForceDeepBufferForMedia(false)
		mAudioPortGeneration(1)
		{
		char propValue[PROPERTY_VALUE_MAX];
		if (property_get("ro.audio.media_deep_buffer", propValue, "0")) {
		mForceDeepBufferForMedia = atoi(propValue);
		}

		mUidCached = getuid();
		mpClientInterface = clientInterface;

+0 −2

Original line number	Diff line number	Diff line
		@@ -806,8 +806,6 @@ protected:
		sp<AudioPatch> mCallTxPatch;
		sp<AudioPatch> mCallRxPatch;

		bool mForceDeepBufferForMedia;

		#ifdef AUDIO_POLICY_TEST
		Mutex mLock;
		Condition mWaitWorkCV;