fix: apply multiple changes from integrations, refactor package structure, class names and implementations

2022-11-05 06:30:31 +01:00
parent e17f476c46
commit 80ab1592c3
28 changed files with 254 additions and 209 deletions
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.playback.annotations
+package app.revanced.patches.youtube.misc.playback.fix.annotations

 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.playback.patch
+package app.revanced.patches.youtube.misc.playback.fix.patch

 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
@@ -9,16 +9,16 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.playback.annotations.FixPlaybackCompatibility
-import app.revanced.patches.youtube.misc.playercontroller.patch.PlayerControllerPatch
+import app.revanced.patches.youtube.misc.playback.fix.annotations.FixPlaybackCompatibility
+import app.revanced.patches.youtube.misc.video.information.patch.VideoInformationPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.videoid.patch.VideoIdPatch
+import app.revanced.patches.youtube.misc.video.videoid.patch.VideoIdPatch

@DependsOn([
    IntegrationsPatch::class,
-    PlayerControllerPatch::class, // updates video length and adds method to seek in video, necessary for this patch
+    VideoInformationPatch::class, // updates video length and adds method to seek in video, necessary for this patch
    SettingsPatch::class,
    VideoIdPatch::class
 ])
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.playercontroller.annotation
+package app.revanced.patches.youtube.misc.video.information.annotation

 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.playercontroller.fingerprint
+package app.revanced.patches.youtube.misc.video.information.fingerprints

 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
@@ -0,0 +1,17 @@
+package app.revanced.patches.youtube.misc.video.information.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility
+import org.jf.dexlib2.Opcode
+
+@Name("player-controller-set-time-reference-fingerprint")
+
+@SponsorBlockCompatibility
+@Version("0.0.1")
+object PlayerControllerSetTimeReferenceFingerprint : MethodFingerprint(
+    opcodes = listOf(Opcode.INVOKE_DIRECT_RANGE, Opcode.IGET_OBJECT),
+    strings = listOf("Media progress reported outside media playback: ")
+)
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.playercontroller.fingerprint
+package app.revanced.patches.youtube.misc.video.information.fingerprints

 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.playercontroller.fingerprint
+package app.revanced.patches.youtube.misc.video.information.fingerprints

 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.playercontroller.fingerprint
+package app.revanced.patches.youtube.misc.video.information.fingerprints

 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
@@ -0,0 +1,14 @@
+package app.revanced.patches.youtube.misc.video.information.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility
+
+@Name("video-time-fingerprint")
+@SponsorBlockCompatibility
+@Version("0.0.1")
+object VideoTimeFingerprint : MethodFingerprint(
+    strings = listOf("MedialibPlayerTimeInfo{currentPositionMillis=")
+)
@@ -1,13 +1,15 @@
-package app.revanced.patches.youtube.misc.playercontroller.patch
+package app.revanced.patches.youtube.misc.video.information.patch

 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.data.toMethodWalker
 import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.instruction
 import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
@@ -16,11 +18,8 @@ import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.playercontroller.annotation.PlayerControllerCompatibility
-import app.revanced.patches.youtube.misc.playercontroller.fingerprint.CreateVideoPlayerSeekbarFingerprint
-import app.revanced.patches.youtube.misc.playercontroller.fingerprint.PlayerInitFingerprint
-import app.revanced.patches.youtube.misc.playercontroller.fingerprint.SeekFingerprint
-import app.revanced.patches.youtube.misc.playercontroller.fingerprint.VideoLengthFingerprint
+import app.revanced.patches.youtube.misc.video.speed.remember.annotation.RememberPlaybackSpeedCompatibility
+import app.revanced.patches.youtube.misc.video.information.fingerprints.*
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.builder.MutableMethodImplementation
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
@@ -28,15 +27,17 @@ import org.jf.dexlib2.immutable.ImmutableMethod
 import org.jf.dexlib2.immutable.ImmutableMethodParameter
 import org.jf.dexlib2.util.MethodUtil

