From 668a172683d083bb7c19dd3a053de83a409e23b0 Mon Sep 17 00:00:00 2001 From: sheenachhabra Date: Wed, 13 Mar 2024 06:51:31 -0700 Subject: [PATCH] Rename MuxerWrapper.release() method PiperOrigin-RevId: 615399319 --- .../media3/transformer/MuxerWrapper.java | 5 ++-- .../transformer/TransformerInternal.java | 2 +- .../media3/transformer/MuxerWrapperTest.java | 24 +++++++++---------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/MuxerWrapper.java b/libraries/transformer/src/main/java/androidx/media3/transformer/MuxerWrapper.java index af995cc516..6bda3fd8a9 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/MuxerWrapper.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/MuxerWrapper.java @@ -617,7 +617,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; } /** - * Finishes writing the output and releases any resources associated with muxing. + * Finishes writing the output and may release any resources associated with muxing. * *

When this method is called in {@link #MUXER_MODE_MUX_PARTIAL} mode, the resources are not * released and the {@link MuxerWrapper} can be reused after {@link #changeToAppendMode() changing @@ -631,7 +631,8 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; * @throws Muxer.MuxerException If the underlying {@link Muxer} fails to finish writing the output * and the {@code releaseReason} is not {@link #MUXER_RELEASE_REASON_CANCELLED}. */ - public void release(@MuxerReleaseReason int releaseReason) throws Muxer.MuxerException { + public void finishWritingAndMaybeRelease(@MuxerReleaseReason int releaseReason) + throws Muxer.MuxerException { if (releaseReason == MUXER_RELEASE_REASON_COMPLETED && muxerMode == MUXER_MODE_MUX_PARTIAL) { return; } diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java index 7e28ef8cb5..dd4f9d8fc6 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java @@ -408,7 +408,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; } } try { - muxerWrapper.release(getMuxerReleaseReason(endReason)); + muxerWrapper.finishWritingAndMaybeRelease(getMuxerReleaseReason(endReason)); } catch (Muxer.MuxerException e) { if (releaseExportException == null) { releaseExportException = ExportException.createForMuxer(e, ERROR_CODE_MUXING_FAILED); 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 31cda68ce2..9eec4bc83d 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/MuxerWrapperTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/MuxerWrapperTest.java @@ -77,7 +77,7 @@ public class MuxerWrapperTest { public void tearDown() throws Muxer.MuxerException { if (muxerWrapper != null) { // Release with reason cancellation so that underlying resources are always released. - muxerWrapper.release(MuxerWrapper.MUXER_RELEASE_REASON_CANCELLED); + muxerWrapper.finishWritingAndMaybeRelease(MuxerWrapper.MUXER_RELEASE_REASON_CANCELLED); } } @@ -163,7 +163,7 @@ public class MuxerWrapperTest { muxerWrapper.writeSample( C.TRACK_TYPE_VIDEO, FAKE_SAMPLE, /* isKeyFrame= */ true, /* presentationTimeUs= */ 0); muxerWrapper.endTrack(C.TRACK_TYPE_VIDEO); - muxerWrapper.release(MuxerWrapper.MUXER_RELEASE_REASON_COMPLETED); + muxerWrapper.finishWritingAndMaybeRelease(MuxerWrapper.MUXER_RELEASE_REASON_COMPLETED); muxerWrapper.changeToAppendMode(); muxerWrapper.setTrackCount(1); @@ -185,7 +185,7 @@ public class MuxerWrapperTest { muxerWrapper.writeSample( C.TRACK_TYPE_AUDIO, FAKE_SAMPLE, /* isKeyFrame= */ true, /* presentationTimeUs= */ 0); muxerWrapper.endTrack(C.TRACK_TYPE_AUDIO); - muxerWrapper.release(MuxerWrapper.MUXER_RELEASE_REASON_COMPLETED); + muxerWrapper.finishWritingAndMaybeRelease(MuxerWrapper.MUXER_RELEASE_REASON_COMPLETED); muxerWrapper.changeToAppendMode(); muxerWrapper.setTrackCount(1); @@ -208,7 +208,7 @@ public class MuxerWrapperTest { muxerWrapper.writeSample( C.TRACK_TYPE_VIDEO, FAKE_SAMPLE, /* isKeyFrame= */ true, /* presentationTimeUs= */ 0); muxerWrapper.endTrack(C.TRACK_TYPE_VIDEO); - muxerWrapper.release(MuxerWrapper.MUXER_RELEASE_REASON_COMPLETED); + muxerWrapper.finishWritingAndMaybeRelease(MuxerWrapper.MUXER_RELEASE_REASON_COMPLETED); muxerWrapper.changeToAppendMode(); muxerWrapper.setTrackCount(1); @@ -269,7 +269,7 @@ public class MuxerWrapperTest { muxerWrapper.writeSample( C.TRACK_TYPE_AUDIO, FAKE_SAMPLE, /* isKeyFrame= */ true, /* presentationTimeUs= */ 0); muxerWrapper.endTrack(C.TRACK_TYPE_AUDIO); - muxerWrapper.release(MuxerWrapper.MUXER_RELEASE_REASON_COMPLETED); + muxerWrapper.finishWritingAndMaybeRelease(MuxerWrapper.MUXER_RELEASE_REASON_COMPLETED); muxerWrapper.changeToAppendMode(); muxerWrapper.setTrackCount(1); Format differentAudioFormat = FAKE_AUDIO_TRACK_FORMAT.buildUpon().setSampleRate(48000).build(); @@ -339,7 +339,7 @@ public class MuxerWrapperTest { C.TRACK_TYPE_AUDIO, FAKE_SAMPLE, /* isKeyFrame= */ true, /* presentationTimeUs= */ 17); muxerWrapper.endTrack(C.TRACK_TYPE_AUDIO); muxerWrapper.endTrack(C.TRACK_TYPE_VIDEO); - muxerWrapper.release(MuxerWrapper.MUXER_RELEASE_REASON_COMPLETED); + muxerWrapper.finishWritingAndMaybeRelease(MuxerWrapper.MUXER_RELEASE_REASON_COMPLETED); muxerWrapper = null; DumpFileAsserts.assertOutput( @@ -363,7 +363,7 @@ public class MuxerWrapperTest { muxerWrapper.writeSample( C.TRACK_TYPE_VIDEO, FAKE_SAMPLE, /* isKeyFrame= */ true, /* presentationTimeUs= */ 0); muxerWrapper.endTrack(C.TRACK_TYPE_VIDEO); - muxerWrapper.release(MuxerWrapper.MUXER_RELEASE_REASON_COMPLETED); + muxerWrapper.finishWritingAndMaybeRelease(MuxerWrapper.MUXER_RELEASE_REASON_COMPLETED); assertThat(muxerWrapper.isEnded()).isTrue(); muxerWrapper = null; @@ -392,7 +392,7 @@ public class MuxerWrapperTest { muxerWrapper.writeSample( C.TRACK_TYPE_AUDIO, FAKE_SAMPLE, /* isKeyFrame= */ true, /* presentationTimeUs= */ 0); muxerWrapper.endTrack(C.TRACK_TYPE_AUDIO); - muxerWrapper.release(MuxerWrapper.MUXER_RELEASE_REASON_COMPLETED); + muxerWrapper.finishWritingAndMaybeRelease(MuxerWrapper.MUXER_RELEASE_REASON_COMPLETED); assertThat(muxerWrapper.isEnded()).isTrue(); muxerWrapper = null; @@ -413,7 +413,7 @@ public class MuxerWrapperTest { muxerWrapper.writeSample( C.TRACK_TYPE_VIDEO, FAKE_SAMPLE, /* isKeyFrame= */ true, /* presentationTimeUs= */ 0); muxerWrapper.endTrack(C.TRACK_TYPE_VIDEO); - muxerWrapper.release(MuxerWrapper.MUXER_RELEASE_REASON_COMPLETED); + muxerWrapper.finishWritingAndMaybeRelease(MuxerWrapper.MUXER_RELEASE_REASON_COMPLETED); muxerWrapper.changeToAppendMode(); muxerWrapper.setTrackCount(1); muxerWrapper.addTrackFormat(FAKE_VIDEO_TRACK_FORMAT); @@ -570,7 +570,7 @@ public class MuxerWrapperTest { muxerWrapper.writeSample( C.TRACK_TYPE_VIDEO, FAKE_SAMPLE, /* isKeyFrame= */ true, /* presentationTimeUs= */ 0); - muxerWrapper.release(MuxerWrapper.MUXER_RELEASE_REASON_COMPLETED); + muxerWrapper.finishWritingAndMaybeRelease(MuxerWrapper.MUXER_RELEASE_REASON_COMPLETED); // Resources are not released and samples can be written in the append mode. muxerWrapper.changeToAppendMode(); @@ -596,7 +596,7 @@ public class MuxerWrapperTest { muxerWrapper.writeSample( C.TRACK_TYPE_VIDEO, FAKE_SAMPLE, /* isKeyFrame= */ true, /* presentationTimeUs= */ 0); - muxerWrapper.release(MuxerWrapper.MUXER_RELEASE_REASON_CANCELLED); + muxerWrapper.finishWritingAndMaybeRelease(MuxerWrapper.MUXER_RELEASE_REASON_CANCELLED); // Resources are released and samples can not be written in the append mode. muxerWrapper.changeToAppendMode(); @@ -621,7 +621,7 @@ public class MuxerWrapperTest { muxerWrapper.writeSample( C.TRACK_TYPE_VIDEO, FAKE_SAMPLE, /* isKeyFrame= */ true, /* presentationTimeUs= */ 0); - muxerWrapper.release(MuxerWrapper.MUXER_RELEASE_REASON_ERROR); + muxerWrapper.finishWritingAndMaybeRelease(MuxerWrapper.MUXER_RELEASE_REASON_ERROR); // Resources are released and samples can not be written in the append mode. muxerWrapper.changeToAppendMode();