From 10d06dd12f90bbef867fe1f45e4e24d979c3b821 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Wed, 2 Nov 2022 12:21:56 +0000
Subject: [PATCH] Fix Dackka/Metalava errors in the effects module

Public methods may only refer to public types in their signature. This
change ensures that by switching to a public supertype everywhere.

PiperOrigin-RevId: 485568625
(cherry picked from commit 3fdfe585ffe927c90f412b892101dbe01119b8df)
---
 .../java/com/google/android/exoplayer2/effect/ColorLut.java     | 2 +-
 .../com/google/android/exoplayer2/effect/HslAdjustment.java     | 2 +-
 .../java/com/google/android/exoplayer2/effect/RgbFilter.java    | 2 +-
 .../java/com/google/android/exoplayer2/effect/RgbMatrix.java    | 2 +-
 .../com/google/android/exoplayer2/effect/SingleColorLut.java    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/library/effect/src/main/java/com/google/android/exoplayer2/effect/ColorLut.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/ColorLut.java
index d3a1930f1d..7a05a8f5f2 100644
--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/ColorLut.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/ColorLut.java
@@ -42,7 +42,7 @@ public interface ColorLut extends GlEffect {
   /** This method must be executed on the same thread as other GL commands. */
   @Override
   @WorkerThread
-  default ColorLutProcessor toGlTextureProcessor(Context context, boolean useHdr)
+  default SingleFrameGlTextureProcessor toGlTextureProcessor(Context context, boolean useHdr)
       throws FrameProcessingException {
     return new ColorLutProcessor(context, /* colorLut= */ this, useHdr);
   }
diff --git a/library/effect/src/main/java/com/google/android/exoplayer2/effect/HslAdjustment.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/HslAdjustment.java
index f6a10a1891..9b99830b9a 100644
--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/HslAdjustment.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/HslAdjustment.java
@@ -111,7 +111,7 @@ public class HslAdjustment implements GlEffect {
   }
 
   @Override
-  public HslProcessor toGlTextureProcessor(Context context, boolean useHdr)
+  public SingleFrameGlTextureProcessor toGlTextureProcessor(Context context, boolean useHdr)
       throws FrameProcessingException {
     return new HslProcessor(context, /* hslAdjustment= */ this, useHdr);
   }
diff --git a/library/effect/src/main/java/com/google/android/exoplayer2/effect/RgbFilter.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/RgbFilter.java
index 5ba63be35a..eb806f43fa 100644
--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/RgbFilter.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/RgbFilter.java
@@ -89,7 +89,7 @@ public class RgbFilter implements RgbMatrix {
   }
 
   @Override
-  public MatrixTextureProcessor toGlTextureProcessor(Context context, boolean useHdr)
+  public SingleFrameGlTextureProcessor toGlTextureProcessor(Context context, boolean useHdr)
       throws FrameProcessingException {
     checkForConsistentHdrSetting(useHdr);
     return RgbMatrix.super.toGlTextureProcessor(context, useHdr);
diff --git a/library/effect/src/main/java/com/google/android/exoplayer2/effect/RgbMatrix.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/RgbMatrix.java
index 1db2ea9b11..237aa47091 100644
--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/RgbMatrix.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/RgbMatrix.java
@@ -38,7 +38,7 @@ public interface RgbMatrix extends GlEffect {
   float[] getMatrix(long presentationTimeUs, boolean useHdr);
 
   @Override
-  default MatrixTextureProcessor toGlTextureProcessor(Context context, boolean useHdr)
+  default SingleFrameGlTextureProcessor toGlTextureProcessor(Context context, boolean useHdr)
       throws FrameProcessingException {
     return MatrixTextureProcessor.create(
         context,
diff --git a/library/effect/src/main/java/com/google/android/exoplayer2/effect/SingleColorLut.java b/library/effect/src/main/java/com/google/android/exoplayer2/effect/SingleColorLut.java
index bd5332cb73..696dbbcd9d 100644
--- a/library/effect/src/main/java/com/google/android/exoplayer2/effect/SingleColorLut.java
+++ b/library/effect/src/main/java/com/google/android/exoplayer2/effect/SingleColorLut.java
@@ -147,7 +147,7 @@ public class SingleColorLut implements ColorLut {
   }
 
   @Override
-  public ColorLutProcessor toGlTextureProcessor(Context context, boolean useHdr)
+  public SingleFrameGlTextureProcessor toGlTextureProcessor(Context context, boolean useHdr)
       throws FrameProcessingException {
     checkState(!useHdr, "HDR is currently not supported.");