diff --git a/libraries/effect/src/main/java/androidx/media3/effect/AlphaScale.java b/libraries/effect/src/main/java/androidx/media3/effect/AlphaScale.java index de8d290196..c7dc236d3e 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/AlphaScale.java +++ b/libraries/effect/src/main/java/androidx/media3/effect/AlphaScale.java @@ -32,7 +32,7 @@ public final class AlphaScale implements GlEffect { * modify translucency. * *
An {@code alphaScale} value of {@code 1} means no change is applied. A value below {@code 1} - * reduces translucency, and a value above {@code 1} increases translucency. + * increases translucency, and a value above {@code 1} reduces translucency. */ public AlphaScale(@FloatRange(from = 0) float alphaScale) { checkArgument(0 <= alphaScale); diff --git a/libraries/effect/src/main/java/androidx/media3/effect/OverlaySettings.java b/libraries/effect/src/main/java/androidx/media3/effect/OverlaySettings.java index b5c0372525..35e947c7e8 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/OverlaySettings.java +++ b/libraries/effect/src/main/java/androidx/media3/effect/OverlaySettings.java @@ -78,15 +78,16 @@ public final class OverlaySettings { } /** - * Sets the alpha value of the overlay, altering its transparency. + * Sets the alpha scale value of the overlay, altering its translucency. * - *
Alpha values range from 0 (all transparent) to 1 (completely opaque). + *
An {@code alpha} value of {@code 1} means no change is applied. A value below {@code 1} + * increases translucency, and a value above {@code 1} reduces translucency. * *
Set to always return {@code 1} by default.
*/
@CanIgnoreReturnValue
- public Builder setAlpha(@FloatRange(from = 0, to = 1) float alpha) {
- checkArgument(0 <= alpha && alpha <= 1, "Alpha needs to be in the interval [0, 1].");
+ public Builder setAlpha(@FloatRange(from = 0) float alpha) {
+ checkArgument(0 <= alpha, "Alpha needs to be more than or equal to zero.");
this.alpha = alpha;
return this;
}
diff --git a/libraries/effect/src/main/java/androidx/media3/effect/OverlayShaderProgram.java b/libraries/effect/src/main/java/androidx/media3/effect/OverlayShaderProgram.java
index f22e3dbbcf..f1faa82cb3 100644
--- a/libraries/effect/src/main/java/androidx/media3/effect/OverlayShaderProgram.java
+++ b/libraries/effect/src/main/java/androidx/media3/effect/OverlayShaderProgram.java
@@ -117,6 +117,8 @@ import com.google.common.collect.ImmutableList;
Util.formatInvariant("uOverlayTexSampler%d", texUnitIndex),
overlay.getTextureId(presentationTimeUs),
texUnitIndex);
+ OverlaySettings overlaySettings = overlay.getOverlaySettings(presentationTimeUs);
+ Size overlaySize = overlay.getTextureSize(presentationTimeUs);
GlUtil.setToIdentity(aspectRatioMatrix);
GlUtil.setToIdentity(videoFrameAnchorMatrix);
@@ -131,8 +133,7 @@ import com.google.common.collect.ImmutableList;
GlUtil.setToIdentity(transformationMatrix);
// Anchor point of overlay within output frame.
- Pair