diff options
author | Dave Burke <daveburke@google.com> | 2014-10-12 11:22:08 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-12 11:22:08 +0000 |
commit | 013f7ee35b6183fc797ce1a23090a5df43d1c3ff (patch) | |
tree | e95ab5547336447195b9a441d9566276ca64e978 /services | |
parent | 4c4035355b7fdd123740605c74c06df3c35e7a85 (diff) | |
parent | 9286354c0a864ce2348cc7dfc6ca81e84a15f8e2 (diff) | |
download | frameworks_av-013f7ee35b6183fc797ce1a23090a5df43d1c3ff.zip frameworks_av-013f7ee35b6183fc797ce1a23090a5df43d1c3ff.tar.gz frameworks_av-013f7ee35b6183fc797ce1a23090a5df43d1c3ff.tar.bz2 |
am 9286354c: Merge "Revert "audio policy: add support for ro.audio.media_deep_buffer"" into lmp-dev
* commit '9286354c0a864ce2348cc7dfc6ca81e84a15f8e2':
Revert "audio policy: add support for ro.audio.media_deep_buffer"
Diffstat (limited to 'services')
-rw-r--r-- | services/audiopolicy/AudioPolicyManager.cpp | 12 | ||||
-rw-r--r-- | services/audiopolicy/AudioPolicyManager.h | 2 |
2 files changed, 1 insertions, 13 deletions
diff --git a/services/audiopolicy/AudioPolicyManager.cpp b/services/audiopolicy/AudioPolicyManager.cpp index e4d785c..536987a 100644 --- a/services/audiopolicy/AudioPolicyManager.cpp +++ b/services/audiopolicy/AudioPolicyManager.cpp @@ -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; diff --git a/services/audiopolicy/AudioPolicyManager.h b/services/audiopolicy/AudioPolicyManager.h index b57a295..0ea7b97 100644 --- a/services/audiopolicy/AudioPolicyManager.h +++ b/services/audiopolicy/AudioPolicyManager.h @@ -806,8 +806,6 @@ protected: sp<AudioPatch> mCallTxPatch; sp<AudioPatch> mCallRxPatch; - bool mForceDeepBufferForMedia; - #ifdef AUDIO_POLICY_TEST Mutex mLock; Condition mWaitWorkCV; |