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

Commit fb2ada0c authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "AudioFlinger: Update Effects class includes" into udc-dev-plus-aosp

parents 367d3dfb 699435e4

services/audioflinger/Effects.cpp

+17 −16
Original line number Diff line number Diff line
@@ -19,34 +19,35 @@ 
#define LOG_TAG "AudioFlinger"

//#define LOG_NDEBUG 0



#include <algorithm>

#include "Effects.h"



#include "Client.h"

#include "EffectConfiguration.h"



#include "Configuration.h"

#include <utils/Log.h>

#include <system/audio_effects/effect_aec.h>

#include <system/audio_effects/effect_downmix.h>

#include <system/audio_effects/effect_dynamicsprocessing.h>

#include <system/audio_effects/effect_hapticgenerator.h>

#include <system/audio_effects/effect_ns.h>

#include <system/audio_effects/effect_spatializer.h>

#include <system/audio_effects/effect_visualizer.h>

#include <afutils/DumpTryLock.h>

#include <audio_utils/channels.h>

#include <audio_utils/primitives.h>

#include <media/AudioCommonTypes.h>

#include <media/AudioContainers.h>

#include <media/AudioEffect.h>

#include <media/AudioDeviceTypeAddr.h>

#include <media/AudioEffect.h>

#include <media/ShmemCompat.h>

#include <media/TypeConverter.h>

#include <media/audiohal/EffectHalInterface.h>

#include <media/audiohal/EffectsFactoryHalInterface.h>

#include <mediautils/MethodStatistics.h>

#include <mediautils/ServiceUtilities.h>

#include <mediautils/TimeCheck.h>

#include <system/audio_effects/effect_aec.h>

#include <system/audio_effects/effect_downmix.h>

#include <system/audio_effects/effect_dynamicsprocessing.h>

#include <system/audio_effects/effect_hapticgenerator.h>

#include <system/audio_effects/effect_ns.h>

#include <system/audio_effects/effect_spatializer.h>

#include <system/audio_effects/effect_visualizer.h>

#include <utils/Log.h>



#include "AudioFlinger.h"

#include "EffectConfiguration.h"

#include "Effects.h"

#include <algorithm>



// ----------------------------------------------------------------------------
@@ -1638,7 +1639,7 @@ NO_THREAD_SAFETY_ANALYSIS // conditional try lock 
            mConfig.inputCfg.samplingRate,

            mConfig.inputCfg.channels,

            mConfig.inputCfg.format,

            formatToString((audio_format_t)mConfig.inputCfg.format).c_str());

            toString(static_cast<audio_format_t>(mConfig.inputCfg.format)).c_str());



    result.append("\t\t- Output configuration:\n");

    result.append("\t\t\tBuffer     Frames  Smp rate Channels Format\n");
@@ -1648,7 +1649,7 @@ NO_THREAD_SAFETY_ANALYSIS // conditional try lock 
            mConfig.outputCfg.samplingRate,

            mConfig.outputCfg.channels,

            mConfig.outputCfg.format,

            formatToString((audio_format_t)mConfig.outputCfg.format).c_str());

            toString(static_cast<audio_format_t>(mConfig.outputCfg.format)).c_str());



    result.appendFormat("\t\t- HAL buffers:\n"

            "\t\t\tIn(%s) InConversion(%s) Out(%s) OutConversion(%s)\n",

services/audioflinger/Effects.h

+11 −0
Original line number Diff line number Diff line
@@ -15,6 +15,17 @@ 
** limitations under the License.

*/



#pragma once



#include "DeviceEffectManager.h"

#include "IAfEffect.h"



#include <android-base/macros.h>  // DISALLOW_COPY_AND_ASSIGN

#include <mediautils/Synchronization.h>

#include <private/media/AudioEffectShared.h>



#include <map>  // avoid transitive dependency



namespace android {



//--- Audio Effect Management