Skip to content

Commit c1a2ae8

Browse files
authored
Fixed #2448 and hdr by removing brightness filter
1 parent fda9f0f commit c1a2ae8

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,8 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
210210
playerBinding = PlayerCustomLayoutBinding.bind(root.findViewById(R.id.player_holder))
211211

212212
// Create GPUPlayerView dynamically and attach it to the PlayerView's content frame
213-
safe {
213+
// !!! Removed due to HDR conflict !!!
214+
/*safe {
214215
val pv = root.findViewById<androidx.media3.ui.PlayerView>(R.id.player_view)
215216
val packageName = context?.packageName ?: return@safe
216217
val contentId = resources.getIdentifier("exo_content_frame", "id", packageName)
@@ -225,7 +226,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
225226
contentFrame.addView(gpu, 0, lp)
226227
gpuPlayerView = gpu
227228
}
228-
}
229+
}*/
229230
return root
230231
}
231232

@@ -1463,12 +1464,12 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
14631464
}
14641465

14651466
val lastRequested = currentRequestedBrightness
1466-
val nextBrightness = currentRequestedBrightness + verticalAddition
1467+
val nextBrightness = (currentRequestedBrightness + verticalAddition).coerceIn(0.0f, 1.0f) // !!! Removed due to HDR conflict !!!
14671468
//
14681469
// Log.e("Brightness", "Current: $currentRequestedBrightness, Next: $nextBrightness")
14691470
// show toast
14701471
if (nextBrightness > 1.0f && isBrightnessLocked && !hasShownBrightnessToast) {
1471-
showToast(R.string.slide_up_again_to_exceed_100)
1472+
//showToast(R.string.slide_up_again_to_exceed_100)
14721473
hasShownBrightnessToast = true
14731474
}
14741475
currentRequestedBrightness = nextBrightness
@@ -1478,14 +1479,15 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
14781479
setBrightness(currentRequestedBrightness)
14791480

14801481
val level1ProgressBar = playerProgressbarRightLevel1
1481-
val level2ProgressBar = playerProgressbarRightLevel2
1482+
//val level2ProgressBar = playerProgressbarRightLevel2
14821483

14831484
// max is set high to make it smooth
14841485
level1ProgressBar.max = 100_000
14851486
level1ProgressBar.progress =
14861487
max(2_000, (min(1.0f, currentRequestedBrightness) * 100_000f).toInt())
14871488

1488-
if (!isBrightnessLocked) {
1489+
// !!! Removed due to HDR conflict !!!
1490+
/*if (!isBrightnessLocked) {
14891491
currentExtraBrightness = if (currentRequestedBrightness > 1.0f) min(2.0f, currentRequestedBrightness) - 1.0f else 0.0f
14901492
level2ProgressBar.max = 100_000
14911493
level2ProgressBar.progress =
@@ -1539,7 +1541,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
15391541
)
15401542
)
15411543
}
1542-
}
1544+
}*/
15431545

15441546
// Log.i("Brightness", "current: $currentRequestedBrightness, ce: $currentExtraBrightness L1: ${level1ProgressBar.progress}, L2: ${level2ProgressBar.progress}")
15451547
playerProgressbarRightIcon.setImageResource(

0 commit comments

Comments
 (0)