wip

Author: nift4

app/src/main/cpp/NativeTrack.cpp

@@ -24,8 +24,8 @@
 struct fake_sp {
     void* /* MUST be RefBase* (or compatible contract, but ymmv) */ thePtr;
 };
-// make sure to call RefBase::createWeak(thePtr, <arbitrary unique id>) and save returned pointer
-// to refs, then call RefBase::weakref_type::decWeak(refs) when you don't need it anymore
+// make sure to call RefBase::createWeak(thePtr, <unique id>) and save returned pointer to refs,
+// then call RefBase::weakref_type::decWeak(refs, <unique id>) when you don't need it anymore
 struct fake_wp {
     void* /* MUST be RefBase* */ thePtr;
     void* /* RefBase::weakref_type* */ refs;
@@ -94,27 +94,22 @@ namespace android {
     class RefBase {
     public:
         inline RefBase() {
-            ALOGI("fake base impl of ctor says hello");
             ZN7android7RefBaseC2Ev(this);
         }
 
         virtual inline ~RefBase() {
-            ALOGI("fake base impl of dtor says hello");
             ZN7android7RefBaseD2Ev(this);
         }
 
         inline void incStrong(void* id) {
-            ALOGI("fake base impl of incStrong says hello, this=%p id=%p", this, id);
             ZNK7android7RefBase9incStrongEPKv(this, id);
         }
 
         inline void decStrong(void* id) {
-            ALOGI("fake base impl of decStrong says hello");
             ZNK7android7RefBase9decStrongEPKv(this, id);
         }
 
         inline void* createWeak(void* id) {
-            ALOGI("fake base impl of createWeak says hello");
             return ZNK7android7RefBase10createWeakEPKv(this, id);
         }
 
@@ -220,21 +215,17 @@ namespace android {
 
 inline void android::RefBase::onFirstRef()
 {
-    ALOGI("fake base impl of onFirstRef says hello");
 }
 
 inline void android::RefBase::onLastStrongRef(const void*)
 {
-    ALOGI("fake base impl of onLastStrongRef says hello");
 }
 
 inline bool android::RefBase::onIncStrongAttempted(uint32_t flags, const void*)
 {
-    ALOGI("fake base impl of onIncStrongAttempted says hello");
     return flags & 1;
 }
 
 inline void android::RefBase::onLastWeakRef(const void*)
 {
-    ALOGI("fake base impl of onLastWeakRef says hello");
 }

app/src/main/cpp/aosp_stubs.h

@@ -307,10 +307,8 @@ Java_org_akanework_gramophone_logic_utils_AfFormatTracker_00024Companion_findAfF
         unsigned int generation1 = 0;
         unsigned int generation;
         unsigned int numPorts;
-        std::vector<audio_port_oreo> nPorts;
-        std::vector<audio_port_legacy> nPortsOld;
+        void* nPorts;
         int attempts = 5;
-
         // get the port count and all the ports until they both return the same generation
         do {
             if (attempts-- < 0) {
@@ -332,32 +330,39 @@ Java_org_akanework_gramophone_logic_utils_AfFormatTracker_00024Companion_findAfF
             }
             // Tuck on double the space to prevent heap corruption if OEM made the audio_port bigger
             if (oreo)
-                nPorts.resize(numPorts * 2);
+                nPorts = new std::vector<audio_port_oreo>(numPorts * 2);
             else
-                nPortsOld.resize(numPorts * 2);
+                nPorts = new std::vector<audio_port_legacy>(numPorts * 2);
 
             status = ZN7android11AudioSystem14listAudioPortsE17audio_port_role_t17audio_port_type_tPjP13audio_port_v7S3_(
                     LEGACY_AUDIO_PORT_ROLE_SOURCE, LEGACY_AUDIO_PORT_TYPE_MIX, &numPorts,
-                    oreo ? (void *) &nPorts[0] : (void *) &nPortsOld[0], &generation);
+                    oreo ? (void*)&(*(std::vector<audio_port_oreo>*)nPorts)[0] :
+                    (void*)&(*(std::vector<audio_port_legacy>*)nPorts)[0], &generation);
         } while (generation1 != generation && status == 0);
 
         int i = 0;
         if (oreo) {
-            for (auto port: nPorts) {
+            for (auto port: *(std::vector<audio_port_oreo>*)nPorts) {
                 if (i++ == numPorts) break; // needed because vector size > numPorts
                 ALOGE("found port %d named %s", port.id, port.name);
                 if (port.id == id) {
-                    return (int32_t) port.active_config.channel_mask;
+                    auto ret = (int32_t) port.active_config.channel_mask;
+                    delete (std::vector<audio_port_oreo>*)nPorts;
+                    return ret;
                 }
             }
+            delete (std::vector<audio_port_oreo>*)nPorts;
         } else {
-            for (auto port: nPortsOld) {
+            for (auto port: *(std::vector<audio_port_legacy>*)nPorts) {
                 if (i++ == numPorts) break; // needed because vector size > numPorts
                 ALOGE("found port %d named %s", port.id, port.name);
                 if (port.id == id) {
-                    return (int32_t) port.active_config.channel_mask;
+                    auto ret = (int32_t) port.active_config.channel_mask;
+                    delete (std::vector<audio_port_legacy>*)nPorts;
+                    return ret;
                 }
             }
+            delete (std::vector<audio_port_legacy>*)nPorts;
         }
         return INT32_MAX;
     }

app/src/main/cpp/gramophone.cpp

@@ -601,19 +601,19 @@ class AfFormatTracker(
         private set
     var formatChangedCallback: ((AfFormatInfo?) -> Unit)? = null
 
-    private val routingChangedListener: Any? = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+    private val routingChangedListener = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
         object : AudioRouting.OnRoutingChangedListener {
             override fun onRoutingChanged(router: AudioRouting) {
                 this@AfFormatTracker.onRoutingChanged(router as AudioTrack)
             }
-        }
+        } as Any
     } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
         @Suppress("deprecation")
         object : AudioTrack.OnRoutingChangedListener {
             override fun onRoutingChanged(router: AudioTrack) {
                 this@AfFormatTracker.onRoutingChanged(router)
             }
-        }
+        } as Any
     } else null
 
     private fun onRoutingChanged(router: AudioTrack) {

app/src/main/kotlin/org/akanework/gramophone/logic/utils/AfFormatTracker.kt

@@ -52,7 +52,8 @@ class NativeTrack(context: Context) {
     private external fun getRealPtr(@Suppress("unused") ptr: Long): Long
     private external fun dtor(@Suppress("unused") ptr: Long)
     fun set(): Boolean {
-        //doSet(ptr)
+        // TODO assert maxRequiredSpeed==1.0f on L
+        doSet(ptr, 3, 13370, 1, 3, 0, 0, 0, 1.0f, 0, 0, 0, false, false, 16, 0, 1, 0, 0, 0, 2, 0, 0, "", 0, false, 3)
         Log.e("hi", "dump:${AfFormatTracker.dumpInternal(getRealPtr(ptr))}")
         return myState == State.ALIVE
     }

app/src/main/kotlin/org/akanework/gramophone/logic/utils/NativeTrack.kt

@@ -21,6 +21,7 @@ kotlin.code.style=official
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
+android.nonFinalResIds=true
 # Generate compile-time only R class for app modules
 android.enableAppCompileTimeRClass=true
 # Only keep the single relevant constructor for types mentioned in XML files