From 391bf29ad1177d973cb6a9daea13677373204176 Mon Sep 17 00:00:00 2001 From: Kalyani polepeddy Date: Sat, 29 Dec 2012 17:48:55 +0530 Subject: frameworks/av : Playing AAC and MP3 clips using LPA. -AAC and MP3 clips are not playing. -AAC and MP3 are not using LPA path. -Enable LPA decoder path and implement LPAPlayer class. Change-Id: I76438319fc72c4898fad5910f8de874f89287687 --- include/media/AudioSystem.h | 1 + include/media/IAudioFlinger.h | 5 ++++- include/media/stagefright/LPAPlayer.h | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) mode change 100644 => 100755 include/media/IAudioFlinger.h mode change 100644 => 100755 include/media/stagefright/LPAPlayer.h (limited to 'include') diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index e66fc3a..d8c57d3 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -149,6 +149,7 @@ public: INPUT_CONFIG_CHANGED, STREAM_CONFIG_CHANGED, #ifdef QCOM_HARDWARE + A2DP_OUTPUT_STATE, EFFECT_CONFIG_CHANGED, #endif NUM_CONFIG_EVENTS diff --git a/include/media/IAudioFlinger.h b/include/media/IAudioFlinger.h old mode 100644 new mode 100755 index c895c13..0700a68 --- a/include/media/IAudioFlinger.h +++ b/include/media/IAudioFlinger.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved. * Not a Contribution, Apache license notifications and license are retained * for attribution purposes only. * @@ -210,6 +210,9 @@ public: audio_io_handle_t dstOutput) = 0; virtual audio_module_handle_t loadHwModule(const char *name) = 0; +#ifdef QCOM_HARDWARE + virtual status_t deregisterClient(const sp& client) { return false; }; +#endif // helpers for android.media.AudioManager.getProperty(), see description there for meaning // FIXME move these APIs to AudioPolicy to permit a more accurate implementation diff --git a/include/media/stagefright/LPAPlayer.h b/include/media/stagefright/LPAPlayer.h old mode 100644 new mode 100755 index c351211..b0e1d31 --- a/include/media/stagefright/LPAPlayer.h +++ b/include/media/stagefright/LPAPlayer.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2009 The Android Open Source Project - * Copyright (c) 2009-2012, The Linux Foundation. All rights reserved. + * Copyright (c) 2009-2013, The Linux Foundation. All rights reserved. * Not a Contribution, Apache license notifications and license are retained * for attribution purposes only. * @@ -82,6 +82,7 @@ public: virtual bool reachedEOS(status_t *finalStatus); static int objectsAlive; + static bool mLpaInProgress; private: int64_t mPositionTimeMediaUs; int64_t mPositionTimeRealUs; -- cgit v1.1