loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete glPrograms in Contrast and RgbMatrix.

Browse Source 
Remove unecessary null checks.

PiperOrigin-RevId: 469999952
This commit is contained in:
leonwind 2022-08-25 15:49:13 +00:00 committed by Marc Baechinger
parent 0f48c89f1f
commit f454c9aa74
5 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/BitmapOverlayProcessor.java
View File

@ -129,7 +129,7 @@ import java.util.Locale;
@Override @Override
public void drawFrame(int inputTexId, long presentationTimeUs) throws FrameProcessingException { public void drawFrame(int inputTexId, long presentationTimeUs) throws FrameProcessingException {
try { try {
checkStateNotNull(glProgram).use(); glProgram.use();
// Draw to the canvas and store it in a texture. // Draw to the canvas and store it in a texture.
String text = String text =
@ -159,14 +159,12 @@ import java.util.Locale;
@Override @Override
public void release() throws FrameProcessingException { public void release() throws FrameProcessingException {
super.release(); super.release();
if (glProgram != null) {
try { try {
glProgram.delete(); glProgram.delete();
} catch (GlUtil.GlException e) { } catch (GlUtil.GlException e) {
throw new FrameProcessingException(e); throw new FrameProcessingException(e);
} }
} }
}
private static Bitmap flipBitmapVertically(Bitmap bitmap) { private static Bitmap flipBitmapVertically(Bitmap bitmap) {
Matrix flip = new Matrix(); Matrix flip = new Matrix();

2
demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/PeriodicVignetteProcessor.java
View File

@ -114,7 +114,6 @@ import java.io.IOException;
@Override @Override
public void release() throws FrameProcessingException { public void release() throws FrameProcessingException {
super.release(); super.release();
if (glProgram != null) {
try { try {
glProgram.delete(); glProgram.delete();
} catch (GlUtil.GlException e) { } catch (GlUtil.GlException e) {
@ -122,4 +121,3 @@ import java.io.IOException;
} }
} }
} }
}

10
google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/ContrastProcessor.java vendored
View File

@ -75,4 +75,14 @@ import java.io.IOException;
throw new FrameProcessingException(e, presentationTimeUs); throw new FrameProcessingException(e, presentationTimeUs);
} }
} }
@Override
public void release() throws FrameProcessingException {
super.release();
try {
glProgram.delete();
} catch (GlUtil.GlException e) {
throw new FrameProcessingException(e);
}
}
} }

2
google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/MatrixTransformationProcessor.java vendored
View File

@ -321,14 +321,12 @@ import java.util.Arrays;
@Override @Override
public void release() throws FrameProcessingException { public void release() throws FrameProcessingException {
super.release(); super.release();
if (glProgram != null) {
try { try {
glProgram.delete(); glProgram.delete();
} catch (GlUtil.GlException e) { } catch (GlUtil.GlException e) {
throw new FrameProcessingException(e); throw new FrameProcessingException(e);
} }
} }
}
/** /**
* Updates {@link #compositeTransformationMatrix} and {@link #visiblePolygon} based on the given * Updates {@link #compositeTransformationMatrix} and {@link #visiblePolygon} based on the given

10
google3/third_party/java_src/android_libs/media/libraries/effect/src/main/java/androidx/media3/effect/RgbMatrixProcessor.java vendored
View File

@ -135,4 +135,14 @@ import java.io.IOException;
throw new FrameProcessingException(e, presentationTimeUs); throw new FrameProcessingException(e, presentationTimeUs);
} }
} }
@Override
public void release() throws FrameProcessingException {
super.release();
try {
glProgram.delete();
} catch (GlUtil.GlException e) {
throw new FrameProcessingException(e);
}
}
} }