-@Name("player-controller-hook")
-@Description("Hooks the player controller")
-@PlayerControllerCompatibility
+@Name("video-information")
+@Description("Hooks YouTube to get information about the current playing video.")
+@RememberPlaybackSpeedCompatibility
@Version("0.0.1")
@DependsOn([IntegrationsPatch::class])
-class PlayerControllerPatch : BytecodePatch(
+class VideoInformationPatch : BytecodePatch(
    listOf(
        PlayerInitFingerprint,
-        CreateVideoPlayerSeekbarFingerprint
+        CreateVideoPlayerSeekbarFingerprint,
+        PlayerControllerSetTimeReferenceFingerprint,
+        VideoTimeFingerprint,
    )
 ) {
    override fun execute(context: BytecodeContext): PatchResult {
@@ -88,29 +89,90 @@ class PlayerControllerPatch : BytecodePatch(

                addInstruction(
                    videoLengthMethodResult.scanResult.patternScanResult!!.endIndex,
-                    "invoke-static {v$videoLengthRegister, v$dummyRegisterForLong}, $INTEGRATIONS_CLASS_DESCRIPTOR->setCurrentVideoLength(J)V"
+                    "invoke-static {v$videoLengthRegister, v$dummyRegisterForLong}, $INTEGRATIONS_CLASS_DESCRIPTOR->setVideoLength(J)V"
                )
            }
        }

+        /*
+        Set the video time method
+        */
+        with(PlayerControllerSetTimeReferenceFingerprint.result!!) {
+            timeMethod = context.toMethodWalker(method)
+                .nextMethod(scanResult.patternScanResult!!.startIndex, true)
+                .getMethod() as MutableMethod
+        }
+
+        /*
+        Set the high precision video time method
+         */
+        highPrecisionTimeMethod =
+            (object : MethodFingerprint("V", null, listOf("J", "J", "J", "J", "I", "L"), null) {}).also {
+                it.resolve(context, VideoTimeFingerprint.result!!.classDef)
+            }.result!!.mutableMethod
+
+        /*
+        Hook the methods which set the time
+         */
+        highPrecisionTimeHook(INTEGRATIONS_CLASS_DESCRIPTOR, "setVideoTime")
+
        return PatchResultSuccess()
    }

    companion object {
-        private const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/PlayerControllerPatch;"
-        private const val INSERT_INDEX = 4
+        private const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/VideoInformation;"

        private lateinit var playerInitMethod: MutableMethod
+        private lateinit var timeMethod: MutableMethod
+        private lateinit var highPrecisionTimeMethod: MutableMethod
+
+        private fun MutableMethod.insert(insert: InsertIndex, register: String, descriptor: String) =
+            addInstruction(insert.index, "invoke-static { $register }, $descriptor")
+
+        private fun MutableMethod.insertTimeHook(insert: InsertIndex, descriptor: String) =
+            insert(insert, "p1, p2", descriptor)

        /**
         * Hook the player controller.
         *
-         * @param targetMethodClass The descriptor for the static method to invoke when the player controller is created.
+         * @param targetMethodClass The descriptor for the class to invoke when the player controller is created.
+         * @param targetMethodName The name of the static method to invoke when the player controller is created.
         */
        internal fun onCreateHook(targetMethodClass: String, targetMethodName: String) =
-            playerInitMethod.addInstruction(
-                INSERT_INDEX,
-                "invoke-static { v0 }, $targetMethodClass->$targetMethodName(Ljava/lang/Object;)V"
+            playerInitMethod.insert(
+                InsertIndex.CREATE,
+                "v0",
+                "$targetMethodClass->$targetMethodName(Ljava/lang/Object;)V"
            )
+
+        /**
+         * Hook the video time.
+         *
+         * @param targetMethodClass The descriptor for the static method to invoke when the player controller is created.
+         * @param targetMethodName The name of the static method to invoke when the player controller is created.
+         */
+        internal fun videoTimeHook(targetMethodClass: String, targetMethodName: String) =
+            timeMethod.insertTimeHook(
+                InsertIndex.TIME,
+                "$targetMethodClass->$targetMethodName(J)V"
+            )
+
+        /**
+         * Hook the high precision video time.
+         *
+         * @param targetMethodClass The descriptor for the static method to invoke when the player controller is created.
+         * @param targetMethodName The name of the static method to invoke when the player controller is created.
+         */
+        internal fun highPrecisionTimeHook(targetMethodClass: String, targetMethodName: String) =
+            highPrecisionTimeMethod.insertTimeHook(
+                InsertIndex.HIGH_PRECISION_TIME,
+                "$targetMethodClass->$targetMethodName(J)V"
+            )
+
+        enum class InsertIndex(internal val index: Int) {
+            CREATE(4),
+            TIME(2),
+            HIGH_PRECISION_TIME(0),
+        }
    }
 }
@@ -1,13 +1,13 @@
-package app.revanced.patches.youtube.misc.quality.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [Package(
-        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
-    )]
-)
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
-internal annotation class DefaultVideoQualityCompatibility
+package app.revanced.patches.youtube.misc.video.quality.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf("17.36.37", "17.41.37", "17.42.35", "17.43.36")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class RememberVideoQualityCompatibility
@@ -1,18 +1,18 @@
-package app.revanced.patches.youtube.misc.quality.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.misc.quality.annotations.DefaultVideoQualityCompatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@Name("video-quality-reference-fingerprint")
-@DefaultVideoQualityCompatibility
-@Version("0.0.1")
-object VideoQualityReferenceFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L"), listOf(
-        Opcode.IPUT_OBJECT, Opcode.RETURN_VOID
-    )
+package app.revanced.patches.youtube.misc.video.quality.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.misc.video.quality.annotations.RememberVideoQualityCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("video-quality-reference-fingerprint")
+@RememberVideoQualityCompatibility
+@Version("0.0.1")
+object VideoQualityReferenceFingerprint : MethodFingerprint(
+    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L"), listOf(
+        Opcode.IPUT_OBJECT, Opcode.RETURN_VOID
+    )
 )
