From a7d3752c6655d6572101b4b4c8b88c885fcf80de Mon Sep 17 00:00:00 2001
From: leonwind <leonwind@google.com>
Date: Thu, 25 Aug 2022 15:49:13 +0000
Subject: [PATCH] Delete glPrograms in Contrast and RgbMatrix. Remove
 unecessary null checks.

PiperOrigin-RevId: 469999952
---
 .../demo/transformer/BitmapOverlayProcessor.java     | 12 +++++-------
 .../demo/transformer/PeriodicVignetteProcessor.java  | 10 ++++------
 .../androidx/media3/effect/ContrastProcessor.java    | 10 ++++++++++
 .../media3/effect/MatrixTransformationProcessor.java | 10 ++++------
 .../androidx/media3/effect/RgbMatrixProcessor.java   | 10 ++++++++++
 5 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/demos/transformer/src/main/java/androidx/media3/demo/transformer/BitmapOverlayProcessor.java b/demos/transformer/src/main/java/androidx/media3/demo/transformer/BitmapOverlayProcessor.java
index 72b7c8b817..b5d1e5337d 100644
--- a/demos/transformer/src/main/java/androidx/media3/demo/transformer/BitmapOverlayProcessor.java
+++ b/demos/transformer/src/main/java/androidx/media3/demo/transformer/BitmapOverlayProcessor.java
@@ -129,7 +129,7 @@ import java.util.Locale;
   @Override
   public void drawFrame(int inputTexId, long presentationTimeUs) throws FrameProcessingException {
     try {
-      checkStateNotNull(glProgram).use();
+      glProgram.use();
 
       // Draw to the canvas and store it in a texture.
       String text =
@@ -159,12 +159,10 @@ import java.util.Locale;
   @Override
   public void release() throws FrameProcessingException {
     super.release();
-    if (glProgram != null) {
-      try {
-        glProgram.delete();
-      } catch (GlUtil.GlException e) {
-        throw new FrameProcessingException(e);
-      }
+    try {
+      glProgram.delete();
+    } catch (GlUtil.GlException e) {
+      throw new FrameProcessingException(e);
     }
   }
 
diff --git a/demos/transformer/src/main/java/androidx/media3/demo/transformer/PeriodicVignetteProcessor.java b/demos/transformer/src/main/java/androidx/media3/demo/transformer/PeriodicVignetteProcessor.java
index eb4f07e892..045b958a70 100644
--- a/demos/transformer/src/main/java/androidx/media3/demo/transformer/PeriodicVignetteProcessor.java
+++ b/demos/transformer/src/main/java/androidx/media3/demo/transformer/PeriodicVignetteProcessor.java
@@ -114,12 +114,10 @@ import java.io.IOException;
   @Override
   public void release() throws FrameProcessingException {
     super.release();
-    if (glProgram != null) {
-      try {
-        glProgram.delete();
-      } catch (GlUtil.GlException e) {
-        throw new FrameProcessingException(e);
-      }
+    try {
+      glProgram.delete();
+    } catch (GlUtil.GlException e) {
+      throw new FrameProcessingException(e);
     }
   }
 }
diff --git a/libraries/effect/src/main/java/androidx/media3/effect/ContrastProcessor.java b/libraries/effect/src/main/java/androidx/media3/effect/ContrastProcessor.java
index 021d6b694b..274cb4a306 100644
--- a/libraries/effect/src/main/java/androidx/media3/effect/ContrastProcessor.java
+++ b/libraries/effect/src/main/java/androidx/media3/effect/ContrastProcessor.java
@@ -75,4 +75,14 @@ import java.io.IOException;
       throw new FrameProcessingException(e, presentationTimeUs);
     }
   }
+
+  @Override
+  public void release() throws FrameProcessingException {
+    super.release();
+    try {
+      glProgram.delete();
+    } catch (GlUtil.GlException e) {
+      throw new FrameProcessingException(e);
+    }
+  }
 }
diff --git a/libraries/effect/src/main/java/androidx/media3/effect/MatrixTransformationProcessor.java b/libraries/effect/src/main/java/androidx/media3/effect/MatrixTransformationProcessor.java
index 75de5db21d..2686327658 100644
--- a/libraries/effect/src/main/java/androidx/media3/effect/MatrixTransformationProcessor.java
+++ b/libraries/effect/src/main/java/androidx/media3/effect/MatrixTransformationProcessor.java
@@ -323,12 +323,10 @@ import java.util.Arrays;
   @Override
   public void release() throws FrameProcessingException {
     super.release();
-    if (glProgram != null) {
-      try {
-        glProgram.delete();
-      } catch (GlUtil.GlException e) {
-        throw new FrameProcessingException(e);
-      }
+    try {
+      glProgram.delete();
+    } catch (GlUtil.GlException e) {
+      throw new FrameProcessingException(e);
     }
   }
 
diff --git a/libraries/effect/src/main/java/androidx/media3/effect/RgbMatrixProcessor.java b/libraries/effect/src/main/java/androidx/media3/effect/RgbMatrixProcessor.java
index 168dab91df..f43d27643c 100644
--- a/libraries/effect/src/main/java/androidx/media3/effect/RgbMatrixProcessor.java
+++ b/libraries/effect/src/main/java/androidx/media3/effect/RgbMatrixProcessor.java
@@ -135,4 +135,14 @@ import java.io.IOException;
       throw new FrameProcessingException(e, presentationTimeUs);
     }
   }
+
+  @Override
+  public void release() throws FrameProcessingException {
+    super.release();
+    try {
+      glProgram.delete();
+    } catch (GlUtil.GlException e) {
+      throw new FrameProcessingException(e);
+    }
+  }
 }