Merge "Audio HAL: Simplify types updates for 'common' and 'effect' packages"
This commit is contained in:
commit
57efd5bd0d
9 changed files with 18 additions and 94 deletions
|
@ -40,10 +40,9 @@ namespace effect {
|
|||
namespace CPP_VERSION {
|
||||
namespace implementation {
|
||||
|
||||
using ::android::hardware::audio::common::CPP_VERSION::AudioChannelMask;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::AudioFormat;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::implementation::AudioChannelBitfield;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::MessageQueueFlagBits;
|
||||
using namespace ::android::hardware::audio::common::CPP_VERSION;
|
||||
using namespace ::android::hardware::audio::effect::CPP_VERSION;
|
||||
|
||||
namespace {
|
||||
|
||||
|
|
|
@ -47,20 +47,9 @@ using ::android::hardware::hidl_string;
|
|||
using ::android::hardware::hidl_vec;
|
||||
using ::android::hardware::Return;
|
||||
using ::android::hardware::Void;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::AudioDevice;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::AudioMode;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::AudioSource;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::Uuid;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::implementation::AudioDeviceBitfield;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::AudioBuffer;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectAuxChannelsConfig;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectConfig;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectDescriptor;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectFeature;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectOffloadParameter;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::IEffect;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::IEffectBufferProviderCallback;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::Result;
|
||||
using namespace ::android::hardware::audio::common::CPP_VERSION;
|
||||
using namespace ::android::hardware::audio::effect::CPP_VERSION;
|
||||
|
||||
struct Effect : public IEffect {
|
||||
typedef MessageQueue<Result, kSynchronizedReadWrite> StatusMQ;
|
||||
|
|
|
@ -41,11 +41,8 @@ using ::android::hardware::hidl_string;
|
|||
using ::android::hardware::hidl_vec;
|
||||
using ::android::hardware::Return;
|
||||
using ::android::hardware::Void;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::Uuid;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectDescriptor;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::IEffect;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::IEffectsFactory;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::Result;
|
||||
using namespace ::android::hardware::audio::common::CPP_VERSION;
|
||||
using namespace ::android::hardware::audio::effect::CPP_VERSION;
|
||||
|
||||
struct EffectsFactory : public IEffectsFactory {
|
||||
// Methods from ::android::hardware::audio::effect::CPP_VERSION::IEffectsFactory follow.
|
||||
|
|
|
@ -43,18 +43,8 @@ using ::android::hardware::hidl_string;
|
|||
using ::android::hardware::hidl_vec;
|
||||
using ::android::hardware::Return;
|
||||
using ::android::hardware::Void;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::AudioDevice;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::AudioMode;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::AudioSource;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::AudioBuffer;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectAuxChannelsConfig;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectConfig;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectDescriptor;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectOffloadParameter;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::IEffect;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::IEffectBufferProviderCallback;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::IEnvironmentalReverbEffect;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::Result;
|
||||
using namespace ::android::hardware::audio::common::CPP_VERSION;
|
||||
using namespace ::android::hardware::audio::effect::CPP_VERSION;
|
||||
|
||||
struct EnvironmentalReverbEffect : public IEnvironmentalReverbEffect {
|
||||
explicit EnvironmentalReverbEffect(effect_handle_t handle);
|
||||
|
|
|
@ -39,18 +39,8 @@ using ::android::hardware::hidl_string;
|
|||
using ::android::hardware::hidl_vec;
|
||||
using ::android::hardware::Return;
|
||||
using ::android::hardware::Void;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::AudioDevice;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::AudioMode;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::AudioSource;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::AudioBuffer;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectAuxChannelsConfig;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectConfig;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectDescriptor;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectOffloadParameter;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::IEffect;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::IEffectBufferProviderCallback;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::ILoudnessEnhancerEffect;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::Result;
|
||||
using namespace ::android::hardware::audio::common::CPP_VERSION;
|
||||
using namespace ::android::hardware::audio::effect::CPP_VERSION;
|
||||
|
||||
struct LoudnessEnhancerEffect : public ILoudnessEnhancerEffect {
|
||||
explicit LoudnessEnhancerEffect(effect_handle_t handle);
|
||||
|
|
|
@ -41,18 +41,8 @@ using ::android::hardware::hidl_string;
|
|||
using ::android::hardware::hidl_vec;
|
||||
using ::android::hardware::Return;
|
||||
using ::android::hardware::Void;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::AudioDevice;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::AudioMode;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::AudioSource;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::AudioBuffer;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectAuxChannelsConfig;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectConfig;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectDescriptor;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectOffloadParameter;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::IEffect;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::IEffectBufferProviderCallback;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::INoiseSuppressionEffect;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::Result;
|
||||
using namespace ::android::hardware::audio::common::CPP_VERSION;
|
||||
using namespace ::android::hardware::audio::effect::CPP_VERSION;
|
||||
|
||||
struct NoiseSuppressionEffect : public INoiseSuppressionEffect {
|
||||
explicit NoiseSuppressionEffect(effect_handle_t handle);
|
||||
|
|
|
@ -39,18 +39,8 @@ using ::android::hardware::hidl_string;
|
|||
using ::android::hardware::hidl_vec;
|
||||
using ::android::hardware::Return;
|
||||
using ::android::hardware::Void;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::AudioDevice;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::AudioMode;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::AudioSource;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::AudioBuffer;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectAuxChannelsConfig;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectConfig;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectDescriptor;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectOffloadParameter;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::IEffect;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::IEffectBufferProviderCallback;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::IPresetReverbEffect;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::Result;
|
||||
using namespace ::android::hardware::audio::common::CPP_VERSION;
|
||||
using namespace ::android::hardware::audio::effect::CPP_VERSION;
|
||||
|
||||
struct PresetReverbEffect : public IPresetReverbEffect {
|
||||
explicit PresetReverbEffect(effect_handle_t handle);
|
||||
|
|
|
@ -39,20 +39,9 @@ using ::android::hardware::hidl_string;
|
|||
using ::android::hardware::hidl_vec;
|
||||
using ::android::hardware::Return;
|
||||
using ::android::hardware::Void;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::AudioChannelMask;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::AudioDevice;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::AudioMode;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::AudioSource;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::implementation::AudioChannelBitfield;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::AudioBuffer;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectAuxChannelsConfig;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectConfig;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectDescriptor;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectOffloadParameter;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::IEffect;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::IEffectBufferProviderCallback;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::IVirtualizerEffect;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::Result;
|
||||
using namespace ::android::hardware::audio::common::CPP_VERSION;
|
||||
using namespace ::android::hardware::audio::effect::CPP_VERSION;
|
||||
|
||||
struct VirtualizerEffect : public IVirtualizerEffect {
|
||||
explicit VirtualizerEffect(effect_handle_t handle);
|
||||
|
|
|
@ -39,18 +39,8 @@ using ::android::hardware::hidl_string;
|
|||
using ::android::hardware::hidl_vec;
|
||||
using ::android::hardware::Return;
|
||||
using ::android::hardware::Void;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::AudioDevice;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::AudioMode;
|
||||
using ::android::hardware::audio::common::CPP_VERSION::AudioSource;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::AudioBuffer;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectAuxChannelsConfig;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectConfig;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectDescriptor;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::EffectOffloadParameter;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::IEffect;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::IEffectBufferProviderCallback;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::IVisualizerEffect;
|
||||
using ::android::hardware::audio::effect::CPP_VERSION::Result;
|
||||
using namespace ::android::hardware::audio::common::CPP_VERSION;
|
||||
using namespace ::android::hardware::audio::effect::CPP_VERSION;
|
||||
|
||||
struct VisualizerEffect : public IVisualizerEffect {
|
||||
explicit VisualizerEffect(effect_handle_t handle);
|
||||
|
|
Loading…
Reference in a new issue