More stupid stuff

Author: iscle

CMakeLists.txt

@@ -23,133 +23,135 @@ include_directories(
 
 # AIDL
 set(AIDL_SRC
-        generated/android/media/audio/common/AudioPortDeviceExt.cpp
-        generated/android/media/audio/common/AudioProfile.cpp
-        generated/android/media/audio/common/AudioUsage.cpp
-        generated/android/media/audio/common/HeadTracking.cpp
-        generated/android/media/audio/common/AudioFormatDescription.cpp
-        generated/android/media/audio/common/AudioHalCapCriterion.cpp
-        generated/android/media/audio/common/AudioMMapPolicyType.cpp
-        generated/android/media/audio/common/AudioPolicyForceUse.cpp
-        generated/android/media/audio/common/AudioSource.cpp
-        generated/android/media/audio/common/AudioDualMonoMode.cpp
-        generated/android/media/audio/common/AudioPortExt.cpp
-        generated/android/media/audio/common/AudioDeviceAddress.cpp
-        generated/android/media/audio/common/PcmType.cpp
-        generated/android/media/audio/common/AudioDeviceType.cpp
-        generated/android/media/audio/common/AudioFlag.cpp
-        generated/android/media/audio/common/AudioMode.cpp
-        generated/android/media/audio/common/AudioGainMode.cpp
-        generated/android/media/audio/common/AudioGain.cpp
-        generated/android/media/audio/common/AudioConfig.cpp
-        generated/android/media/audio/common/AudioHalCapCriterionV2.cpp
-        generated/android/media/audio/common/MicrophoneDynamicInfo.cpp
-        generated/android/media/audio/common/AudioConfigBase.cpp
-        generated/android/media/audio/common/Float.cpp
-        generated/android/media/audio/common/AudioAttributes.cpp
-        generated/android/media/audio/common/Spatialization.cpp
-        generated/android/media/audio/common/AudioUuid.cpp
-        generated/android/media/audio/common/Double.cpp
-        generated/android/media/audio/common/AudioMMapPolicyInfo.cpp
-        generated/android/media/audio/common/AudioVolumeGroupChangeEvent.cpp
-        generated/android/media/audio/common/AudioIoFlags.cpp
-        generated/android/media/audio/common/AudioDeviceDescription.cpp
-        generated/android/media/audio/common/AudioHalVolumeCurve.cpp
-        generated/android/media/audio/common/AudioEncapsulationMetadataType.cpp
-        generated/android/media/audio/common/AudioHalCapParameter.cpp
-        generated/android/media/audio/common/ExtraAudioDescriptor.cpp
-        generated/android/media/audio/common/MicrophoneInfo.cpp
-        generated/android/media/audio/common/AudioHalVolumeGroup.cpp
-        generated/android/media/audio/common/AudioGainConfig.cpp
-        generated/android/media/audio/common/AudioHalCapConfiguration.cpp
-        generated/android/media/audio/common/AudioLatencyMode.cpp
-        generated/android/media/audio/common/AudioEncapsulationMode.cpp
-        generated/android/media/audio/common/AudioFormatType.cpp
-        generated/android/media/audio/common/AudioPort.cpp
-        generated/android/media/audio/common/Boolean.cpp
-        generated/android/media/audio/common/AudioHalEngineConfig.cpp
-        generated/android/media/audio/common/Int.cpp
-        generated/android/media/audio/common/AudioHalAttributesGroup.cpp
-        generated/android/media/audio/common/AudioStreamType.cpp
-        generated/android/media/audio/common/AudioPortConfig.cpp
-        generated/android/media/audio/common/Void.cpp
-        generated/android/media/audio/common/Long.cpp
-        generated/android/media/audio/common/AudioHalCapDomain.cpp
-        generated/android/media/audio/common/Byte.cpp
-        generated/android/media/audio/common/AudioHalCapRule.cpp
-        generated/android/media/audio/common/AudioStandard.cpp
-        generated/android/media/audio/common/AudioMMapPolicy.cpp
-        generated/android/media/audio/common/AudioHalCapCriterionType.cpp
-        generated/android/media/audio/common/AudioPortMixExt.cpp
-        generated/android/media/audio/common/AudioOutputFlags.cpp
-        generated/android/media/audio/common/AudioHalProductStrategy.cpp
-        generated/android/media/audio/common/AudioChannelLayout.cpp
-        generated/android/media/audio/common/AudioDevice.cpp
-        generated/android/media/audio/common/AudioPlaybackRate.cpp
-        generated/android/media/audio/common/AudioPortMixExtUseCase.cpp
-        generated/android/media/audio/common/AudioEncapsulationType.cpp
-        generated/android/media/audio/common/AudioOffloadInfo.cpp
-        generated/android/media/audio/common/AudioProductStrategyType.cpp
-        generated/android/media/audio/common/AudioContentType.cpp
-        generated/android/media/audio/common/AudioInputFlags.cpp
-
-        generated/android/media/audio/eraser/Configuration.cpp
-        generated/android/media/audio/eraser/Classification.cpp
-        generated/android/media/audio/eraser/ClassificationConfig.cpp
-        generated/android/media/audio/eraser/Capability.cpp
-        generated/android/media/audio/eraser/SeparatorCapability.cpp
-        generated/android/media/audio/eraser/IEraserCallback.cpp
-        generated/android/media/audio/eraser/SoundClassification.cpp
-        generated/android/media/audio/eraser/RemixerCapability.cpp
-        generated/android/media/audio/eraser/Mode.cpp
-        generated/android/media/audio/eraser/ClassificationMetadataList.cpp
-        generated/android/media/audio/eraser/ClassifierCapability.cpp
-        generated/android/media/audio/eraser/ClassificationMetadata.cpp
-
-        generated/android/hardware/audio/effect/BassBoost.cpp
-        generated/android/hardware/audio/effect/AutomaticGainControlV2.cpp
-        generated/android/hardware/audio/effect/PresetReverb.cpp
-        generated/android/hardware/audio/effect/Descriptor.cpp
-        generated/android/hardware/audio/effect/Downmix.cpp
-        generated/android/hardware/audio/effect/Virtualizer.cpp
-        generated/android/hardware/audio/effect/Processing.cpp
-        generated/android/hardware/audio/effect/LoudnessEnhancer.cpp
-        generated/android/hardware/audio/effect/Range.cpp
-        generated/android/hardware/audio/effect/Volume.cpp
-        generated/android/hardware/audio/effect/AcousticEchoCanceler.cpp
-        generated/android/hardware/audio/effect/Capability.cpp
-        generated/android/hardware/audio/effect/VendorExtension.cpp
-        generated/android/hardware/audio/effect/Visualizer.cpp
-        generated/android/hardware/audio/effect/Flags.cpp
-        generated/android/hardware/audio/effect/NoiseSuppression.cpp
-        generated/android/hardware/audio/effect/CommandId.cpp
-        generated/android/hardware/audio/effect/AutomaticGainControlV1.cpp
-        generated/android/hardware/audio/effect/EnvironmentalReverb.cpp
-        generated/android/hardware/audio/effect/Equalizer.cpp
-        generated/android/hardware/audio/effect/Parameter.cpp
-        generated/android/hardware/audio/effect/HapticGenerator.cpp
-        generated/android/hardware/audio/effect/Eraser.cpp
-        generated/android/hardware/audio/effect/State.cpp
-        generated/android/hardware/audio/effect/IFactory.cpp
-        generated/android/hardware/audio/effect/Spatializer.cpp
-        generated/android/hardware/audio/effect/DynamicsProcessing.cpp
-        generated/android/hardware/audio/effect/DefaultExtension.cpp
-        generated/android/hardware/audio/effect/IEffect.cpp
-
-        generated/android/hardware/audio/common/AudioOffloadMetadata.cpp
-        generated/android/hardware/audio/common/SinkMetadata.cpp
-        generated/android/hardware/audio/common/PlaybackTrackMetadata.cpp
-        generated/android/hardware/audio/common/SourceMetadata.cpp
-        generated/android/hardware/audio/common/RecordTrackMetadata.cpp
-
-        generated/android/hardware/common/Ashmem.cpp
-        generated/android/hardware/common/NativeHandle.cpp
-        generated/android/hardware/common/MappableFile.cpp
-
-        generated/android/hardware/common/fmq/MQDescriptor.cpp
-        generated/android/hardware/common/fmq/SynchronizedReadWrite.cpp
-        generated/android/hardware/common/fmq/GrantorDescriptor.cpp
-        generated/android/hardware/common/fmq/UnsynchronizedWrite.cpp)
+        generated/android/media/audio/common/v1/AudioUuid.cpp
+
+        src/android/media/audio/common/AudioPortDeviceExt.cpp
+        src/android/media/audio/common/AudioProfile.cpp
+        src/android/media/audio/common/AudioUsage.cpp
+        src/android/media/audio/common/HeadTracking.cpp
+        src/android/media/audio/common/AudioFormatDescription.cpp
+        src/android/media/audio/common/AudioHalCapCriterion.cpp
+        src/android/media/audio/common/AudioMMapPolicyType.cpp
+        src/android/media/audio/common/AudioPolicyForceUse.cpp
+        src/android/media/audio/common/AudioSource.cpp
+        src/android/media/audio/common/AudioDualMonoMode.cpp
+        src/android/media/audio/common/AudioPortExt.cpp
+        src/android/media/audio/common/AudioDeviceAddress.cpp
+        src/android/media/audio/common/PcmType.cpp
+        src/android/media/audio/common/AudioDeviceType.cpp
+        src/android/media/audio/common/AudioFlag.cpp
+        src/android/media/audio/common/AudioMode.cpp
+        src/android/media/audio/common/AudioGainMode.cpp
+        src/android/media/audio/common/AudioGain.cpp
+        src/android/media/audio/common/AudioConfig.cpp
+        src/android/media/audio/common/AudioHalCapCriterionV2.cpp
+        src/android/media/audio/common/MicrophoneDynamicInfo.cpp
+        src/android/media/audio/common/AudioConfigBase.cpp
+        src/android/media/audio/common/Float.cpp
+        src/android/media/audio/common/AudioAttributes.cpp
+        src/android/media/audio/common/Spatialization.cpp
+        src/android/media/audio/common/AudioUuid.cpp
+        src/android/media/audio/common/Double.cpp
+        src/android/media/audio/common/AudioMMapPolicyInfo.cpp
+        src/android/media/audio/common/AudioVolumeGroupChangeEvent.cpp
+        src/android/media/audio/common/AudioIoFlags.cpp
+        src/android/media/audio/common/AudioDeviceDescription.cpp
+        src/android/media/audio/common/AudioHalVolumeCurve.cpp
+        src/android/media/audio/common/AudioEncapsulationMetadataType.cpp
+        src/android/media/audio/common/AudioHalCapParameter.cpp
+        src/android/media/audio/common/ExtraAudioDescriptor.cpp
+        src/android/media/audio/common/MicrophoneInfo.cpp
+        src/android/media/audio/common/AudioHalVolumeGroup.cpp
+        src/android/media/audio/common/AudioGainConfig.cpp
+        src/android/media/audio/common/AudioHalCapConfiguration.cpp
+        src/android/media/audio/common/AudioLatencyMode.cpp
+        src/android/media/audio/common/AudioEncapsulationMode.cpp
+        src/android/media/audio/common/AudioFormatType.cpp
+        src/android/media/audio/common/AudioPort.cpp
+        src/android/media/audio/common/Boolean.cpp
+        src/android/media/audio/common/AudioHalEngineConfig.cpp
+        src/android/media/audio/common/Int.cpp
+        src/android/media/audio/common/AudioHalAttributesGroup.cpp
+        src/android/media/audio/common/AudioStreamType.cpp
+        src/android/media/audio/common/AudioPortConfig.cpp
+        src/android/media/audio/common/Void.cpp
+        src/android/media/audio/common/Long.cpp
+        src/android/media/audio/common/AudioHalCapDomain.cpp
+        src/android/media/audio/common/Byte.cpp
+        src/android/media/audio/common/AudioHalCapRule.cpp
+        src/android/media/audio/common/AudioStandard.cpp
+        src/android/media/audio/common/AudioMMapPolicy.cpp
+        src/android/media/audio/common/AudioHalCapCriterionType.cpp
+        src/android/media/audio/common/AudioPortMixExt.cpp
+        src/android/media/audio/common/AudioOutputFlags.cpp
+        src/android/media/audio/common/AudioHalProductStrategy.cpp
+        src/android/media/audio/common/AudioChannelLayout.cpp
+        src/android/media/audio/common/AudioDevice.cpp
+        src/android/media/audio/common/AudioPlaybackRate.cpp
+        src/android/media/audio/common/AudioPortMixExtUseCase.cpp
+        src/android/media/audio/common/AudioEncapsulationType.cpp
+        src/android/media/audio/common/AudioOffloadInfo.cpp
+        src/android/media/audio/common/AudioProductStrategyType.cpp
+        src/android/media/audio/common/AudioContentType.cpp
+        src/android/media/audio/common/AudioInputFlags.cpp
+
+        src/android/media/audio/eraser/Configuration.cpp
+        src/android/media/audio/eraser/Classification.cpp
+        src/android/media/audio/eraser/ClassificationConfig.cpp
+        src/android/media/audio/eraser/Capability.cpp
+        src/android/media/audio/eraser/SeparatorCapability.cpp
+        src/android/media/audio/eraser/IEraserCallback.cpp
+        src/android/media/audio/eraser/SoundClassification.cpp
+        src/android/media/audio/eraser/RemixerCapability.cpp
+        src/android/media/audio/eraser/Mode.cpp
+        src/android/media/audio/eraser/ClassificationMetadataList.cpp
+        src/android/media/audio/eraser/ClassifierCapability.cpp
+        src/android/media/audio/eraser/ClassificationMetadata.cpp
+
+        src/android/hardware/audio/effect/BassBoost.cpp
+        src/android/hardware/audio/effect/AutomaticGainControlV2.cpp
+        src/android/hardware/audio/effect/PresetReverb.cpp
+        src/android/hardware/audio/effect/Descriptor.cpp
+        src/android/hardware/audio/effect/Downmix.cpp
+        src/android/hardware/audio/effect/Virtualizer.cpp
+        src/android/hardware/audio/effect/Processing.cpp
+        src/android/hardware/audio/effect/LoudnessEnhancer.cpp
+        src/android/hardware/audio/effect/Range.cpp
+        src/android/hardware/audio/effect/Volume.cpp
+        src/android/hardware/audio/effect/AcousticEchoCanceler.cpp
+        src/android/hardware/audio/effect/Capability.cpp
+        src/android/hardware/audio/effect/VendorExtension.cpp
+        src/android/hardware/audio/effect/Visualizer.cpp
+        src/android/hardware/audio/effect/Flags.cpp
+        src/android/hardware/audio/effect/NoiseSuppression.cpp
+        src/android/hardware/audio/effect/CommandId.cpp
+        src/android/hardware/audio/effect/AutomaticGainControlV1.cpp
+        src/android/hardware/audio/effect/EnvironmentalReverb.cpp
+        src/android/hardware/audio/effect/Equalizer.cpp
+        src/android/hardware/audio/effect/Parameter.cpp
+        src/android/hardware/audio/effect/HapticGenerator.cpp
+        src/android/hardware/audio/effect/Eraser.cpp
+        src/android/hardware/audio/effect/State.cpp
+        src/android/hardware/audio/effect/IFactory.cpp
+        src/android/hardware/audio/effect/Spatializer.cpp
+        src/android/hardware/audio/effect/DynamicsProcessing.cpp
+        src/android/hardware/audio/effect/DefaultExtension.cpp
+        src/android/hardware/audio/effect/IEffect.cpp
+
+        src/android/hardware/audio/common/AudioOffloadMetadata.cpp
+        src/android/hardware/audio/common/SinkMetadata.cpp
+        src/android/hardware/audio/common/PlaybackTrackMetadata.cpp
+        src/android/hardware/audio/common/SourceMetadata.cpp
+        src/android/hardware/audio/common/RecordTrackMetadata.cpp
+
+        src/android/hardware/common/Ashmem.cpp
+        src/android/hardware/common/NativeHandle.cpp
+        src/android/hardware/common/MappableFile.cpp
+
+        src/android/hardware/common/fmq/MQDescriptor.cpp
+        src/android/hardware/common/fmq/SynchronizedReadWrite.cpp
+        src/android/hardware/common/fmq/GrantorDescriptor.cpp
+        src/android/hardware/common/fmq/UnsynchronizedWrite.cpp)
 
 include_directories(generated/include)
 
