From 757585ce6d8fc9c27ddb32d9179fdea732378e09 Mon Sep 17 00:00:00 2001 From: samrobinson Date: Tue, 5 Dec 2023 10:11:00 -0800 Subject: [PATCH] Release MuxerWrapper in every test (in an @After block). PiperOrigin-RevId: 588110566 --- .../media3/transformer/MuxerWrapperTest.java | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/MuxerWrapperTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/MuxerWrapperTest.java index b172efc7bf..ab6731b1df 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/MuxerWrapperTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/MuxerWrapperTest.java @@ -21,12 +21,14 @@ import static androidx.media3.transformer.MuxerWrapper.MUXER_MODE_MUX_PARTIAL_VI import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertThrows; +import androidx.annotation.Nullable; import androidx.media3.common.C; import androidx.media3.common.ColorInfo; import androidx.media3.common.Format; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.common.collect.ImmutableList; import java.nio.ByteBuffer; +import org.junit.After; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -54,9 +56,18 @@ public class MuxerWrapperTest { @Rule public final TemporaryFolder temporaryFolder = new TemporaryFolder(); + @Nullable private MuxerWrapper muxerWrapper; + + @After + public void tearDown() throws Muxer.MuxerException { + if (muxerWrapper != null) { + muxerWrapper.release(false); + } + } + @Test public void changeToAppendVideoMode_afterDefaultMode_throws() throws Exception { - MuxerWrapper muxerWrapper = + muxerWrapper = new MuxerWrapper( temporaryFolder.newFile().getPath(), new DefaultMuxer.Factory(), @@ -68,7 +79,7 @@ public class MuxerWrapperTest { @Test public void setTrackCount_toTwoInMuxPartialVideoMode_throws() throws Exception { - MuxerWrapper muxerWrapper = + muxerWrapper = new MuxerWrapper( temporaryFolder.newFile().getPath(), new DefaultMuxer.Factory(), @@ -80,7 +91,7 @@ public class MuxerWrapperTest { @Test public void setTrackCount_toTwoInAppendVideoMode_throws() throws Exception { - MuxerWrapper muxerWrapper = + muxerWrapper = new MuxerWrapper( temporaryFolder.newFile().getPath(), new DefaultMuxer.Factory(), @@ -98,7 +109,7 @@ public class MuxerWrapperTest { @Test public void addTrackFormat_withAudioFormatInMuxPartialVideoMode_throws() throws Exception { - MuxerWrapper muxerWrapper = + muxerWrapper = new MuxerWrapper( temporaryFolder.newFile().getPath(), new DefaultMuxer.Factory(), @@ -112,7 +123,7 @@ public class MuxerWrapperTest { @Test public void addTrackFormat_withSameVideoFormatInAppendVideoMode_doesNotThrow() throws Exception { - MuxerWrapper muxerWrapper = + muxerWrapper = new MuxerWrapper( temporaryFolder.newFile().getPath(), new DefaultMuxer.Factory(), @@ -131,7 +142,7 @@ public class MuxerWrapperTest { @Test public void addTrackFormat_withDifferentVideoFormatInAppendVideoMode_throws() throws Exception { - MuxerWrapper muxerWrapper = + muxerWrapper = new MuxerWrapper( temporaryFolder.newFile().getPath(), new DefaultMuxer.Factory(), @@ -152,7 +163,7 @@ public class MuxerWrapperTest { @Test public void isEnded_afterPartialVideoMuxed_returnsTrue() throws Exception { - MuxerWrapper muxerWrapper = + muxerWrapper = new MuxerWrapper( temporaryFolder.newFile().getPath(), new DefaultMuxer.Factory(), @@ -169,7 +180,7 @@ public class MuxerWrapperTest { @Test public void isEnded_afterStartingAppendVideo_returnsFalse() throws Exception { - MuxerWrapper muxerWrapper = + muxerWrapper = new MuxerWrapper( temporaryFolder.newFile().getPath(), new DefaultMuxer.Factory(),