@@ -1,27 +1,27 @@
-
-package app.revanced.patches.youtube.misc.quality.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.or
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.misc.quality.annotations.DefaultVideoQualityCompatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@Name("video-quality-setter-fingerprint")
-@DefaultVideoQualityCompatibility
-@Version("0.0.1")
-object VideoQualitySetterFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    listOf("[L", "I", "I", "Z", "I"),
-    listOf(
-        Opcode.IF_EQZ,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IPUT_BOOLEAN,
-    )
+
+package app.revanced.patches.youtube.misc.video.quality.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.misc.video.quality.annotations.RememberVideoQualityCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("video-quality-setter-fingerprint")
+@RememberVideoQualityCompatibility
+@Version("0.0.1")
+object VideoQualitySetterFingerprint : MethodFingerprint(
+    "V",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    listOf("[L", "I", "I", "Z", "I"),
+    listOf(
+        Opcode.IF_EQZ,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.IPUT_BOOLEAN,
+    )
 )
@@ -1,26 +1,26 @@
-
-package app.revanced.patches.youtube.misc.quality.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-import app.revanced.patches.youtube.misc.quality.annotations.DefaultVideoQualityCompatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@Name("video-user-quality-change-fingerprint")
-@DefaultVideoQualityCompatibility
-@Version("0.0.1")
-object VideoUserQualityChangeFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    listOf("L","L","I","J"),
-    listOf(
-        Opcode.MOVE,
-        Opcode.MOVE_WIDE,
-        Opcode.INVOKE_INTERFACE_RANGE,
-        Opcode.RETURN_VOID
-    )
+
+package app.revanced.patches.youtube.misc.video.quality.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+import app.revanced.patches.youtube.misc.video.quality.annotations.RememberVideoQualityCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("video-user-quality-change-fingerprint")
+@RememberVideoQualityCompatibility
+@Version("0.0.1")
+object VideoUserQualityChangeFingerprint : MethodFingerprint(
+    "V",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    listOf("L","L","I","J"),
+    listOf(
+        Opcode.MOVE,
+        Opcode.MOVE_WIDE,
+        Opcode.INVOKE_INTERFACE_RANGE,
+        Opcode.RETURN_VOID
+    )
 )
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.quality.patch
+package app.revanced.patches.youtube.misc.video.quality.patch

 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
