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

Remove unnecessary FileChannel from Mp4Muxer

Browse Source 
As per the documentation, closing a `FileOutputStream`
automatically closes the associated `FileChannel`.

PiperOrigin-RevId: 646152280
This commit is contained in:
sheenachhabra 2024-06-24 10:55:38 -07:00 committed by Copybara-Service
parent 327f728010
commit babc9c69c6
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/muxer/src/main/java/androidx/media3/muxer/Mp4Muxer.java
View File

@ -39,7 +39,6 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
/** /**
* A muxer for creating an MP4 container file. * A muxer for creating an MP4 container file.
@ -181,7 +180,6 @@ public final class Mp4Muxer implements Muxer {
private static final String TAG = "Mp4Muxer"; private static final String TAG = "Mp4Muxer";
private final FileOutputStream fileOutputStream; private final FileOutputStream fileOutputStream;
private final FileChannel fileChannel;
private final MetadataCollector metadataCollector; private final MetadataCollector metadataCollector;
private final Mp4Writer mp4Writer; private final Mp4Writer mp4Writer;
@ -192,13 +190,12 @@ public final class Mp4Muxer implements Muxer {
boolean sampleCopyEnabled, boolean sampleCopyEnabled,
boolean attemptStreamableOutputEnabled) { boolean attemptStreamableOutputEnabled) {
this.fileOutputStream = fileOutputStream; this.fileOutputStream = fileOutputStream;
this.fileChannel = fileOutputStream.getChannel();
metadataCollector = new MetadataCollector(); metadataCollector = new MetadataCollector();
Mp4MoovStructure moovStructure = Mp4MoovStructure moovStructure =
new Mp4MoovStructure(metadataCollector, lastFrameDurationBehavior); new Mp4MoovStructure(metadataCollector, lastFrameDurationBehavior);
mp4Writer = mp4Writer =
new Mp4Writer( new Mp4Writer(
fileChannel, fileOutputStream.getChannel(),
moovStructure, moovStructure,
annexBToAvccConverter, annexBToAvccConverter,
sampleCopyEnabled, sampleCopyEnabled,
@ -302,15 +299,6 @@ public final class Mp4Muxer implements Muxer {
} catch (IOException e) { } catch (IOException e) {
exception = new MuxerException("Failed to finish writing samples", e); exception = new MuxerException("Failed to finish writing samples", e);
} }
try {
fileChannel.close();
} catch (IOException e) {
if (exception == null) {
exception = new MuxerException("Failed to close output channel", e);
} else {
Log.e(TAG, "Failed to close output channel", e);
}
}
try { try {
fileOutputStream.close(); fileOutputStream.close();
} catch (IOException e) { } catch (IOException e) {