Merge "Move media_profiles_V1_0.dtd to hardware/interfaces" into oc-dev
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 5c11bfa..1e327a3 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -70,6 +70,12 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libeffects.so)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/libeffects.so)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libeffects_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libeffectproxy.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libldnhncr.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libdownmix.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libvisualizer.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libreverbwrapper.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/libbundlewrapper.so)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/media/libaaudio/src/legacy/AudioStreamRecord.cpp b/media/libaaudio/src/legacy/AudioStreamRecord.cpp
index a74a030..b3d01d6 100644
--- a/media/libaaudio/src/legacy/AudioStreamRecord.cpp
+++ b/media/libaaudio/src/legacy/AudioStreamRecord.cpp
@@ -207,7 +207,9 @@
return AAUDIO_ERROR_INVALID_STATE;
}
setState(AAUDIO_STREAM_STATE_STOPPING);
+ incrementFramesWritten(getFramesRead() - getFramesWritten()); // TODO review
mAudioRecord->stop();
+ mFramesRead.reset32();
return AAUDIO_OK;
}
@@ -257,6 +259,7 @@
return AAudioConvert_androidToAAudioResult(bytesRead);
}
int32_t framesRead = (int32_t)(bytesRead / bytesPerFrame);
+ incrementFramesRead(framesRead);
return (aaudio_result_t) framesRead;
}
diff --git a/media/libeffects/downmix/Android.mk b/media/libeffects/downmix/Android.mk
index 78601d5..09793d1 100644
--- a/media/libeffects/downmix/Android.mk
+++ b/media/libeffects/downmix/Android.mk
@@ -3,6 +3,7 @@
# Multichannel downmix effect library
include $(CLEAR_VARS)
+LOCAL_VENDOR_MODULE := true
LOCAL_SRC_FILES:= \
EffectDownmix.c
diff --git a/media/libeffects/loudness/Android.mk b/media/libeffects/loudness/Android.mk
index 3db4a79..4b1c584 100644
--- a/media/libeffects/loudness/Android.mk
+++ b/media/libeffects/loudness/Android.mk
@@ -3,6 +3,7 @@
# LoudnessEnhancer library
include $(CLEAR_VARS)
+LOCAL_VENDOR_MODULE := true
LOCAL_SRC_FILES:= \
EffectLoudnessEnhancer.cpp \
dsp/core/dynamic_range_compression.cpp
diff --git a/media/libeffects/lvm/lib/Android.mk b/media/libeffects/lvm/lib/Android.mk
index afc87bb..83e8288 100644
--- a/media/libeffects/lvm/lib/Android.mk
+++ b/media/libeffects/lvm/lib/Android.mk
@@ -6,6 +6,7 @@
LOCAL_ARM_MODE := arm
+LOCAL_VENDOR_MODULE := true
LOCAL_SRC_FILES:= \
StereoWidening/src/LVCS_BypassMix.c \
StereoWidening/src/LVCS_Control.c \
@@ -131,6 +132,7 @@
LOCAL_ARM_MODE := arm
+LOCAL_VENDOR_MODULE := true
LOCAL_SRC_FILES:= \
Reverb/src/LVREV_ApplyNewSettings.c \
Reverb/src/LVREV_ClearAudioBuffers.c \
diff --git a/media/libeffects/lvm/wrapper/Android.mk b/media/libeffects/lvm/wrapper/Android.mk
index 9051587..f92fb95 100644
--- a/media/libeffects/lvm/wrapper/Android.mk
+++ b/media/libeffects/lvm/wrapper/Android.mk
@@ -6,6 +6,7 @@
LOCAL_ARM_MODE := arm
+LOCAL_VENDOR_MODULE := true
LOCAL_SRC_FILES:= \
Bundle/EffectBundle.cpp
@@ -37,6 +38,7 @@
LOCAL_ARM_MODE := arm
+LOCAL_VENDOR_MODULE := true
LOCAL_SRC_FILES:= \
Reverb/EffectReverb.cpp
diff --git a/media/libeffects/proxy/Android.mk b/media/libeffects/proxy/Android.mk
index 0acf1c0..c4de30d 100644
--- a/media/libeffects/proxy/Android.mk
+++ b/media/libeffects/proxy/Android.mk
@@ -18,7 +18,7 @@
LOCAL_MODULE_RELATIVE_PATH := soundfx
LOCAL_MODULE_TAGS := optional
-
+LOCAL_VENDOR_MODULE := true
LOCAL_SRC_FILES := \
EffectProxy.cpp
diff --git a/media/libeffects/visualizer/Android.mk b/media/libeffects/visualizer/Android.mk
index ddcc565..8687e1b 100644
--- a/media/libeffects/visualizer/Android.mk
+++ b/media/libeffects/visualizer/Android.mk
@@ -3,6 +3,7 @@
# Visualizer library
include $(CLEAR_VARS)
+LOCAL_VENDOR_MODULE := true
LOCAL_SRC_FILES:= \
EffectVisualizer.cpp
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index fcf7af1..e8e531a 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -638,6 +638,9 @@
audio_policy_forced_cfg_t config)
{
ALOGV("setForceUse() usage %d, config %d, mPhoneState %d", usage, config, mEngine->getPhoneState());
+ if (config == mEngine->getForceUse(usage)) {
+ return;
+ }
if (mEngine->setForceUse(usage, config) != NO_ERROR) {
ALOGW("setForceUse() could not set force cfg %d for usage %d", config, usage);