@@ -13,14 +13,14 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.quality.annotations.DefaultVideoQualityCompatibility
-import app.revanced.patches.youtube.misc.quality.fingerprints.VideoQualityReferenceFingerprint
-import app.revanced.patches.youtube.misc.quality.fingerprints.VideoQualitySetterFingerprint
-import app.revanced.patches.youtube.misc.quality.fingerprints.VideoUserQualityChangeFingerprint
+import app.revanced.patches.youtube.misc.video.quality.annotations.RememberVideoQualityCompatibility
+import app.revanced.patches.youtube.misc.video.quality.fingerprints.VideoQualityReferenceFingerprint
+import app.revanced.patches.youtube.misc.video.quality.fingerprints.VideoQualitySetterFingerprint
+import app.revanced.patches.youtube.misc.video.quality.fingerprints.VideoUserQualityChangeFingerprint
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.videoid.patch.VideoIdPatch
+import app.revanced.patches.youtube.misc.video.videoid.patch.VideoIdPatch
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
 import org.jf.dexlib2.iface.reference.FieldReference

@@ -28,7 +28,7 @@ import org.jf.dexlib2.iface.reference.FieldReference
@DependsOn([IntegrationsPatch::class, VideoIdPatch::class, SettingsPatch::class])
@Name("remember-video-quality")
@Description("Adds the ability to remember the video quality you chose in the video quality flyout.")
-@DefaultVideoQualityCompatibility
+@RememberVideoQualityCompatibility
@Version("0.0.1")
 class RememberVideoQualityPatch : BytecodePatch(
    listOf(
@@ -63,7 +63,7 @@ class RememberVideoQualityPatch : BytecodePatch(
                (method.implementation!!.instructions.elementAt(0) as ReferenceInstruction).reference as FieldReference
            }

-        VideoIdPatch.injectCall("Lapp/revanced/integrations/patches/VideoQualityPatch;->newVideoStarted(Ljava/lang/String;)V")
+        VideoIdPatch.injectCall("Lapp/revanced/integrations/patches/playback/quality/RememberVideoQualityPatch;->newVideoStarted(Ljava/lang/String;)V")

        val qIndexMethodName =
            context.classes.single { it.type == qualityFieldReference.type }.methods.single { it.parameterTypes.first() == "I" }.name
@@ -73,14 +73,14 @@ class RememberVideoQualityPatch : BytecodePatch(
            """
                iget-object v0, p0, ${setterMethod.classDef.type}->${qualityFieldReference.name}:${qualityFieldReference.type}
                const-string v1, "$qIndexMethodName"
-		        invoke-static {p1, p2, v0, v1}, Lapp/revanced/integrations/patches/VideoQualityPatch;->setVideoQuality([Ljava/lang/Object;ILjava/lang/Object;Ljava/lang/String;)I
+		        invoke-static {p1, p2, v0, v1}, Lapp/revanced/integrations/patches/playback/quality/RememberVideoQualityPatch;->setVideoQuality([Ljava/lang/Object;ILjava/lang/Object;Ljava/lang/String;)I
   		        move-result p2
            """,
        )

        userQualityMethod.mutableMethod.addInstruction(
            0,
-            "invoke-static {p3}, Lapp/revanced/integrations/patches/VideoQualityPatch;->userChangedQuality(I)V"
+            "invoke-static {p3}, Lapp/revanced/integrations/patches/playback/quality/RememberVideoQualityPatch;->userChangedQuality(I)V"
        )

        return PatchResultSuccess()
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.customplaybackspeed.annotations
+package app.revanced.patches.youtube.misc.video.speed.custom.annotations

 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
@@ -1,11 +1,11 @@
-package app.revanced.patches.youtube.misc.customplaybackspeed.fingerprints
+package app.revanced.patches.youtube.misc.video.speed.custom.fingerprints

 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.misc.customplaybackspeed.annotations.CustomPlaybackSpeedCompatibility
+import app.revanced.patches.youtube.misc.video.speed.custom.annotations.CustomPlaybackSpeedCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode

@@ -1,11 +1,11 @@
-package app.revanced.patches.youtube.misc.customplaybackspeed.fingerprints
+package app.revanced.patches.youtube.misc.video.speed.custom.fingerprints

 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.misc.customplaybackspeed.annotations.CustomPlaybackSpeedCompatibility
+import app.revanced.patches.youtube.misc.video.speed.custom.annotations.CustomPlaybackSpeedCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode

@@ -1,9 +1,9 @@
-package app.revanced.patches.youtube.misc.customplaybackspeed.fingerprints
+package app.revanced.patches.youtube.misc.video.speed.custom.fingerprints

 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.misc.customplaybackspeed.annotations.CustomPlaybackSpeedCompatibility
+import app.revanced.patches.youtube.misc.video.speed.custom.annotations.CustomPlaybackSpeedCompatibility
 import org.jf.dexlib2.Opcode

@Name("video-speed-patch-fingerprint")
@@ -12,6 +12,6 @@ import org.jf.dexlib2.Opcode
 object VideoSpeedPatchFingerprint : MethodFingerprint(
    opcodes = listOf(Opcode.FILL_ARRAY_DATA),
    customFingerprint = { methodDef ->
-        methodDef.definingClass.endsWith("VideoSpeedPatch;") && methodDef.name == "<clinit>"
+        methodDef.definingClass.endsWith("CustomVideoSpeedPatch;") && methodDef.name == "<clinit>"
    }
 )
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.customplaybackspeed.patch
+package app.revanced.patches.youtube.misc.video.speed.custom.patch

 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
@@ -9,12 +9,11 @@ import app.revanced.patcher.extensions.replaceInstruction
 import app.revanced.patcher.patch.*
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.misc.customplaybackspeed.annotations.CustomPlaybackSpeedCompatibility
-import app.revanced.patches.youtube.misc.customplaybackspeed.fingerprints.SpeedArrayGeneratorFingerprint
-import app.revanced.patches.youtube.misc.customplaybackspeed.fingerprints.SpeedLimiterFingerprint
-import app.revanced.patches.youtube.misc.customplaybackspeed.fingerprints.VideoSpeedPatchFingerprint
+import app.revanced.patches.youtube.misc.video.speed.custom.annotations.CustomPlaybackSpeedCompatibility
+import app.revanced.patches.youtube.misc.video.speed.custom.fingerprints.SpeedArrayGeneratorFingerprint
+import app.revanced.patches.youtube.misc.video.speed.custom.fingerprints.SpeedLimiterFingerprint
+import app.revanced.patches.youtube.misc.video.speed.custom.fingerprints.VideoSpeedPatchFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
 import org.jf.dexlib2.builder.instruction.BuilderArrayPayload
 import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
@@ -25,20 +24,18 @@ import java.util.stream.DoubleStream
 import kotlin.math.roundToInt

@Patch
-@Name("custom-playback-speed")
-@Description("Adds more video playback speed options.")
-@DependsOn([IntegrationsPatch::class, ResourceMappingResourcePatch::class])
+@Name("custom-video-speed")
+@Description("Adds more video speed options.")
+@DependsOn([IntegrationsPatch::class])
@CustomPlaybackSpeedCompatibility
@Version("0.0.1")
-class CustomPlaybackSpeedPatch : BytecodePatch(
+class CustomVideoSpeedPatch : BytecodePatch(
    listOf(
        SpeedArrayGeneratorFingerprint, SpeedLimiterFingerprint, VideoSpeedPatchFingerprint
    )
 ) {

    override fun execute(context: BytecodeContext): PatchResult {
-        //TODO: include setting to skip remembering the new speed
-
        val speedLimitMin = minVideoSpeed!!.toFloat()
        val speedLimitMax = maxVideoSpeed!!.toFloat().coerceAtLeast(speedLimitMin)
        val speedsGranularity = videoSpeedsGranularity!!.toFloat()
@@ -64,7 +61,7 @@ class CustomPlaybackSpeedPatch : BytecodePatch(

        val arrayLengthConstDestination = (arrayLengthConst as OneRegisterInstruction).registerA

-        val videoSpeedsArrayType = "Lapp/revanced/integrations/patches/VideoSpeedPatch;->videoSpeeds:[F"
+        val videoSpeedsArrayType = "Lapp/revanced/integrations/patches/playback/speed/CustomVideoSpeedPatch;->videoSpeeds:[F"

        arrayGenMethod.addInstructions(
            arrayLengthConstIndex + 1,
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.videoid.annotation
+package app.revanced.patches.youtube.misc.video.videoid.annotation

 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
@@ -1,11 +1,11 @@
-package app.revanced.patches.youtube.misc.videoid.fingerprint
+package app.revanced.patches.youtube.misc.video.videoid.fingerprint

 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.misc.videoid.annotation.VideoIdCompatibility
+import app.revanced.patches.youtube.misc.video.videoid.annotation.VideoIdCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode

@@ -1,19 +1,19 @@
-package app.revanced.patches.youtube.misc.videoid.patch
+package app.revanced.patches.youtube.misc.video.videoid.patch

 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
+import app.revanced.patcher.extensions.instruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.videoid.annotation.VideoIdCompatibility
-import app.revanced.patches.youtube.misc.videoid.fingerprint.VideoIdFingerprint
+import app.revanced.patches.youtube.misc.video.videoid.annotation.VideoIdCompatibility
+import app.revanced.patches.youtube.misc.video.videoid.fingerprint.VideoIdFingerprint
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction

@Name("video-id-hook")
@@ -27,24 +27,20 @@ class VideoIdPatch : BytecodePatch(
    )
 ) {
    override fun execute(context: BytecodeContext): PatchResult {
-        result = VideoIdFingerprint.result!!
+        with(VideoIdFingerprint.result!!) {
+            insertMethod = mutableMethod
+            insertIndex = scanResult.patternScanResult!!.endIndex + 2

-        insertMethod = result.mutableMethod
-        videoIdRegister =
-            (insertMethod.implementation!!.instructions[result.scanResult.patternScanResult!!.endIndex + 1] as OneRegisterInstruction).registerA
-
-        injectCall("Lapp/revanced/integrations/videoplayer/VideoInformation;->setCurrentVideoId(Ljava/lang/String;)V")
-
-        offset++ // offset so setCurrentVideoId is called before any injected call
+            videoIdRegister = (insertMethod.instruction(insertIndex - 1) as OneRegisterInstruction).registerA
+        }

        return PatchResultSuccess()
    }

    companion object {
-        private var offset = 2
+        private var videoIdRegister = 0
+        private var insertIndex = 0

-        private var videoIdRegister: Int = 0
-        private lateinit var result: MethodFingerprintResult
        private lateinit var insertMethod: MutableMethod

        /**
@@ -53,12 +49,10 @@ class VideoIdPatch : BytecodePatch(
         */
        fun injectCall(
            methodDescriptor: String
-        ) {
-            insertMethod.addInstructions(
-                result.scanResult.patternScanResult!!.endIndex + offset, // move-result-object offset
-                "invoke-static {v$videoIdRegister}, $methodDescriptor"
-            )
-        }
+        ) = insertMethod.addInstructions(
+            insertIndex, // move-result-object offset
+            "invoke-static {v$videoIdRegister}, $methodDescriptor"
+        )
    }
 }