feat(Prime Video): Add Skip ads patch
#4824
Open
+214
−0
Conversation
This file contains hidden or 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
|
Related to feature request: #4676 |
patches/src/main/kotlin/app/revanced/patches/primevideo/ads/Fingerprints.kt
Outdated
Show resolved
Hide resolved
patches/src/main/kotlin/app/revanced/patches/primevideo/ads/SkipAdsPatch.kt
Outdated
Show resolved
Hide resolved
patches/src/main/kotlin/app/revanced/patches/primevideo/ads/SkipAdsPatch.kt
Outdated
Show resolved
Hide resolved
extensions/primevideo/stub/src/main/java/com/amazon/avod/fsm/StateBase.java
Outdated
Show resolved
Hide resolved
3 tasks
LisoUseInAIKyrios
changed the title
Skip ads patch
|
For the other player implementations, it's worth checking an Android tablet (Android Studio device emulator). |
oSumAtrIX
reviewed
Apr 29, 2025
| @Suppress("unused") | ||
| val skipAdsPatch = bytecodePatch( | ||
| name = "Skip ads", | ||
| description = "Automatically skip video stream ads.", |
There was a problem hiding this comment.
Suggested change
| description = "Automatically skip video stream ads.", | |
| description = "Automatically skips video stream ads.", |
oSumAtrIX
reviewed
Apr 29, 2025
| ) { | ||
| compatibleWith("com.amazon.avod.thirdpartyclient"("3.0.403.257")) | ||
|
|
||
| dependsOn(sharedExtensionPatch("primevideo")) |
There was a problem hiding this comment.
For the shared extension create a val sharedExtensionPatch = sharedExtensionPatch("primevideo") just like its done for the other apps for consistency.
oSumAtrIX
reviewed
Apr 29, 2025
Comment on lines
+19
to
+20
| // We're going to skip all the logic in ServerInsertedAdBreakState.enter(), which plays all the ad clips in this | ||
| // ad break. Instead, we'll force the video player to seek over the entire break and reset the state machine. |
There was a problem hiding this comment.
Suggested change
| // We're going to skip all the logic in ServerInsertedAdBreakState.enter(), which plays all the ad clips in this | |
| // ad break. Instead, we'll force the video player to seek over the entire break and reset the state machine. | |
| // Skip all the logic in ServerInsertedAdBreakState.enter(), which plays all the ad clips in this | |
| // ad break. Instead, force the video player to seek over the entire break and reset the state machine. |
oSumAtrIX
reviewed
Apr 29, 2025
| } | ||
|
|
||
| android { | ||
| namespace = "app.revanced.extension" |
There was a problem hiding this comment.
Isn't this set already by the patches Gradle plugin?
There was a problem hiding this comment.
I think so. This could be removed.
oSumAtrIX
reviewed
Apr 29, 2025
Comment on lines
+7
to
+11
| compileSdk = 34 | ||
|
|
||
| defaultConfig { | ||
| minSdk = 21 | ||
| } |
There was a problem hiding this comment.
Isn't this also set already by the patches Gradle plugin?
There was a problem hiding this comment.
Compile sdk is already set and can be removed here.
But minSdk for Prime video is Android 5.0 and not the default Android 6.0
oSumAtrIX
reviewed
Apr 29, 2025
|
|
||
| @SuppressWarnings("unused") | ||
| public final class SkipAdsPatch { | ||
| public static void ServerInsertedAdBreakState_enter(ServerInsertedAdBreakState state, AdBreakTrigger trigger, VideoPlayer player) { |
There was a problem hiding this comment.
I don't think the naming convention we use for extensions is respected here. Please match the style. Something like "enterServerInsertedAdBreakState"
oSumAtrIX
reviewed
Apr 29, 2025
Comment on lines
+15
to
+24
| if (trigger.getSeekStartPosition() != null) | ||
| // if scrubbing over ad, seek straight to it | ||
| player.seekTo(trigger.getSeekTarget().getTotalMilliseconds()); | ||
| else | ||
| // if naturally entering ad, seek to end of ad break | ||
| player.seekTo(player.getCurrentPosition() + adBreak.getDurationExcludingAux().getTotalMilliseconds()); | ||
|
|
||
| // send "end of ads" trigger to state machine so everything doesn't get whacky | ||
| state.doTrigger(new SimpleTrigger(AdEnabledPlayerTriggerType.NO_MORE_ADS_SKIP_TRANSITION)); | ||
| } |
There was a problem hiding this comment.
Suggested change
| if (trigger.getSeekStartPosition() != null) | |
| // if scrubbing over ad, seek straight to it | |
| player.seekTo(trigger.getSeekTarget().getTotalMilliseconds()); | |
| else | |
| // if naturally entering ad, seek to end of ad break | |
| player.seekTo(player.getCurrentPosition() + adBreak.getDurationExcludingAux().getTotalMilliseconds()); | |
| // send "end of ads" trigger to state machine so everything doesn't get whacky | |
| state.doTrigger(new SimpleTrigger(AdEnabledPlayerTriggerType.NO_MORE_ADS_SKIP_TRANSITION)); | |
| } | |
| if (trigger.getSeekStartPosition() != null) | |
| // If scrubbing over an ad, seek straight to it. | |
| player.seekTo(trigger.getSeekTarget().getTotalMilliseconds()); | |
| else | |
| // If naturally entering an ad, seek to end the ad break. | |
| player.seekTo(player.getCurrentPosition() + adBreak.getDurationExcludingAux().getTotalMilliseconds()); | |
| // Send "end of ads" trigger to state machine so everything doesn't get whacky. | |
| state.doTrigger(new SimpleTrigger(AdEnabledPlayerTriggerType.NO_MORE_ADS_SKIP_TRANSITION)); | |
| } |
oSumAtrIX
reviewed
Apr 29, 2025
Comment on lines
+16
to
+17
| // if scrubbing over ad, seek straight to it | ||
| player.seekTo(trigger.getSeekTarget().getTotalMilliseconds()); |
oSumAtrIX
reviewed
Apr 29, 2025
| addInstructions( | ||
| getPlayerIndex + 2, | ||
| """ | ||
| invoke-static {p0, p1, v${playerRegister}}, Lapp/revanced/extension/primevideo/ads/SkipAdsPatch;->ServerInsertedAdBreakState_enter(Lcom/amazon/avod/media/ads/internal/state/ServerInsertedAdBreakState;Lcom/amazon/avod/media/ads/internal/state/AdBreakTrigger;Lcom/amazon/avod/media/playback/VideoPlayer;)V |
There was a problem hiding this comment.
Suggested change
| invoke-static {p0, p1, v${playerRegister}}, Lapp/revanced/extension/primevideo/ads/SkipAdsPatch;->ServerInsertedAdBreakState_enter(Lcom/amazon/avod/media/ads/internal/state/ServerInsertedAdBreakState;Lcom/amazon/avod/media/ads/internal/state/AdBreakTrigger;Lcom/amazon/avod/media/playback/VideoPlayer;)V | |
| invoke-static { p0, p1, v$playerRegister }, Lapp/revanced/extension/primevideo/ads/SkipAdsPatch;->ServerInsertedAdBreakState_enter(Lcom/amazon/avod/media/ads/internal/state/ServerInsertedAdBreakState;Lcom/amazon/avod/media/ads/internal/state/AdBreakTrigger;Lcom/amazon/avod/media/playback/VideoPlayer;)V |
oSumAtrIX
reviewed
Apr 29, 2025
| enterServerInsertedAdBreakStateFingerprint.method.apply { | ||
| // Get register that stores VideoPlayer: | ||
| // invoke-virtual ->getPrimaryPlayer() | ||
| // move-result-object {vx} |
There was a problem hiding this comment.
Suggested change
| // move-result-object {vx} | |
| // move-result-object { playerRegister } |
oSumAtrIX
reviewed
Apr 29, 2025
| Opcode.CONST_4 | ||
| ) | ||
| custom { method, classDef -> | ||
| method.name == "enter" && classDef.type == "Lcom/amazon/avod/media/ads/internal/state/ServerInsertedAdBreakState;" |
There was a problem hiding this comment.
Is ".type" needed here? ClassDef extends CharSequence
There was a problem hiding this comment.
Not needed since it's not using any String methods (such as endsWith).
but not sure if using == will show a false warning about comparing different types since ClassDef is a CharSequence not a String. I guess it could be with or without .type, but I find it slightly more convoluted comparing the non-String ClassDef object directly to a static String.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a first pass of a patch for Amazon Prime Video to skip ads. Ad breaks seem to be baked into the incoming stream, so the best we can do is force the video player to seek over them.
I could use some help with more extensive testing since the Prime Video app has like 5 different video player implementations and I'm not sure when (if?) the ones that I didn't patch are used.