forked from ReVanced/revanced-patches
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(YouTube): Fix issues related to playback by replace streaming data (
ReVanced#3582) Co-authored-by: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com> Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>
- Loading branch information
3 people
authored
Sep 17, 2024
1 parent
17126df
commit dfa94d7
Showing
30 changed files
with
427 additions
and
1,126 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
396 changes: 4 additions & 392 deletions
396
src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofClientPatch.kt
Large diffs are not rendered by default.
Oops, something went wrong.
235 changes: 4 additions & 231 deletions
235
src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofSignaturePatch.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,239 +1,12 @@ | ||
| package app.revanced.patches.youtube.misc.fix.playback | ||
|
|
||
| import app.revanced.patcher.data.BytecodeContext | ||
| import app.revanced.patcher.extensions.InstructionExtensions.addInstructions | ||
| import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels | ||
| import app.revanced.patcher.extensions.InstructionExtensions.getInstruction | ||
| import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction | ||
| import app.revanced.patcher.patch.BytecodePatch | ||
| import app.revanced.patcher.patch.annotation.Patch | ||
| import app.revanced.patcher.util.smali.ExternalLabel | ||
| import app.revanced.patches.all.misc.resources.AddResourcesPatch | ||
| import app.revanced.patches.shared.misc.settings.preference.PreferenceScreen | ||
| import app.revanced.patches.shared.misc.settings.preference.PreferenceScreen.Sorting | ||
| import app.revanced.patches.shared.misc.settings.preference.SwitchPreference | ||
| import app.revanced.patches.youtube.misc.fix.playback.fingerprints.* | ||
| import app.revanced.patches.youtube.misc.playertype.PlayerTypeHookPatch | ||
| import app.revanced.patches.youtube.misc.settings.SettingsPatch | ||
| import app.revanced.patches.youtube.video.information.VideoInformationPatch | ||
| import app.revanced.patches.youtube.video.playerresponse.PlayerResponseMethodHookPatch | ||
| import app.revanced.util.exception | ||
| import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction | ||
| import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction | ||
| import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction | ||
|
|
||
| @Patch( | ||
| description = "Spoofs the signature to prevent playback issues.", | ||
| dependencies = [ | ||
| SettingsPatch::class, | ||
| PlayerTypeHookPatch::class, | ||
| PlayerResponseMethodHookPatch::class, | ||
| VideoInformationPatch::class, | ||
| SpoofSignatureResourcePatch::class, | ||
| AddResourcesPatch::class, | ||
| ], | ||
| ) | ||
| @Deprecated("This patch will be removed in the future.") | ||
| @Deprecated("This patch is obsolete.", replaceWith = ReplaceWith("SpoofVideoStreamsPatch")) | ||
| object SpoofSignaturePatch : BytecodePatch( | ||
| setOf( | ||
| PlayerResponseModelImplGeneralFingerprint, | ||
| PlayerResponseModelImplLiveStreamFingerprint, | ||
| PlayerResponseModelImplRecommendedLevelFingerprint, | ||
| StoryboardRendererSpecFingerprint, | ||
| StoryboardRendererDecoderSpecFingerprint, | ||
| StoryboardRendererDecoderRecommendedLevelFingerprint, | ||
| StoryboardThumbnailParentFingerprint, | ||
| SpoofSignaturePatchScrubbedPreviewLayoutFingerprint, | ||
| StatsQueryParameterFingerprint, | ||
| ParamsMapPutFingerprint, | ||
| ), | ||
| dependencies = setOf(SpoofVideoStreamsPatch::class), | ||
| ) { | ||
| private const val INTEGRATIONS_CLASS_DESCRIPTOR = | ||
| "Lapp/revanced/integrations/youtube/patches/spoof/SpoofSignaturePatch;" | ||
|
|
||
| override fun execute(context: BytecodeContext) { | ||
| AddResourcesPatch(this::class) | ||
|
|
||
| SettingsPatch.PreferenceScreen.MISC.addPreferences( | ||
| PreferenceScreen( | ||
| key = "revanced_spoof_signature_verification_screen", | ||
| sorting = Sorting.UNSORTED, | ||
| preferences = setOf( | ||
| SwitchPreference("revanced_spoof_signature_verification_enabled"), | ||
| SwitchPreference("revanced_spoof_signature_in_feed_enabled"), | ||
| SwitchPreference("revanced_spoof_storyboard"), | ||
| ), | ||
| ), | ||
| ) | ||
|
|
||
| // Hook the player parameters. | ||
| PlayerResponseMethodHookPatch += PlayerResponseMethodHookPatch.Hook.ProtoBufferParameter( | ||
| "$INTEGRATIONS_CLASS_DESCRIPTOR->spoofParameter(Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/String;", | ||
| ) | ||
|
|
||
| // Force the seekbar time and chapters to always show up. | ||
| // This is used if the storyboard spec fetch fails, for viewing paid videos, | ||
| // or if storyboard spoofing is turned off. | ||
| StoryboardThumbnailParentFingerprint.result?.classDef?.let { classDef -> | ||
| StoryboardThumbnailFingerprint.also { | ||
| it.resolve( | ||
| context, | ||
| classDef, | ||
| ) | ||
| }.result?.let { | ||
| val endIndex = it.scanResult.patternScanResult!!.endIndex | ||
| // Replace existing instruction to preserve control flow label. | ||
| // The replaced return instruction always returns false | ||
| // (it is the 'no thumbnails found' control path), | ||
| // so there is no need to pass the existing return value to integrations. | ||
| it.mutableMethod.replaceInstruction( | ||
| endIndex, | ||
| """ | ||
| invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->getSeekbarThumbnailOverrideValue()Z | ||
| """, | ||
| ) | ||
| // Since this is end of the method must replace one line then add the rest. | ||
| it.mutableMethod.addInstructions( | ||
| endIndex + 1, | ||
| """ | ||
| move-result v0 | ||
| return v0 | ||
| """, | ||
| ) | ||
| } ?: throw StoryboardThumbnailFingerprint.exception | ||
| } | ||
|
|
||
| // If storyboard spoofing is turned off, then hide the empty seekbar thumbnail view. | ||
| SpoofSignaturePatchScrubbedPreviewLayoutFingerprint.result?.apply { | ||
| val endIndex = scanResult.patternScanResult!!.endIndex | ||
| mutableMethod.apply { | ||
| val imageViewFieldName = getInstruction<ReferenceInstruction>(endIndex).reference | ||
| addInstructions( | ||
| implementation!!.instructions.lastIndex, | ||
| """ | ||
| iget-object v0, p0, $imageViewFieldName # copy imageview field to a register | ||
| invoke-static {v0}, $INTEGRATIONS_CLASS_DESCRIPTOR->seekbarImageViewCreated(Landroid/widget/ImageView;)V | ||
| """, | ||
| ) | ||
| } | ||
| } ?: throw SpoofSignaturePatchScrubbedPreviewLayoutFingerprint.exception | ||
|
|
||
| /** | ||
| * Hook StoryBoard renderer url | ||
| */ | ||
| arrayOf( | ||
| PlayerResponseModelImplGeneralFingerprint, | ||
| PlayerResponseModelImplLiveStreamFingerprint, | ||
| ).forEach { fingerprint -> | ||
| fingerprint.result?.let { | ||
| it.mutableMethod.apply { | ||
| val getStoryBoardIndex = it.scanResult.patternScanResult!!.endIndex | ||
| val getStoryBoardRegister = | ||
| getInstruction<OneRegisterInstruction>(getStoryBoardIndex).registerA | ||
|
|
||
| addInstructions( | ||
| getStoryBoardIndex, | ||
| """ | ||
| invoke-static { v$getStoryBoardRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->getStoryboardRendererSpec(Ljava/lang/String;)Ljava/lang/String; | ||
| move-result-object v$getStoryBoardRegister | ||
| """, | ||
| ) | ||
| } | ||
| } ?: throw fingerprint.exception | ||
| } | ||
|
|
||
| // Hook recommended seekbar thumbnails quality level. | ||
| StoryboardRendererDecoderRecommendedLevelFingerprint.result?.let { | ||
| val moveOriginalRecommendedValueIndex = it.scanResult.patternScanResult!!.endIndex | ||
| val originalValueRegister = it.mutableMethod | ||
| .getInstruction<OneRegisterInstruction>(moveOriginalRecommendedValueIndex).registerA | ||
|
|
||
| it.mutableMethod.addInstructions( | ||
| moveOriginalRecommendedValueIndex + 1, | ||
| """ | ||
| invoke-static { v$originalValueRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->getRecommendedLevel(I)I | ||
| move-result v$originalValueRegister | ||
| """, | ||
| ) | ||
| } ?: throw StoryboardRendererDecoderRecommendedLevelFingerprint.exception | ||
|
|
||
| // Hook the recommended precise seeking thumbnails quality level. | ||
| PlayerResponseModelImplRecommendedLevelFingerprint.result?.let { | ||
| it.mutableMethod.apply { | ||
| val moveOriginalRecommendedValueIndex = it.scanResult.patternScanResult!!.endIndex | ||
| val originalValueRegister = | ||
| getInstruction<OneRegisterInstruction>(moveOriginalRecommendedValueIndex).registerA | ||
|
|
||
| addInstructions( | ||
| moveOriginalRecommendedValueIndex, | ||
| """ | ||
| invoke-static { v$originalValueRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->getRecommendedLevel(I)I | ||
| move-result v$originalValueRegister | ||
| """, | ||
| ) | ||
| } | ||
| } ?: throw PlayerResponseModelImplRecommendedLevelFingerprint.exception | ||
|
|
||
| StoryboardRendererSpecFingerprint.result?.let { | ||
| it.mutableMethod.apply { | ||
| val storyBoardUrlParams = 0 | ||
|
|
||
| addInstructionsWithLabels( | ||
| 0, | ||
| """ | ||
| if-nez p$storyBoardUrlParams, :ignore | ||
| invoke-static { p$storyBoardUrlParams }, $INTEGRATIONS_CLASS_DESCRIPTOR->getStoryboardRendererSpec(Ljava/lang/String;)Ljava/lang/String; | ||
| move-result-object p$storyBoardUrlParams | ||
| """, | ||
| ExternalLabel("ignore", getInstruction(0)), | ||
| ) | ||
| } | ||
| } ?: throw StoryboardRendererSpecFingerprint.exception | ||
|
|
||
| // Hook the seekbar thumbnail decoder and use a NULL spec for live streams. | ||
| StoryboardRendererDecoderSpecFingerprint.result?.let { | ||
| val storyBoardUrlIndex = it.scanResult.patternScanResult!!.startIndex + 1 | ||
| val storyboardUrlRegister = | ||
| it.mutableMethod.getInstruction<OneRegisterInstruction>(storyBoardUrlIndex).registerA | ||
|
|
||
| it.mutableMethod.addInstructions( | ||
| storyBoardUrlIndex + 1, | ||
| """ | ||
| invoke-static { v$storyboardUrlRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->getStoryboardDecoderRendererSpec(Ljava/lang/String;)Ljava/lang/String; | ||
| move-result-object v$storyboardUrlRegister | ||
| """, | ||
| ) | ||
| } ?: throw StoryboardRendererDecoderSpecFingerprint.exception | ||
|
|
||
| // Fix stats not being tracked. | ||
| // Due to signature spoofing "adformat" is present in query parameters made for /stats requests, | ||
| // even though, for regular videos, it should not be. | ||
| // This breaks stats tracking. | ||
| // Replace the ad parameter with the video parameter in the query parameters. | ||
| StatsQueryParameterFingerprint.result?.let { | ||
| val putMethod = ParamsMapPutFingerprint.result?.method?.toString() | ||
| ?: throw ParamsMapPutFingerprint.exception | ||
|
|
||
| it.mutableMethod.apply { | ||
| val adParamIndex = it.scanResult.stringsScanResult!!.matches.first().index | ||
| val videoParamIndex = adParamIndex + 3 | ||
|
|
||
| // Replace the ad parameter with the video parameter. | ||
| replaceInstruction(adParamIndex, getInstruction(videoParamIndex)) | ||
|
|
||
| // Call paramsMap.put instead of paramsMap.putIfNotExist | ||
| // because the key is already present in the map. | ||
| val putAdParamIndex = adParamIndex + 1 | ||
| val putIfKeyNotExistsInstruction = getInstruction<FiveRegisterInstruction>(putAdParamIndex) | ||
| replaceInstruction( | ||
| putAdParamIndex, | ||
| "invoke-virtual { " + | ||
| "v${putIfKeyNotExistsInstruction.registerC}, " + | ||
| "v${putIfKeyNotExistsInstruction.registerD}, " + | ||
| "v${putIfKeyNotExistsInstruction.registerE} }, " + | ||
| putMethod, | ||
| ) | ||
| } | ||
| } ?: throw StatsQueryParameterFingerprint.exception | ||
| } | ||
| override fun execute(context: BytecodeContext) {} | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.