Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00260b5e authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

Remove dependencies on hardware/audio_effects.h and EffectsFactoryApi.h 

Also remove some outstanding dependencies on hardware/audio.h.

Most of the time, only constants and structs from audio_effects.h
are used, and no actual calls into HAL are made. Move these
definitions into system/audio_effect.h, and generate constants
from TREBLE HAL definition.

For parameters, always use values from AudioParameter class.

There are still some outstanding includes of hardware/audio.h
in code that directly deals with audio modules. Need to extend
libaudiohal interfaces to support required functionality.

Test: make

Change-Id: I0bcdf8ae199485d4d65f3eeb7e7a3b9b5cdb6ab6
parent 47677e3e

include/media/AudioEffect.h

+1 −1
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 
#include <media/IAudioPolicyService.h>

#include <media/IEffect.h>

#include <media/IEffectClient.h>

#include <hardware/audio_effect.h>

#include <media/AudioSystem.h>

#include <system/audio_effect.h>



#include <utils/RefBase.h>

#include <utils/Errors.h>

include/media/AudioParameter.h

+12 −0
Original line number Diff line number Diff line
@@ -49,6 +49,18 @@ public: 
    static const char * const keyInputSource;

    static const char * const keyScreenState;



    //  keyBtNrec: BT SCO Noise Reduction + Echo Cancellation parameters

    //  keyHwAvSync: get HW synchronization source identifier from a device

    //  keyMonoOutput: Enable mono audio playback

    //  keyStreamHwAvSync: set HW synchronization source identifier on a stream

    static const char * const keyBtNrec;

    static const char * const keyHwAvSync;

    static const char * const keyMonoOutput;

    static const char * const keyStreamHwAvSync;



    static const char * const valueOn;

    static const char * const valueOff;



    String8 toString();



    status_t add(const String8& key, const String8& value);

include/media/AudioSystem.h

+1 −1
Original line number Diff line number Diff line
@@ -17,12 +17,12 @@ 
#ifndef ANDROID_AUDIOSYSTEM_H_

#define ANDROID_AUDIOSYSTEM_H_



#include <hardware/audio_effect.h>

#include <media/AudioPolicy.h>

#include <media/AudioIoDescriptor.h>

#include <media/IAudioFlingerClient.h>

#include <media/IAudioPolicyServiceClient.h>

#include <system/audio.h>

#include <system/audio_effect.h>

#include <system/audio_policy.h>

#include <utils/Errors.h>

#include <utils/Mutex.h>

include/media/IAudioFlinger.h

+1 −1
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ 
#include <media/IAudioRecord.h>

#include <media/IAudioFlingerClient.h>

#include <system/audio.h>

#include <system/audio_effect.h>

#include <system/audio_policy.h>

#include <hardware/audio_policy.h>

#include <hardware/audio_effect.h>

#include <media/IEffect.h>

#include <media/IEffectClient.h>

#include <utils/String8.h>

include/media/audiohal/EffectHalInterface.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#ifndef ANDROID_HARDWARE_EFFECT_HAL_INTERFACE_H

#define ANDROID_HARDWARE_EFFECT_HAL_INTERFACE_H



#include <hardware/audio_effect.h>

#include <system/audio_effect.h>

#include <utils/Errors.h>

#include <utils/RefBase.h>