diff options
| author | codeworkx <codeworkx@cyanogenmod.org> | 2013-01-14 20:43:57 +0000 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.org> | 2013-01-14 20:46:09 +0000 |
| commit | c483bdb016422a9b9e6c56a46e65df0171132dc2 (patch) | |
| tree | 386a0ab06e1011368284d2ae8ac51957e51a65e9 | |
| parent | e0df2e7b19749ad40488d06bb557ce8d96ab3c37 (diff) | |
| download | frameworks_av-c483bdb016422a9b9e6c56a46e65df0171132dc2.zip frameworks_av-c483bdb016422a9b9e6c56a46e65df0171132dc2.tar.gz frameworks_av-c483bdb016422a9b9e6c56a46e65df0171132dc2.tar.bz2 | |
libmedia: implement samsungs isSeparatedStream, built audioparameter
Change-Id: I96ec5b79c08e37c9bca59470addb5a9f7869eaea
| -rw-r--r-- | media/libmedia/Android.mk | 9 | ||||
| -rw-r--r-- | media/libmedia/AudioSystem.cpp | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index 69361fa..6c37487 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -62,6 +62,15 @@ LOCAL_SRC_FILES:= \ SoundPool.cpp \ SoundPoolThread.cpp +ifeq ($(BOARD_USES_LIBMEDIA_WITH_AUDIOPARAMETER),true) +LOCAL_SRC_FILES+= \ + AudioParameter.cpp +endif + +ifeq ($(BOARD_USE_SAMSUNG_SEPARATEDSTREAM),true) +LOCAL_CFLAGS += -DUSE_SAMSUNG_SEPARATEDSTREAM +endif + ifeq ($(BOARD_USES_QCOM_HARDWARE),true) LOCAL_SRC_FILES += \ IDirectTrack.cpp \ diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index b7b3b7d..fd8c320 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -788,4 +788,13 @@ void AudioSystem::AudioPolicyServiceClient::binderDied(const wp<IBinder>& who) { ALOGW("AudioPolicyService server died!"); } +#ifdef USE_SAMSUNG_SEPARATEDSTREAM +extern "C" bool _ZN7android11AudioSystem17isSeparatedStreamE19audio_stream_type_t(audio_stream_type_t stream) +{ + ALOGD("audio_stream_type_t: %d", stream); + ALOGD("isSeparatedStream: false"); + return false; +} +#endif // USE_SAMSUNG_SEPARATEDSTREAM + }; // namespace android |