feat(youtube/spoof-player-parameters): split into shorts parameter and incognito mode parameter

This commit is contained in:
inotia00 2023-06-24 14:45:35 +09:00
parent f6983d1769
commit cd2bb5b322
5 changed files with 18 additions and 22 deletions

View File

@ -1,4 +1,4 @@
package app.revanced.patches.youtube.utils.fix.protobufpoof.fingerprints package app.revanced.patches.youtube.utils.fix.parameter.fingerprints
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
import org.jf.dexlib2.Opcode import org.jf.dexlib2.Opcode

View File

@ -1,4 +1,4 @@
package app.revanced.patches.youtube.utils.fix.protobufpoof.fingerprints package app.revanced.patches.youtube.utils.fix.parameter.fingerprints
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
import org.jf.dexlib2.Opcode import org.jf.dexlib2.Opcode

View File

@ -1,4 +1,4 @@
package app.revanced.patches.youtube.utils.fix.protobufpoof.fingerprints package app.revanced.patches.youtube.utils.fix.parameter.fingerprints
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

View File

@ -1,4 +1,4 @@
package app.revanced.patches.youtube.utils.fix.protobufpoof.patch package app.revanced.patches.youtube.utils.fix.parameter.patch
import app.revanced.extensions.toErrorResult import app.revanced.extensions.toErrorResult
import app.revanced.patcher.annotation.Description import app.revanced.patcher.annotation.Description
@ -12,30 +12,27 @@ 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.util.proxy.mutableTypes.MutableMethod import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
import app.revanced.patches.youtube.utils.fix.protobufpoof.fingerprints.BadResponseFingerprint import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.BadResponseFingerprint
import app.revanced.patches.youtube.utils.fix.protobufpoof.fingerprints.ProtobufParameterBuilderFingerprint import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.ProtobufParameterBuilderFingerprint
import app.revanced.patches.youtube.utils.fix.protobufpoof.fingerprints.SubtitleWindowFingerprint import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.SubtitleWindowFingerprint
import app.revanced.patches.youtube.utils.playertype.patch.PlayerTypeHookPatch import app.revanced.patches.youtube.utils.playertype.patch.PlayerTypeHookPatch
import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
import app.revanced.patches.youtube.utils.videoid.mainstream.patch.MainstreamVideoIdPatch import app.revanced.patches.youtube.utils.videoid.mainstream.patch.MainstreamVideoIdPatch
import app.revanced.util.integrations.Constants.MISC_PATH import app.revanced.util.integrations.Constants.MISC_PATH
@Patch @Name("spoof-player-parameters")
@Name("protobuf-spoof") @Description("Spoofs player parameters to prevent playback issues.")
@Description("Spoofs the protobuf to prevent playback issues.")
@DependsOn( @DependsOn(
[ [
MainstreamVideoIdPatch::class, MainstreamVideoIdPatch::class,
PlayerTypeHookPatch::class, PlayerTypeHookPatch::class
SettingsPatch::class
] ]
) )
@YouTubeCompatibility @YouTubeCompatibility
@Version("0.0.1") @Version("0.0.1")
class ProtobufSpoofPatch : BytecodePatch( class SpoofPlayerParameterPatch : BytecodePatch(
listOf( listOf(
BadResponseFingerprint, BadResponseFingerprint,
ProtobufParameterBuilderFingerprint, ProtobufParameterBuilderFingerprint,
@ -56,7 +53,7 @@ class ProtobufSpoofPatch : BytecodePatch(
addInstructions( addInstructions(
0, 0,
""" """
invoke-static {p$protobufParam}, $MISC_PATH/ProtobufSpoofPatch;->overrideProtobufParameter(Ljava/lang/String;)Ljava/lang/String; invoke-static {p$protobufParam}, $MISC_PATH/SpoofPlayerParameterPatch;->overridePlayerParameter(Ljava/lang/String;)Ljava/lang/String;
move-result-object p$protobufParam move-result-object p$protobufParam
""" """
) )
@ -66,14 +63,14 @@ class ProtobufSpoofPatch : BytecodePatch(
// hook video playback result // hook video playback result
BadResponseFingerprint.result?.mutableMethod?.addInstruction( BadResponseFingerprint.result?.mutableMethod?.addInstruction(
0, 0,
"invoke-static {}, $MISC_PATH/ProtobufSpoofPatch;->switchProtobufSpoof()V" "invoke-static {}, $MISC_PATH/SpoofPlayerParameterPatch;->switchPlayerParameters()V"
) ?: return BadResponseFingerprint.toErrorResult() ) ?: return BadResponseFingerprint.toErrorResult()
// fix protobuf spoof side issue // fix protobuf spoof side issue
SubtitleWindowFingerprint.result?.mutableMethod?.addInstructions( SubtitleWindowFingerprint.result?.mutableMethod?.addInstructions(
0, 0,
""" """
invoke-static {p1, p2, p3, p4, p5}, $MISC_PATH/ProtobufSpoofPatch;->getSubtitleWindowSettingsOverride(IIIZZ)[I invoke-static {p1, p2, p3, p4, p5}, $MISC_PATH/SpoofPlayerParameterPatch;->getSubtitleWindowSettingsOverride(IIIZZ)[I
move-result-object v0 move-result-object v0
const/4 v1, 0x0 const/4 v1, 0x0
aget p1, v0, v1 # ap, anchor position aget p1, v0, v1 # ap, anchor position
@ -85,17 +82,16 @@ class ProtobufSpoofPatch : BytecodePatch(
) ?: return SubtitleWindowFingerprint.toErrorResult() ) ?: return SubtitleWindowFingerprint.toErrorResult()
// Hook video id, required for subtitle fix. // Hook video id, required for subtitle fix.
MainstreamVideoIdPatch.injectCall("$MISC_PATH/ProtobufSpoofPatch;->setCurrentVideoId(Ljava/lang/String;)V") MainstreamVideoIdPatch.injectCall("$MISC_PATH/SpoofPlayerParameterPatch;->setCurrentVideoId(Ljava/lang/String;)V")
/** /**
* Add settings * Add settings
*/ */
SettingsPatch.addPreference( SettingsPatch.addPreference(
arrayOf( arrayOf(
"SETTINGS: ENABLE_PROTOBUF_SPOOF" "SETTINGS: SPOOF_PLAYER_PARAMETER"
) )
) )
SettingsPatch.updatePatchStatus("protobuf-spoof")
return PatchResultSuccess() return PatchResultSuccess()
} }

View File

@ -10,7 +10,7 @@ import app.revanced.patcher.patch.annotations.DependsOn
import app.revanced.patches.shared.patch.packagename.PackageNamePatch import app.revanced.patches.shared.patch.packagename.PackageNamePatch
import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
import app.revanced.patches.youtube.utils.fix.clientspoof.patch.ClientSpoofPatch import app.revanced.patches.youtube.utils.fix.clientspoof.patch.ClientSpoofPatch
import app.revanced.patches.youtube.utils.fix.protobufpoof.patch.ProtobufSpoofPatch import app.revanced.patches.youtube.utils.fix.parameter.patch.SpoofPlayerParameterPatch
import app.revanced.patches.youtube.utils.microg.bytecode.fingerprints.CastContextFetchFingerprint import app.revanced.patches.youtube.utils.microg.bytecode.fingerprints.CastContextFetchFingerprint
import app.revanced.patches.youtube.utils.microg.bytecode.fingerprints.CastDynamiteModuleFingerprint import app.revanced.patches.youtube.utils.microg.bytecode.fingerprints.CastDynamiteModuleFingerprint
import app.revanced.patches.youtube.utils.microg.bytecode.fingerprints.CastDynamiteModuleV2Fingerprint import app.revanced.patches.youtube.utils.microg.bytecode.fingerprints.CastDynamiteModuleV2Fingerprint
@ -26,7 +26,7 @@ import app.revanced.util.microg.MicroGBytecodeHelper
[ [
ClientSpoofPatch::class, ClientSpoofPatch::class,
PackageNamePatch::class, PackageNamePatch::class,
ProtobufSpoofPatch::class SpoofPlayerParameterPatch::class
] ]
) )
@YouTubeCompatibility @YouTubeCompatibility