From 131057366a777786d6016d3385584b4e17bc4a8b Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Sun, 3 Jul 2022 20:50:20 +0200 Subject: [PATCH] feat: `hdr-max-brightness` patch (#105) --- .../watermark/patch/HideWatermarkPatch.kt | 1 - .../annotations/HDRBrightnessCompatibility.kt | 13 +++++ .../fingerprints/HDRBrightnessFingerprint.kt | 35 +++++++++++++ .../hdrbrightness/patch/HDRBrightnessPatch.kt | 51 +++++++++++++++++++ 4 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/annotations/HDRBrightnessCompatibility.kt create mode 100644 src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/fingerprints/HDRBrightnessFingerprint.kt create mode 100644 src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/patch/HDRBrightnessPatch.kt diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/watermark/patch/HideWatermarkPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/watermark/patch/HideWatermarkPatch.kt index 8ddaaaf46..d95eae398 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/watermark/patch/HideWatermarkPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/watermark/patch/HideWatermarkPatch.kt @@ -6,7 +6,6 @@ import app.revanced.patcher.annotation.Version import app.revanced.patcher.data.impl.BytecodeData import app.revanced.patcher.extensions.addInstructions import app.revanced.patcher.extensions.removeInstruction -import app.revanced.patcher.extensions.removeInstructions import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve import app.revanced.patcher.patch.PatchResult import app.revanced.patcher.patch.PatchResultError diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/annotations/HDRBrightnessCompatibility.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/annotations/HDRBrightnessCompatibility.kt new file mode 100644 index 000000000..6239c4582 --- /dev/null +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/annotations/HDRBrightnessCompatibility.kt @@ -0,0 +1,13 @@ +package app.revanced.patches.youtube.misc.hdrbrightness.annotations + +import app.revanced.patcher.annotation.Compatibility +import app.revanced.patcher.annotation.Package + +@Compatibility( + [Package( + "com.google.android.youtube", arrayOf("17.24.34", "17.24.35", "17.25.34") + )] +) +@Target(AnnotationTarget.CLASS) +@Retention(AnnotationRetention.RUNTIME) +internal annotation class HDRBrightnessCompatibility diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/fingerprints/HDRBrightnessFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/fingerprints/HDRBrightnessFingerprint.kt new file mode 100644 index 000000000..a46d9ad26 --- /dev/null +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/fingerprints/HDRBrightnessFingerprint.kt @@ -0,0 +1,35 @@ +package app.revanced.patches.youtube.misc.hdrbrightness.fingerprints + +import app.revanced.patcher.annotation.Name +import app.revanced.patcher.annotation.Version +import app.revanced.patcher.extensions.or +import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod +import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod +import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint +import app.revanced.patches.youtube.misc.hdrbrightness.annotations.HDRBrightnessCompatibility +import org.jf.dexlib2.AccessFlags +import org.jf.dexlib2.Opcode +import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction + +@Name("hdrbrightness-fingerprint") +@MatchingMethod( + "Lghz;", "mZ" +) +@FuzzyPatternScanMethod(3) +@HDRBrightnessCompatibility +@Version("0.0.1") +object HDRBrightnessFingerprint : MethodFingerprint( + "V", AccessFlags.PUBLIC or AccessFlags.FINAL, null, + listOf( + Opcode.MOVE_RESULT_OBJECT, + Opcode.INVOKE_VIRTUAL, + Opcode.MOVE_RESULT_OBJECT, + Opcode.CONST_HIGH16, + Opcode.IPUT, + Opcode.INVOKE_VIRTUAL + ), + null, + customFingerprint = { methodDef -> + methodDef.implementation!!.instructions.count() == 16 && methodDef.implementation!!.instructions.any {((it as? NarrowLiteralInstruction)?.narrowLiteral == (-1.0f).toRawBits())} + } +) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/patch/HDRBrightnessPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/patch/HDRBrightnessPatch.kt new file mode 100644 index 000000000..b198c87bc --- /dev/null +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/patch/HDRBrightnessPatch.kt @@ -0,0 +1,51 @@ +package app.revanced.patches.youtube.misc.hdrbrightness.patch; + +import app.revanced.patcher.annotation.Description; +import app.revanced.patcher.annotation.Name; +import app.revanced.patcher.annotation.Version; +import app.revanced.patcher.data.impl.BytecodeData +import app.revanced.patcher.extensions.addInstructions +import app.revanced.patcher.extensions.removeInstruction +import app.revanced.patcher.patch.PatchResult +import app.revanced.patcher.patch.PatchResultError +import app.revanced.patcher.patch.PatchResultSuccess +import app.revanced.patcher.patch.annotations.Patch; +import app.revanced.patcher.patch.impl.BytecodePatch; +import app.revanced.patcher.util.smali.toBuilderInstruction +import app.revanced.patches.youtube.misc.hdrbrightness.annotations.HDRBrightnessCompatibility; +import app.revanced.patches.youtube.misc.hdrbrightness.fingerprints.HDRBrightnessFingerprint +import org.jf.dexlib2.Opcode +import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction +import org.jf.dexlib2.iface.instruction.OneRegisterInstruction + +@Patch +@Name("hdr-max-brightness") +@Description("Set brightness to max for HDR videos in fullscreen mode.") +@HDRBrightnessCompatibility +@Version("0.0.1") +class HDRBrightnessPatch : BytecodePatch( + listOf( + HDRBrightnessFingerprint + ) +) { + override fun execute(data: BytecodeData): PatchResult { + val result = HDRBrightnessFingerprint.result + ?: return PatchResultError("HDRBrightnessFingerprint could not resolve the method!") + + + val method = result.mutableMethod + + //Get the index here so we know where to inject our code to override -1.0f + val index = method.implementation!!.instructions.indexOfFirst { ((it as? NarrowLiteralInstruction)?.narrowLiteral == (-1.0f).toRawBits()) } + val register = (method.implementation!!.instructions.get(index) as OneRegisterInstruction).registerA + + method.addInstructions( + index + 1, """ + invoke-static {v$register}, Lapp/revanced/integrations/patches/HDRMaxBrightnessPatch;->getHDRBrightness(F)F + move-result v$register + """ + ) + + return PatchResultSuccess() + } +}