From 94abb9515b9fef9d5779b76019f6e9a8afc98054 Mon Sep 17 00:00:00 2001 From: sheenachhabra Date: Fri, 9 Aug 2024 09:02:35 -0700 Subject: [PATCH] Write same timestamp in edit data MP4 as in outer MP4 The exiting code ensured that the timestamp is same only when it is set by the app. PiperOrigin-RevId: 661283124 --- .../src/main/java/androidx/media3/muxer/Mp4Muxer.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libraries/muxer/src/main/java/androidx/media3/muxer/Mp4Muxer.java b/libraries/muxer/src/main/java/androidx/media3/muxer/Mp4Muxer.java index ef4ea5e69e..a280085a03 100644 --- a/libraries/muxer/src/main/java/androidx/media3/muxer/Mp4Muxer.java +++ b/libraries/muxer/src/main/java/androidx/media3/muxer/Mp4Muxer.java @@ -297,7 +297,6 @@ public final class Mp4Muxer implements Muxer { @Nullable private FileOutputStream cacheFileOutputStream; @Nullable private MetadataCollector editableVideoMetadataCollector; @Nullable private Mp4Writer editableVideoMp4Writer; - @Nullable private Mp4TimestampData timestampData; private Mp4Muxer( FileOutputStream outputStream, @@ -429,9 +428,6 @@ public final class Mp4Muxer implements Muxer { @Override public void addMetadataEntry(Metadata.Entry metadataEntry) { checkArgument(MuxerUtil.isMetadataSupported(metadataEntry), "Unsupported metadata"); - if (metadataEntry instanceof Mp4TimestampData) { - timestampData = (Mp4TimestampData) metadataEntry; - } metadataCollector.addMetadata(metadataEntry); } @@ -543,9 +539,7 @@ public final class Mp4Muxer implements Muxer { MdtaMetadataEntry.KEY_EDITABLE_TRACKS_MAP, data, MdtaMetadataEntry.TYPE_INDICATOR_RESERVED)); - if (timestampData != null) { - editableVideoMetadataCollector.addMetadata(timestampData); - } + editableVideoMetadataCollector.addMetadata(metadataCollector.timestampData); checkNotNull(editableVideoMp4Writer).finishWritingSamplesAndFinalizeMoovBox(); }