chore(release): 2.185.0-dev.2 [skip ci]

# [2.185.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v2.185.0-dev.1...v2.185.0-dev.2) (2023-07-15)

### Bug Fixes

* allocate for more than eight `LithoFilter` array items ([#2643](https://github.com/ReVanced/revanced-patches/issues/2643)) ([5de8ee5](5de8ee51c1))

CHANGELOG.md

@@ -1,3 +1,31 @@
+# [2.185.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v2.185.0-dev.1...v2.185.0-dev.2) (2023-07-15)
+
+
+### Bug Fixes
+
+* allocate for more than eight `LithoFilter` array items ([#2643](https://github.com/ReVanced/revanced-patches/issues/2643)) ([fc8660b](https://github.com/ReVanced/revanced-patches/commit/fc8660b740bec2747e5f82b7321027bb8a51e0cf))
+
+# [2.185.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.184.1-dev.1...v2.185.0-dev.1) (2023-07-15)
+
+
+### Features
+
+* **youtube:** rename `video-speed` to `playback-speed` ([#2642](https://github.com/revanced/revanced-patches/issues/2642)) ([77e8639](https://github.com/revanced/revanced-patches/commit/77e8639b71048f2795f8f32fe18d052b335e3ce4))
+
+## [2.184.1-dev.1](https://github.com/revanced/revanced-patches/compare/v2.184.0...v2.184.1-dev.1) (2023-07-14)
+
+
+### Bug Fixes
+
+* **youtube/sponsorblock:** fix some segments skipping slightly too late ([#2634](https://github.com/revanced/revanced-patches/issues/2634)) ([3175431](https://github.com/revanced/revanced-patches/commit/31754311870324b1e245b12965d7486878e9eba4))
+
+# [2.184.0](https://github.com/revanced/revanced-patches/compare/v2.183.1...v2.184.0) (2023-07-11)
+
+
+### Features
+
+* **youtube/custom-branding:** update logo ([e2187f3](https://github.com/revanced/revanced-patches/commit/e2187f33ff82fce40592517aef31cb191b42987c))
+
 # [2.184.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.183.1...v2.184.0-dev.1) (2023-07-11)
 
 

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 2.184.0-dev.1
+version = 2.185.0-dev.2

src/main/kotlin/app/revanced/patches/youtube/misc/litho/filter/patch/LithoFilterPatch.kt

@@ -176,7 +176,7 @@ class LithoFilterPatch : BytecodePatch(
                     """
                         new-instance v1, $classDescriptor
                         invoke-direct {v1}, $classDescriptor-><init>()V
-                        const/4 v2, ${filterCount++}
+                        const/16 v2, ${filterCount++}
                         aput-object v1, v0, v2
                     """
                 )
@@ -187,7 +187,7 @@ class LithoFilterPatch : BytecodePatch(
     }
 
     override fun close() = LithoFilterFingerprint.result!!
-        .mutableMethod.replaceInstruction(0, "const/4 v0, $filterCount")
+        .mutableMethod.replaceInstruction(0, "const/16 v0, $filterCount")
 
     companion object {
         private val MethodFingerprint.patternScanResult
@@ -208,4 +208,4 @@ class LithoFilterPatch : BytecodePatch(
 
         private var filterCount = 0
     }
-}
+}

src/main/kotlin/app/revanced/patches/youtube/video/information/fingerprints/VideoTimeFingerprint.kt

@@ -1,8 +0,0 @@
-package app.revanced.patches.youtube.video.information.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object VideoTimeFingerprint : MethodFingerprint(
-    strings = listOf("MedialibPlayerTimeInfo{currentPositionMillis=")
-)

src/main/kotlin/app/revanced/patches/youtube/video/information/patch/VideoInformationPatch.kt

@@ -10,7 +10,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 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
@@ -44,7 +43,6 @@ class VideoInformationPatch : BytecodePatch(
         PlayerInitFingerprint,
         CreateVideoPlayerSeekbarFingerprint,
         PlayerControllerSetTimeReferenceFingerprint,
-        VideoTimeFingerprint,
         OnPlaybackSpeedItemClickFingerprint,
     )
 ) {
@@ -118,18 +116,10 @@ class VideoInformationPatch : BytecodePatch(
                 .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, "setVideoTimeHighPrecision")
+        videoTimeHook(INTEGRATIONS_CLASS_DESCRIPTOR, "setVideoTime")
 
 
         /*
@@ -164,9 +154,6 @@ class VideoInformationPatch : BytecodePatch(
         private lateinit var timeMethod: MutableMethod
         private var timeInitInsertIndex = 2
 
-        private lateinit var highPrecisionTimeMethod: MutableMethod
-        private var highPrecisionInsertIndex = 0
-
         private fun MutableMethod.insert(insertIndex: Int, register: String, descriptor: String) =
             addInstruction(insertIndex, "invoke-static { $register }, $descriptor")
 
@@ -202,20 +189,6 @@ class VideoInformationPatch : BytecodePatch(
                 "$targetMethodClass->$targetMethodName(J)V"
             )
 
-        /**
-         * Hook the high precision video time.
-         * The hooks is called extremely often (10 to 15 times a seconds), so use with caution.
-         * Note: the hook is usually called _off_ the main thread
-         *
-         * @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(
-                highPrecisionInsertIndex++,
-                "$targetMethodClass->$targetMethodName(J)V"
-            )
-
         private fun getReference(instructions: List<BuilderInstruction>, offset: Int, opcode: Opcode) =
             (instructions[instructions.indexOfFirst { it.opcode == opcode } + offset] as ReferenceInstruction)
                 .reference.toString()

src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeed.kt

@@ -1,25 +1,25 @@
-package app.revanced.patches.youtube.video.speed
+package app.revanced.patches.youtube.video.speed
-
+
-import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.video.speed.custom.patch.CustomVideoSpeedPatch
+import app.revanced.patches.youtube.video.speed.custom.patch.CustomPlaybackSpeedPatch
-import app.revanced.patches.youtube.video.speed.remember.patch.RememberPlaybackSpeedPatch
+import app.revanced.patches.youtube.video.speed.remember.patch.RememberPlaybackSpeedPatch
-
+
-@Patch
+@Patch
-@Name("Video speed")
+@Name("Playback speed")
-@Description("Adds custom video speeds and ability to remember the playback speed you chose in the video playback speed flyout.")
+@Description("Adds custom playback speeds and ability to remember the playback speed you chose in the video playback speed flyout.")
-@DependsOn([CustomVideoSpeedPatch::class, RememberPlaybackSpeedPatch::class])
+@DependsOn([CustomPlaybackSpeedPatch::class, RememberPlaybackSpeedPatch::class])
-@VideoSpeedCompatibility
+@PlaybackSpeedCompatibility
-@Version("0.0.1")
+@Version("0.0.1")
-class VideoSpeed : BytecodePatch() {
+class PlaybackSpeed : BytecodePatch() {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
-        return PatchResultSuccess() // All patches this patch depends on succeed.
+        return PatchResultSuccess() // All patches this patch depends on succeed.
-    }
+    }
-}
+}

src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedCompatibility.kt

@@ -5,4 +5,4 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("com.google.android.youtube", arrayOf("18.20.39", "18.23.35"))])
 @Target(AnnotationTarget.CLASS)
-internal annotation class VideoSpeedCompatibility
+internal annotation class PlaybackSpeedCompatibility

src/main/kotlin/app/revanced/patches/youtube/video/speed/custom/fingerprints/GetOldPlaybackSpeedsFingerprint.kt

@@ -2,7 +2,7 @@ package app.revanced.patches.youtube.video.speed.custom.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 
-object GetOldVideoSpeedsFingerprint : MethodFingerprint(
+object GetOldPlaybackSpeedsFingerprint : MethodFingerprint(
     parameters = listOf("[L", "I"),
     strings = listOf("menu_item_playback_speed")
 )

src/main/kotlin/app/revanced/patches/youtube/video/speed/custom/fingerprints/ShowOldPlaybackSpeedMenuFingerprint.kt

@@ -2,6 +2,6 @@ package app.revanced.patches.youtube.video.speed.custom.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 
-object ShowOldVideoSpeedMenuFingerprint : MethodFingerprint(
+object ShowOldPlaybackSpeedMenuFingerprint : MethodFingerprint(
     strings = listOf("PLAYBACK_RATE_MENU_BOTTOM_SHEET_FRAGMENT")
 )

src/main/kotlin/app/revanced/patches/youtube/video/speed/custom/fingerprints/ShowOldPlaybackSpeedMenuIntegrationsFingerprint.kt

@@ -0,0 +1,7 @@
+package app.revanced.patches.youtube.video.speed.custom.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object ShowOldPlaybackSpeedMenuIntegrationsFingerprint : MethodFingerprint(
+    customFingerprint = { method, _ -> method.name == "showOldPlaybackSpeedMenu" }
+)

src/main/kotlin/app/revanced/patches/youtube/video/speed/custom/fingerprints/ShowOldVideoSpeedMenuIntegrationsFingerprint.kt

@@ -1,7 +0,0 @@
-package app.revanced.patches.youtube.video.speed.custom.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object ShowOldVideoSpeedMenuIntegrationsFingerprint : MethodFingerprint(
-    customFingerprint = { method, _ -> method.name == "showOldVideoSpeedMenu" }
-)

src/main/kotlin/app/revanced/patches/youtube/video/speed/custom/patch/CustomPlaybackSpeedPatch.kt

@@ -31,16 +31,16 @@ import org.jf.dexlib2.iface.reference.FieldReference
 import org.jf.dexlib2.iface.reference.MethodReference
 import org.jf.dexlib2.immutable.ImmutableField
 
-@Name("Custom video speed")
+@Name("Custom playback speed")
-@Description("Adds custom video speed options.")
+@Description("Adds custom playback speed options.")
 @DependsOn([IntegrationsPatch::class, LithoFilterPatch::class, SettingsPatch::class, BottomSheetHookPatch::class])
 @Version("0.0.1")
-class CustomVideoSpeedPatch : BytecodePatch(
+class CustomPlaybackSpeedPatch : BytecodePatch(
     listOf(
         SpeedArrayGeneratorFingerprint,
         SpeedLimiterFingerprint,
-        GetOldVideoSpeedsFingerprint,
+        GetOldPlaybackSpeedsFingerprint,
-        ShowOldVideoSpeedMenuIntegrationsFingerprint
+        ShowOldPlaybackSpeedMenuIntegrationsFingerprint
     )
 ) {
 
@@ -81,12 +81,12 @@ class CustomVideoSpeedPatch : BytecodePatch(
 
         val arrayLengthConstDestination = (arrayLengthConst as OneRegisterInstruction).registerA
 
-        val videoSpeedsArrayType = "$INTEGRATIONS_CLASS_DESCRIPTOR->customVideoSpeeds:[F"
+        val playbackSpeedsArrayType = "$INTEGRATIONS_CLASS_DESCRIPTOR->customPlaybackSpeeds:[F"
 
         arrayGenMethod.addInstructions(
             arrayLengthConstIndex + 1,
             """
-                sget-object v$arrayLengthConstDestination, $videoSpeedsArrayType
+                sget-object v$arrayLengthConstDestination, $playbackSpeedsArrayType
                 array-length v$arrayLengthConstDestination, v$arrayLengthConstDestination
             """
         )
@@ -102,7 +102,7 @@ class CustomVideoSpeedPatch : BytecodePatch(
 
         arrayGenMethod.replaceInstruction(
             originalArrayFetchIndex,
-            "sget-object v$originalArrayFetchDestination, $videoSpeedsArrayType"
+            "sget-object v$originalArrayFetchDestination, $playbackSpeedsArrayType"
         )
 
         val limiterMethod = SpeedLimiterFingerprint.result?.mutableMethod!!
@@ -121,24 +121,24 @@ class CustomVideoSpeedPatch : BytecodePatch(
         // edit: alternatively this might work by overriding with fixed values such as 0.1x and 10x
         limiterMethod.replaceInstruction(
             limiterMinConstIndex,
-            "sget v$limiterMinConstDestination, $INTEGRATIONS_CLASS_DESCRIPTOR->minVideoSpeed:F"
+            "sget v$limiterMinConstDestination, $INTEGRATIONS_CLASS_DESCRIPTOR->minPlaybackSpeed:F"
         )
         limiterMethod.replaceInstruction(
             limiterMaxConstIndex,
-            "sget v$limiterMaxConstDestination, $INTEGRATIONS_CLASS_DESCRIPTOR->maxVideoSpeed:F"
+            "sget v$limiterMaxConstDestination, $INTEGRATIONS_CLASS_DESCRIPTOR->maxPlaybackSpeed:F"
         )
 
         // region Force old video quality menu.
-        // This is necessary, because there is no known way of adding custom video speeds to the new menu.
+        // This is necessary, because there is no known way of adding custom playback speeds to the new menu.
 
         BottomSheetHookPatch.addHook(INTEGRATIONS_CLASS_DESCRIPTOR)
 
-        // Required to check if the video speed menu is currently shown.
+        // Required to check if the playback speed menu is currently shown.
         LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
 
-        GetOldVideoSpeedsFingerprint.result?.let { result ->
+        GetOldPlaybackSpeedsFingerprint.result?.let { result ->
             // Add a static INSTANCE field to the class.
-            // This is later used to call "showOldVideoSpeedMenu" on the instance.
+            // This is later used to call "showOldPlaybackSpeedMenu" on the instance.
             val instanceField = ImmutableField(
                 result.classDef.type,
                 "INSTANCE",
@@ -154,15 +154,15 @@ class CustomVideoSpeedPatch : BytecodePatch(
             // In order to prevent a conflict with another patch, add the instruction at index 1.
             result.mutableMethod.addInstruction(1, "sput-object p0, $instanceField")
 
-            // Get the "showOldVideoSpeedMenu" method.
+            // Get the "showOldPlaybackSpeedMenu" method.
             // This is later called on the field INSTANCE.
-            val showOldVideoSpeedMenuMethod = ShowOldVideoSpeedMenuFingerprint.also {
+            val showOldPlaybackSpeedMenuMethod = ShowOldPlaybackSpeedMenuFingerprint.also {
                 if (!it.resolve(context, result.classDef))
-                    throw ShowOldVideoSpeedMenuFingerprint.toErrorResult()
+                    throw ShowOldPlaybackSpeedMenuFingerprint.toErrorResult()
             }.result!!.method.toString()
 
-            // Insert the call to the "showOldVideoSpeedMenu" method on the field INSTANCE.
+            // Insert the call to the "showOldPlaybackSpeedMenu" method on the field INSTANCE.
-            ShowOldVideoSpeedMenuIntegrationsFingerprint.result?.mutableMethod?.apply {
+            ShowOldPlaybackSpeedMenuIntegrationsFingerprint.result?.mutableMethod?.apply {
                 addInstructionsWithLabels(
                     implementation!!.instructions.lastIndex,
                     """
@@ -170,11 +170,11 @@ class CustomVideoSpeedPatch : BytecodePatch(
                         if-nez v0, :not_null
                         return-void
                         :not_null
-                        invoke-virtual { v0 }, $showOldVideoSpeedMenuMethod
+                        invoke-virtual { v0 }, $showOldPlaybackSpeedMenuMethod
                     """
                 )
-            } ?: return ShowOldVideoSpeedMenuIntegrationsFingerprint.toErrorResult()
+            } ?: return ShowOldPlaybackSpeedMenuIntegrationsFingerprint.toErrorResult()
-        } ?: return GetOldVideoSpeedsFingerprint.toErrorResult()
+        } ?: return GetOldPlaybackSpeedsFingerprint.toErrorResult()
 
         // endregion
 
@@ -183,10 +183,10 @@ class CustomVideoSpeedPatch : BytecodePatch(
 
     private companion object {
         private const val FILTER_CLASS_DESCRIPTOR =
-            "Lapp/revanced/integrations/patches/components/VideoSpeedMenuFilterPatch;"
+            "Lapp/revanced/integrations/patches/components/PlaybackSpeedMenuFilterPatch;"
 
         private const val INTEGRATIONS_CLASS_DESCRIPTOR =
-            "Lapp/revanced/integrations/patches/playback/speed/CustomVideoSpeedPatch;"
+            "Lapp/revanced/integrations/patches/playback/speed/CustomPlaybackSpeedPatch;"
 
     }
 }

src/main/kotlin/app/revanced/patches/youtube/video/speed/remember/patch/RememberPlaybackSpeedPatch.kt

@@ -19,13 +19,13 @@ import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.video.information.patch.VideoInformationPatch
-import app.revanced.patches.youtube.video.speed.custom.patch.CustomVideoSpeedPatch
+import app.revanced.patches.youtube.video.speed.custom.patch.CustomPlaybackSpeedPatch
 import app.revanced.patches.youtube.video.speed.remember.fingerprint.InitializePlaybackSpeedValuesFingerprint
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
 
 @Name("Remember playback speed")
-@Description("Adds the ability to remember the playback speed you chose in the video playback speed flyout.")
+@Description("Adds the ability to remember the playback speed you chose in the playback speed flyout.")
-@DependsOn([IntegrationsPatch::class, SettingsPatch::class, VideoInformationPatch::class, CustomVideoSpeedPatch::class])
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class, VideoInformationPatch::class, CustomPlaybackSpeedPatch::class])
 @Version("0.0.1")
 class RememberPlaybackSpeedPatch : BytecodePatch(
     listOf(