@@ -159,6 +161,7 @@ include_directories(src/include)
 set(FILES
         # Shim
         src/shim.cpp
+        src/AidlVersions.cpp
 
         # Main
         src/aidl/EffectThread.cpp

…android/media/audio/common/AudioUuid.cpp …roid/media/audio/common/v1/AudioUuid.cppgenerated/android/media/audio/common/AudioUuid.cpp renamed to generated/android/media/audio/common/v1/AudioUuid.cpp generated/android/media/audio/common/AudioUuid.cpp renamed to generated/android/media/audio/common/v1/AudioUuid.cpp

@@ -2,7 +2,7 @@
  * This file is auto-generated.  DO NOT MODIFY.
  * Using: /home/iscle/Android/Sdk/build-tools/35.0.1/aidl --lang=ndk -o generated -h generated/include --structured --stability=vintf --min_sdk_version=31 -I hardware_interfaces/common/aidl/aidl_api/android.hardware.common/current/ -I hardware_interfaces/common/fmq/aidl/aidl_api/android.hardware.common.fmq/current/ -I hardware_interfaces/audio/aidl/aidl_api/android.hardware.audio.common/current/ -I hardware_interfaces/audio/aidl/aidl_api/android.hardware.audio.effect/current/ -I system_hardware_interfaces/media/aidl_api/android.media.audio.common.types/current/ -I system_hardware_interfaces/media/aidl_api/android.media.audio.eraser.types/current/ system_hardware_interfaces/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioUuid.aidl
  */
-#include "aidl/android/media/audio/common/AudioUuid.h"
+#include <aidl/android/media/audio/common/v1/AudioUuid.h>
 
 #include <android/binder_parcel_utils.h>
 
@@ -11,6 +11,7 @@ namespace android {
 namespace media {
 namespace audio {
 namespace common {
+namespace v1 {
 const char* AudioUuid::descriptor = "android.media.audio.common.AudioUuid";
 
 binder_status_t AudioUuid::readFromParcel(const AParcel* _aidl_parcel) {
@@ -88,6 +89,7 @@ binder_status_t AudioUuid::writeToParcel(AParcel* _aidl_parcel) const {
   return _aidl_ret_status;
 }
 
+}  // namespace v1
 }  // namespace common
 }  // namespace audio
 }  // namespace media

…l/android/media/audio/common/AudioUuid.h …ndroid/media/audio/common/v1/AudioUuid.hgenerated/include/aidl/android/media/audio/common/AudioUuid.h renamed to generated/include/aidl/android/media/audio/common/v1/AudioUuid.h generated/include/aidl/android/media/audio/common/AudioUuid.h renamed to generated/include/aidl/android/media/audio/common/v1/AudioUuid.h

@@ -21,6 +21,7 @@ namespace android {
 namespace media {
 namespace audio {
 namespace common {
+namespace v1 {
 class AudioUuid {
 public:
   typedef std::false_type fixed_size;
@@ -67,6 +68,7 @@ class AudioUuid {
     return _aidl_os.str();
   }
 };
+}  // namespace v1
 }  // namespace common
 }  // namespace audio
 }  // namespace media

src/AidlVersions.cpp

@@ -0,0 +1,71 @@
+#include "AidlVersions.h"
+#include "log/log.h"
+#include <string>
+#include <dlfcn.h>
+
+void AidlVersions::init() {
+    char tmp[128];
+
+    ALOGD("AidlVersions::init()");
+
+    for (uint32_t i = ANDROID_HARDWARE_AUDIO_EFFECT_MAX_VERSION; i > 0; i--) {
+        snprintf(tmp, sizeof(tmp), "android.hardware.audio.effect-V%u-ndk.so", i);
+        void *handle = dlopen(tmp, RTLD_LAZY);
+        if (handle) {
+            ALOGD("Found android.hardware.audio.effect-V%u-ndk.so", i);
+            androidHardwareAudioEffectVersion = i;
+            dlclose(handle);
+            break;
+        }
+    }
+    if (androidHardwareAudioEffectVersion == 0) {
+        ALOGE("Failed to find android.hardware.audio.effect version!");
+    }
+
+    for (uint32_t i = ANDROID_HARDWARE_COMMON_MAX_VERSION; i > 0; i--) {
+        snprintf(tmp, sizeof(tmp), "android.hardware.common-V%u-ndk.so", i);
+        void *handle = dlopen(tmp, RTLD_LAZY);
+        if (handle) {
+            ALOGD("Found android.hardware.common-V%u-ndk.so", i);
+            androidHardwareCommonVersion = i;
+            dlclose(handle);
+            break;
+        }
+    }
+    if (androidHardwareCommonVersion == 0) {
+        ALOGE("Failed to find android.hardware.common version!");
+    }
+
+    for (uint32_t i = ANDROID_HARDWARE_COMMON_FMQ_MAX_VERSION; i > 0; i--) {
+        snprintf(tmp, sizeof(tmp), "android.hardware.common.fmq-V%u-ndk.so", i);
+        void *handle = dlopen(tmp, RTLD_LAZY);
+        if (handle) {
+            ALOGD("Found android.hardware.common.fmq-V%u-ndk.so", i);
+            androidHardwareCommonFmqVersion = i;
+            dlclose(handle);
+            break;
+        }
+    }
+    if (androidHardwareCommonFmqVersion == 0) {
+        ALOGE("Failed to find android.hardware.common.fmq version!");
+    }
+
+    for (uint32_t i = ANDROID_MEDIA_AUDIO_COMMON_TYPES_MAX_VERSION; i > 0; i--) {
+        snprintf(tmp, sizeof(tmp), "android.media.audio.common.types-V%u-ndk.so", i);
+        void *handle = dlopen(tmp, RTLD_LAZY);
+        if (handle) {
+            ALOGD("Found android.media.audio.common.types-V%u-ndk.so", i);
+            androidMediaAudioCommonTypesVersion = i;
+            dlclose(handle);
+            break;
+        }
+    }
+    if (androidMediaAudioCommonTypesVersion == 0) {
+        ALOGE("Failed to find android.media.audio.common.types version!");
+    }
+}
+
+__attribute__((constructor))
+void aidl_versions_init() {
+    AidlVersions::init();
+}