Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(YouTube - Video Id): Fix video id not showing the currently playing video #3038

Merged
merged 8 commits into from
Sep 28, 2023
Merged

fix(YouTube - Video Id): Fix video id not showing the currently playing video #3038

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
963fe75
fix(YouTube - Video Id): Fix video id not showing the currently playi…
LisoUseInAIKyrios Sep 27, 2023
8c7575f
Merge remote-tracking branch 'upstream/dev' into video_id_hook_fix
LisoUseInAIKyrios Sep 27, 2023
e77a5d5
comments
LisoUseInAIKyrios Sep 27, 2023
b1a061c
refactor: Fix naming consistency and simplify code
oSumAtrIX Sep 27, 2023
de5944c
comments, fix start index (first hook inserted should be at index 0, …
LisoUseInAIKyrios Sep 27, 2023
bc07f3d
leverage abstraction instead of dependency inversion
oSumAtrIX Sep 28, 2023
571e02e
Merge branch 'dev' into video_id_hook_fix
LisoUseInAIKyrios Sep 28, 2023
6c18c41
fix: fix ordering
LisoUseInAIKyrios Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions ...kotlin/app/revanced/patches/youtube/video/playerresponse/PlayerResponseMethodHookPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import app.revanced.patcher.patch.BytecodePatch
import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
import app.revanced.patches.youtube.video.information.VideoInformationPatch
import app.revanced.patches.youtube.video.playerresponse.fingerprint.PlayerParameterBuilderFingerprint

@Patch(
Expand All @@ -32,10 +33,16 @@ object PlayerResponseMethodHookPatch : BytecodePatch(

fun hookVideoId(methodDescriptor: String) {
playerResponseMethod.addInstruction(
++videoIdHookInsertIndex, "invoke-static {p$VIDEO_ID_PARAMETER}, $methodDescriptor"
videoIdHookInsertIndex++, "invoke-static {p$VIDEO_ID_PARAMETER}, $methodDescriptor"
)

// TODO: Explain why any video id hook has to precede any protoBufferParameterHook.
/**
* Adjust the buffer hook insert index since this video id hook was added before it.
*
* This ensures all video id hooks always run before the buffer hooks,
* so if the buffer hook calls into [VideoInformationPatch]
LisoUseInAIKyrios marked this conversation as resolved.
Show resolved Hide resolved
* it has the correct and updated player response video id.
*/
protoBufferParameterHookInsertIndex++
}

Expand Down