commit e1315cf0b63b4c14a77046519e6b01f6f60d74b0
author Eric Laurent <elaurent@google.com> Tue May 17 19:16:02 2011 -0700
committer Eric Laurent <elaurent@google.com> Fri May 27 15:15:00 2011 -0700
tree c10fd288fd0d0d85c619e7e635a249765202fabc
parent a3e73df3b402f1ebdbef7c8a8e3111d852e7bd35

New effect library API

Moved and renamed media/EffectApi.h to hardware/audio_effect.h
Modified the effect library API to expose a library info structure
containing an interface functions table.
Also removed enums for audio channels, audio format and devices
from effect API and use values from system/audio.h instead.

Modified effects factory to support new library interface format and
load libraries and efffects listed in audio_effects.conf file.
The file audio_effects.conf is first loaded from /vendor/etc and
then from /system/etc/audio_effects.conf if not found.

Modified existing effect libraries to implement the new library interface.

Change-Id: Ie52351e071b6d352fa2fbc06c3846686f8c45df9

media/libeffects/testlibs/AudioFormatAdapter.h

diff --git a/media/libeffects/testlibs/AudioFormatAdapter.h b/media/libeffects/testlibs/AudioFormatAdapter.h
index d93ebe9..41f1810 100644
--- a/media/libeffects/testlibs/AudioFormatAdapter.h
+++ b/media/libeffects/testlibs/AudioFormatAdapter.h
@@ -18,7 +18,7 @@
 #ifndef AUDIOFORMATADAPTER_H_
 #define AUDIOFORMATADAPTER_H_
 
-#include <media/EffectApi.h>
+#include <hardware/audio_effect.h>
 
 
 #define min(x,y) (((x) < (y)) ? (x) : (y))
@@ -75,7 +75,7 @@
         while (numSamples > 0) {
             uint32_t numSamplesIter = min(numSamples, mMaxSamplesPerCall);
             uint32_t nSamplesChannels = numSamplesIter * mNumChannels;
-            if (mPcmFormat == SAMPLE_FORMAT_PCM_S7_24) {
+            if (mPcmFormat == AUDIO_FORMAT_PCM_8_24_BIT) {
                 if (mBehavior == EFFECT_BUFFER_ACCESS_WRITE) {
                     mpProcessor->process(
                         reinterpret_cast<const audio_sample_t *> (pIn),
@@ -125,7 +125,7 @@
     //              sample.
     // numSamples   The number of single-channel samples to process.
     void ConvertInput(const void *& pIn, uint32_t numSamples) {
-        if (mPcmFormat == SAMPLE_FORMAT_PCM_S15) {
+        if (mPcmFormat == AUDIO_FORMAT_PCM_16_BIT) {
             const int16_t * pIn16 = reinterpret_cast<const int16_t *>(pIn);
             audio_sample_t * pOut = mBuffer;
             while (numSamples-- > 0) {
@@ -143,7 +143,7 @@
     //              When function exist will point to the next output sample.
     // numSamples   The number of single-channel samples to process.
     void ConvertOutput(void *& pOut, uint32_t numSamples) {
-        if (mPcmFormat == SAMPLE_FORMAT_PCM_S15) {
+        if (mPcmFormat == AUDIO_FORMAT_PCM_16_BIT) {
             const audio_sample_t * pIn = mBuffer;
             int16_t * pOut16 = reinterpret_cast<int16_t *>(pOut);
             if (mBehavior == EFFECT_BUFFER_ACCESS_WRITE) {