wip

Author: nift4

app/src/main/cpp/NativeTrack.cpp

@@ -581,8 +581,8 @@ Java_org_akanework_gramophone_logic_utils_NativeTrack_set(
         jint channelMask, jint frameCount, jint trackFlags, jint sessionId, jfloat maxRequiredSpeed,
         jint selectedDeviceId, jint bitRate, jlong durationUs, jboolean hasVideo, jboolean smallBuf,
         jboolean isStreaming, jint bitWidth, jint offloadBufferSize, jint usage, jint contentType,
-        jint attrFlags, jint notificationFrames,
-        jboolean doNotReconnect, jint transferMode) {
+        jint attrFlags, jint notificationFrames, jboolean doNotReconnect, jint transferMode,
+        jint contentId, jint syncId, jint encapsulationMode) {
     if (android_get_device_api_level() < 23 && maxRequiredSpeed != 1.0f) {
         ALOGE("Android 5.x does not support speed adjustment, maxRequiredSpeed != 1f is wrong");
         return INT32_MIN;
@@ -591,6 +591,10 @@ Java_org_akanework_gramophone_logic_utils_NativeTrack_set(
         ALOGE("Android 5.x does not support selected devices, selectedDeviceId != 0 is wrong");
         return INT32_MIN;
     }
+    if (android_get_device_api_level() < 30 && (contentId != 0 || syncId != 0)) {
+        ALOGE("Tuner supported since Android 11.x, (contentId != 0 || syncId != 0) is wrong");
+        return INT32_MIN;
+    }
     auto holder = (track_holder*) ptr;
     jint ret = 0;
     fake_sp sharedMemory = {.thePtr = nullptr}; // TODO impl shared memory
@@ -621,9 +625,9 @@ Java_org_akanework_gramophone_logic_utils_NativeTrack_set(
                 .bit_width = (uint32_t)bitWidth,
                 .offload_buffer_size = (uint32_t)offloadBufferSize,
                 .usage = usage,
-                .encapsulation_mode = 0, // tuner
-                .content_id = 0, // tuner
-                .sync_id = 0, // tuner
+                .encapsulation_mode = encapsulationMode, // tuner
+                .content_id = contentType, // tuner
+                .sync_id = syncId, // tuner
         };
         audioAttributes.newAttrs = {
                 .content_type = contentType,

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

@@ -8,6 +8,7 @@ import android.media.AudioManager
 import android.media.AudioMetadataReadMap
 import android.media.AudioRouting
 import android.media.AudioTrack
+import android.media.VolumeShaper
 import android.os.Build
 import android.os.Parcel
 import android.util.Log
@@ -19,15 +20,15 @@ import java.nio.ByteBuffer
 
 /*
  * Exposes entire API surface of AudioTrack.cpp, with some minor exceptions:
- * - Tuner API related features TODO let's bring that back
  * - setCallerName/getCallerName because I want to avoid offset hardcoding, and it's only used for metrics
  * None of those will impose any limitations for music playback.
  */
 class NativeTrack(context: Context, attributes: AudioAttributes, streamType: Int, sampleRate: Int,
                   format: AudioFormatDetector.Encoding, channelMask: Int, frameCount: Int?, trackFlags: Int,
                   sessionId: Int, maxRequiredSpeed: Float, selectedDeviceId: Int?, bitRate: Int, durationUs: Long,
                   hasVideo: Boolean, smallBuf: Boolean, isStreaming: Boolean, offloadBufferSize: Int,
-                  notificationFrames: Int, doNotReconnect: Boolean, transferMode: Int) {
+                  notificationFrames: Int, doNotReconnect: Boolean, transferMode: Int, contentId: Int, syncId: Int,
+                  encapsulationMode: Int) {
     companion object {
         private const val TAG = "NativeTrack.kt"
 
@@ -213,22 +214,27 @@ class NativeTrack(context: Context, attributes: AudioAttributes, streamType: Int
                 offloadBufferSize = 0,
                 notificationFrames = 0,
                 doNotReconnect = false,
-                transferMode = 3
+                transferMode = 3,
+                contentId = 0,
+                syncId = 0,
+                encapsulationMode = 0
             )
         }
     }
     private var sessionId: Int
     val ptr: Long
     var myState: State
-    // proxy limitations: a lot of fields not initialized (mSampleRate, mAudioFormat, mChannelMask, ...) which can
-    // cause some internal checks in various methods to fail; stream event callback is no-op. however, it does:
+    // proxy limitations: a lot of fields not initialized (mSampleRate, mAudioFormat, mOffloaded, ...) which can
+    // cause some internal checks in various methods to fail; stream event and playback position callbacks both
+    // are no-op; we MUST call play(), pause(), stop() and don't use the native methods ourselves for this to work;
+    // we must also not cache playing/paused/stopped/volume ourselves because it may change under our feet.
+    // however, it does:
     // - register (and overwrite) any codec format listeners on native side ; good for us because we can't register
     //   one in a normal way due to dependence on volatile offsets. i.e. with proxy we get codec format listeners!
     // - register player base (which we really should have on N+ to be a nice citizen and have stuff like ducking)
     // - register (and overwrite) routing callback, which is meh but we can just use the java one, it don't hurt
-    // - volume shapers! these would be near-impossible using the native API because it's all inline.
+    // - allow for volume shapers! these would be near-impossible using the native API because it's all inline.
     // it's a bit fiddly, but we get all possibilities of a native AudioTrack and a Java one - combined.
-    // however: we MUST call play(), pause(), stop() and don't use the native methods ourselves for this to work.
     // reminder: do not call write() or any other standard APIs as we break a lot of assumptions. + proxy is not
     //  always available (i.e. L/M), hence native methods are preferable where we can.
     private val proxy: AudioTrack?
@@ -304,7 +310,8 @@ class NativeTrack(context: Context, attributes: AudioAttributes, streamType: Int
                 hasVideo = hasVideo, smallBuf = smallBuf, isStreaming = isStreaming, bitWidth = bitWidth,
                 offloadBufferSize = offloadBufferSize, usage = usage, contentType = contentType,
                 attrFlags = attrFlags, notificationFrames = notificationFrames, doNotReconnect = doNotReconnect,
-                transferMode = transferMode)
+                transferMode = transferMode, contentId = contentId, syncId = syncId,
+                encapsulationMode = encapsulationMode)
         } catch (t: Throwable) {
             try {
                 dtor(ptr)
@@ -377,7 +384,8 @@ class NativeTrack(context: Context, attributes: AudioAttributes, streamType: Int
                              selectedDeviceId: Int, bitRate: Int, durationUs: Long, hasVideo: Boolean,
                              smallBuf: Boolean, isStreaming: Boolean, bitWidth: Int, offloadBufferSize: Int,
                              usage: Int, contentType: Int, attrFlags: Int, notificationFrames: Int,
-                             doNotReconnect: Boolean, transferMode: Int): Int
+                             doNotReconnect: Boolean, transferMode: Int, contentId: Int, syncId: Int,
+                             encapsulationMode: Int): Int
     private external fun getRealPtr(@Suppress("unused") ptr: Long): Long
     private external fun flagsFromOffset(@Suppress("unused") ptr: Long): Int
     private external fun notificationFramesActFromOffset(@Suppress("unused") ptr: Long): Int
@@ -479,6 +487,11 @@ class NativeTrack(context: Context, attributes: AudioAttributes, streamType: Int
         return channelCount() * bps
     }
 
+    @RequiresApi(Build.VERSION_CODES.O)
+    fun createVolumeShaper(config: VolumeShaper.Configuration): VolumeShaper {
+        return proxy!!.createVolumeShaper(config)
+    }
+
     class NativeTrackException : Exception {
         constructor(message: String) : super(message)
         constructor(message: String, cause: Throwable) : super(message, cause)