ReVanced-Mirror/revanced-patches
1
0
Fork 0
mirror of https://github.com/revanced/revanced-patches synced 2024-12-04 08:52:57 +01:00
Code Issues Projects Releases Wiki Activity

refactor(youtube/custom-video-buffer): apply Kotlin idioms

Browse Source 
Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>
This commit is contained in:
oSumAtrIX 2023-01-28 05:30:44 +01:00
parent 8e98605a74
commit d5cc730d3d
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
1 changed files with 85 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
src/main/kotlin/app/revanced/patches/youtube/misc/videobuffer/patch/CustomVideoBufferPatch.kt
View File

@ -13,11 +13,11 @@ 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.patcher.util.proxy.mutableTypes.MutableMethod import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
import app.revanced.patches.shared.settings.preference.impl.InputType import app.revanced.patches.shared.settings.preference.impl.InputType
import app.revanced.patches.shared.settings.preference.impl.PreferenceScreen import app.revanced.patches.shared.settings.preference.impl.PreferenceScreen
import app.revanced.patches.shared.settings.preference.impl.StringResource import app.revanced.patches.shared.settings.preference.impl.StringResource
import app.revanced.patches.shared.settings.preference.impl.TextPreference import app.revanced.patches.shared.settings.preference.impl.TextPreference
import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
import app.revanced.patches.youtube.misc.videobuffer.annotations.CustomVideoBufferCompatibility import app.revanced.patches.youtube.misc.videobuffer.annotations.CustomVideoBufferCompatibility
import app.revanced.patches.youtube.misc.videobuffer.fingerprints.MaxBufferFingerprint import app.revanced.patches.youtube.misc.videobuffer.fingerprints.MaxBufferFingerprint
import app.revanced.patches.youtube.misc.videobuffer.fingerprints.PlaybackBufferFingerprint import app.revanced.patches.youtube.misc.videobuffer.fingerprints.PlaybackBufferFingerprint
@ -78,60 +78,101 @@ class CustomVideoBufferPatch : BytecodePatch(
StringResource("revanced_custom_video_buffer_summary", "Custom settings for video buffer") StringResource("revanced_custom_video_buffer_summary", "Custom settings for video buffer")
) )
) )
BufferType.values().forEach { type ->
type.hook(context)
}
execMaxBuffer()
execPlaybackBuffer()
execReBuffer()
return PatchResultSuccess() return PatchResultSuccess()
} }
private fun execMaxBuffer() { /**
val (method, result) = MaxBufferFingerprint.unwrap(true, -1) * The type of buffer.
val (index, register) = result *
* @param patchInfo The corresponding information to patch the buffer type.
* @param preparation Optional preparation before patching.
*/
private enum class BufferType(
private val patchInfo: PatchInfo,
private val preparation: (BytecodeContext.() -> Unit)? = null,
) {
method.addInstructions( PLAYBACK(PatchInfo(PlaybackBufferFingerprint, "getPlaybackBuffer")),
index + 1, """ RE(PatchInfo(ReBufferFingerprint, "getReBuffer")),
invoke-static {}, Lapp/revanced/integrations/patches/VideoBufferPatch;->getMaxBuffer()I MAX(
move-result v$register PatchInfo(
""" MaxBufferFingerprint,
) "getMaxBuffer",
} PatchInfo.UnwrapInfo(true, -1)
)
);
private fun execPlaybackBuffer() { /**
val (method, result) = PlaybackBufferFingerprint.unwrap() * Information about a patch.
val (index, register) = result *
* @param fingerprint The corresponding [MethodFingerprint] for the patch.
* @param integrationsMethodName The corresponding name of the hooking method.
* @param unwrapInfo Optional information on how to treat the [MethodFingerprint].
*/
private class PatchInfo(
val fingerprint: MethodFingerprint,
val integrationsMethodName: String,
val unwrapInfo: UnwrapInfo? = null
) {
/**
* Information on how to treat a [MethodFingerprint].
*
* @param forEndIndex Whether to retrieve information from the [MethodFingerprint]
* from the end or start index of its pattern scan result.
* @param offset An additional offset to [forEndIndex].
*/
class UnwrapInfo(val forEndIndex: Boolean = false, val offset: Int = 0)
}
method.addInstructions( fun hook(context: BytecodeContext) {
index + 1, """ /**
invoke-static {}, Lapp/revanced/integrations/patches/VideoBufferPatch;->getPlaybackBuffer()I * The resulting instruction info for unwrapping [MethodFingerprint].
move-result v$register *
""" * @param index The index of the instruction.
) * @param register The register of the instruction.
} */
data class InstructionResult(val index: Int, val register: Int)
private fun execReBuffer() { /***
val (method, result) = ReBufferFingerprint.unwrap() * The result of unwrapping [MethodFingerprint].
val (index, register) = result *
* @param method The method which was retrieved from the [MethodFingerprint].
* @param instructionResult The resulting instruction info for unwrapping [MethodFingerprint].
*/
data class UnwrapResult(val method: MutableMethod, val instructionResult: InstructionResult)
method.addInstructions( fun MethodFingerprint.unwrap(unwrapInfo: PatchInfo.UnwrapInfo? = null): UnwrapResult {
index + 1, """ val result = this.result!!
invoke-static {}, Lapp/revanced/integrations/patches/VideoBufferPatch;->getReBuffer()I val method = result.mutableMethod
move-result v$register val scanResult = result.scanResult.patternScanResult!!
""" val index = (
) if (unwrapInfo?.forEndIndex == true)
} scanResult.endIndex
else
scanResult.startIndex
) + (unwrapInfo?.offset ?: 0)
private fun MethodFingerprint.unwrap( val register = (method.instruction(index) as OneRegisterInstruction).registerA
forEndIndex: Boolean = false,
offset: Int = 0
): Pair<MutableMethod, Pair<Int, Int>> {
val result = this.result!!
val method = result.mutableMethod
val scanResult = result.scanResult.patternScanResult!!
val index = (if (forEndIndex) scanResult.endIndex else scanResult.startIndex) + offset
val register = (method.instruction(index) as OneRegisterInstruction).registerA return UnwrapResult(method, InstructionResult(index, register))
}
return method to (index to register) preparation?.invoke(context)
val (method, result) = patchInfo.fingerprint.unwrap(patchInfo.unwrapInfo)
val (index, register) = result
method.addInstructions(
index + 1,
"""
invoke-static {}, Lapp/revanced/integrations/patches/VideoBufferPatch;->${patchInfo.integrationsMethodName}()I
move-result v$register
"""
)
}
} }
} }