More stupid stuff

src/AidlVersions.cpp

@@ -3,11 +3,32 @@
 #include <string>
 #include <dlfcn.h>
 
-void AidlVersions::init() {
+AidlVersions::AidlVersions() {
-    char tmp[128];
-
     ALOGD("AidlVersions::init()");
+    findAndroidHardwareAudioCommonVersion();
+    findAndroidHardwareAudioEffectVersion();
+    findAndroidHardwareCommonVersion();
+    findAndroidHardwareCommonFmqVersion();
+    findAndroidMediaAudioCommonTypesVersion();
+    findAndroidMediaAudioEraserTypesVersion();
+}
 
+void AidlVersions::findAndroidHardwareAudioCommonVersion() {
+    char tmp[128];
+    for (uint32_t i = ANDROID_HARDWARE_AUDIO_COMMON_MAX_VERSION; i > 0; i--) {
+        snprintf(tmp, sizeof(tmp), "android.hardware.audio.common-V%u-ndk.so", i);
+        void *handle = dlopen(tmp, RTLD_LAZY);
+        if (handle) {
+            ALOGD("Found android.hardware.audio.common-V%u-ndk.so", i);
+            androidHardwareAudioCommonVersion = i;
+            dlclose(handle);
+            break;
+        }
+    }
+}
+
+void AidlVersions::findAndroidHardwareAudioEffectVersion() {
+    char tmp[128];
     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);
@@ -21,7 +42,10 @@ void AidlVersions::init() {
     if (androidHardwareAudioEffectVersion == 0) {
         ALOGE("Failed to find android.hardware.audio.effect version!");
     }
+}
 
+void AidlVersions::findAndroidHardwareCommonVersion() {
+    char tmp[128];
     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);
@@ -35,7 +59,10 @@ void AidlVersions::init() {
     if (androidHardwareCommonVersion == 0) {
         ALOGE("Failed to find android.hardware.common version!");
     }
+}
 
+void AidlVersions::findAndroidHardwareCommonFmqVersion() {
+    char tmp[128];
     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);
@@ -49,7 +76,10 @@ void AidlVersions::init() {
     if (androidHardwareCommonFmqVersion == 0) {
         ALOGE("Failed to find android.hardware.common.fmq version!");
     }
+}
 
+void AidlVersions::findAndroidMediaAudioCommonTypesVersion() {
+    char tmp[128];
     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);
@@ -65,7 +95,7 @@ void AidlVersions::init() {
     }
 }
 
-__attribute__((constructor))
+void AidlVersions::findAndroidMediaAudioEraserTypesVersion() {
-void aidl_versions_init() {
+    char tmp[128];
-    AidlVersions::init();
+    // TODO
 }

src/AidlVersions.h

@@ -4,19 +4,31 @@
 
 class AidlVersions {
 public:
-    const static uint32_t ANDROID_HARDWARE_AUDIO_COMMON_MAX_VERSION = 1;
+    const static uint32_t ANDROID_HARDWARE_AUDIO_COMMON_MAX_VERSION = 5;
-    const static uint32_t ANDROID_HARDWARE_AUDIO_EFFECT_MAX_VERSION = 3;
+    const static uint32_t ANDROID_HARDWARE_AUDIO_EFFECT_MAX_VERSION = 4;
-    const static uint32_t ANDROID_HARDWARE_COMMON_MAX_VERSION = 1;
+    const static uint32_t ANDROID_HARDWARE_COMMON_MAX_VERSION = 3;
-    const static uint32_t ANDROID_HARDWARE_COMMON_FMQ_MAX_VERSION = 1;
+    const static uint32_t ANDROID_HARDWARE_COMMON_FMQ_MAX_VERSION = 2;
-    const static uint32_t ANDROID_MEDIA_AUDIO_COMMON_TYPES_MAX_VERSION = 4;
+    const static uint32_t ANDROID_MEDIA_AUDIO_COMMON_TYPES_MAX_VERSION = 5;
-    const static uint32_t ANDROID_MEDIA_AUDIO_ERASER_TYPES_MAX_VERSION = 1;
+    const static uint32_t ANDROID_MEDIA_AUDIO_ERASER_TYPES_MAX_VERSION = 2;
 
-    static void init();
+    uint32_t androidHardwareAudioCommonVersion = 0;
+    uint32_t androidHardwareAudioEffectVersion = 0;
+    uint32_t androidHardwareCommonVersion = 0;
+    uint32_t androidHardwareCommonFmqVersion = 0;
+    uint32_t androidMediaAudioCommonTypesVersion = 0;
+    uint32_t androidMediaAudioEraserTypesVersion = 0;
 
-    static inline uint32_t androidHardwareAudioCommonVersion = 0;
+    static inline AidlVersions &instance() {
-    static inline uint32_t androidHardwareAudioEffectVersion = 0;
+        static AidlVersions instance;
-    static inline uint32_t androidHardwareCommonVersion = 0;
+        return instance;
-    static inline uint32_t androidHardwareCommonFmqVersion = 0;
+    }
-    static inline uint32_t androidMediaAudioCommonTypesVersion = 0;
+private:
-    static inline uint32_t androidMediaAudioEraserTypesVersion = 0;
+    AidlVersions();
+
+    void findAndroidHardwareAudioCommonVersion();
+    void findAndroidHardwareAudioEffectVersion();
+    void findAndroidHardwareCommonVersion();
+    void findAndroidHardwareCommonFmqVersion();
+    void findAndroidMediaAudioCommonTypesVersion();
+    void findAndroidMediaAudioEraserTypesVersion();
 };

src/include/android/media/audio/common/AudioUuid.h

@@ -64,7 +64,7 @@ public:
         return !(_rhs < *this);
     }
 private:
-    uint32_t version = AidlVersions::androidMediaAudioCommonTypesVersion;
+    uint32_t version = AidlVersions::instance().androidMediaAudioCommonTypesVersion;
     v1::AudioUuid *uuid_v1 = (v1::AudioUuid *) this;
 };
 } // namespace android::media::audio::common