loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Mp4MetadataInfo: add format and time-based I-frame timestamp extraction

Browse Source 
PiperOrigin-RevId: 580132463
This commit is contained in:
tofunmi 2023-11-07 04:28:40 -08:00 committed by Copybara-Service
parent 089910546f
commit 4311cf1d6c
2 changed files with 129 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
libraries/transformer/src/main/java/androidx/media3/transformer/Mp4MetadataInfo.java
View File

@ -15,6 +15,7 @@
*/
package androidx.media3.transformer;
import static androidx.media3.common.util.Assertions.checkNotNull;
import static androidx.media3.common.util.Assertions.checkState;
import static java.lang.Math.min;
@ -36,6 +37,7 @@ import androidx.media3.extractor.mp4.Mp4Extractor;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
/** Provides MP4 metadata like duration, last sync sample timestamp etc. */
@ -52,9 +54,25 @@ import org.checkerframework.checker.nullness.qual.Nullable;
*/
public final long lastSyncSampleTimestampUs;
private Mp4MetadataInfo(long durationUs, long lastSyncSampleTimestampUs) {
/**
* The presentation timestamp (in microseconds) of the first sync sample at or after {@code
* timeUs}. Set to {@link C#TIME_UNSET} if there is no video track or if {@code timeUs} is {@link
* C#TIME_UNSET}.
*/
public final long firstSyncSampleTimestampUsAfterTimeUs;
/** The video {@link Format} or {@code null} if there is no video track. */
public final @Nullable Format videoFormat;
private Mp4MetadataInfo(
long durationUs,
long lastSyncSampleTimestampUs,
long firstSyncSampleTimestampUsAfterTimeUs,
@Nullable Format videoFormat) {
this.durationUs = durationUs;
this.lastSyncSampleTimestampUs = lastSyncSampleTimestampUs;
this.firstSyncSampleTimestampUsAfterTimeUs = firstSyncSampleTimestampUsAfterTimeUs;
this.videoFormat = videoFormat;
}
/**
@ -65,6 +83,20 @@ import org.checkerframework.checker.nullness.qual.Nullable;
* @throws IOException If an error occurs during metadata extraction.
*/
public static Mp4MetadataInfo create(Context context, String filePath) throws IOException {
return create(context, filePath, C.TIME_UNSET);
}
/**
* Extracts the MP4 metadata synchronously and returns {@link Mp4MetadataInfo}.
*
* @param context A {@link Context}.
* @param filePath The file path of a valid MP4.
* @param timeUs The time (in microseconds) used to calculate the {@link
* #firstSyncSampleTimestampUsAfterTimeUs}. {@link C#TIME_UNSET} if not needed.
* @throws IOException If an error occurs during metadata extraction.
*/
public static Mp4MetadataInfo create(Context context, String filePath, long timeUs)
throws IOException {
Mp4Extractor mp4Extractor = new Mp4Extractor();
ExtractorOutputImpl extractorOutput = new ExtractorOutputImpl();
DefaultDataSource dataSource =
@ -97,18 +129,37 @@ import org.checkerframework.checker.nullness.qual.Nullable;
throw new IllegalStateException("The MP4 file is invalid");
}
}
long durationUs = mp4Extractor.getDurationUs();
long lastSyncSampleTimestampUs = C.TIME_UNSET;
long firstSyncSampleTimestampUsAfterTimeUs = C.TIME_UNSET;
@Nullable Format videoFormat = null;
// Fetch last sync sample timestamp.
if (extractorOutput.videoTrackId != C.INDEX_UNSET) {
ExtractorOutputImpl.TrackOutputImpl videoTrackOutput =
checkNotNull(extractorOutput.trackTypeToTrackOutput.get(C.TRACK_TYPE_VIDEO));
videoFormat = checkNotNull(videoTrackOutput.format);
checkState(durationUs != C.TIME_UNSET);
SeekMap.SeekPoints seekPoints =
SeekMap.SeekPoints lastSyncSampleSeekPoints =
mp4Extractor.getSeekPoints(durationUs, extractorOutput.videoTrackId);
lastSyncSampleTimestampUs = seekPoints.first.timeUs;
lastSyncSampleTimestampUs = lastSyncSampleSeekPoints.first.timeUs;
if (timeUs != C.TIME_UNSET) {
if (timeUs < durationUs) {
SeekMap.SeekPoints firstSyncSampleSeekPoints =
mp4Extractor.getSeekPoints(timeUs, extractorOutput.videoTrackId);
firstSyncSampleTimestampUsAfterTimeUs =
firstSyncSampleSeekPoints.first.timeUs == timeUs
? timeUs
: firstSyncSampleSeekPoints.second.timeUs;
}
return new Mp4MetadataInfo(durationUs, lastSyncSampleTimestampUs);
}
}
return new Mp4MetadataInfo(
durationUs,
lastSyncSampleTimestampUs,
firstSyncSampleTimestampUsAfterTimeUs,
videoFormat);
} finally {
DataSourceUtil.closeQuietly(dataSource);
mp4Extractor.release();
@ -119,7 +170,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
public int videoTrackId;
public boolean seekMapInitialized;
private final Map<Integer, TrackOutput> trackTypeToTrackOutput;
final Map<Integer, TrackOutputImpl> trackTypeToTrackOutput;
public ExtractorOutputImpl() {
videoTrackId = C.INDEX_UNSET;
@ -132,7 +183,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
videoTrackId = id;
}
@Nullable TrackOutput trackOutput = trackTypeToTrackOutput.get(type);
@Nullable TrackOutputImpl trackOutput = trackTypeToTrackOutput.get(type);
if (trackOutput == null) {
trackOutput = new TrackOutputImpl();
trackTypeToTrackOutput.put(type, trackOutput);
@ -151,6 +202,8 @@ import org.checkerframework.checker.nullness.qual.Nullable;
private static final class TrackOutputImpl implements TrackOutput {
private static final int FIXED_BYTE_ARRAY_SIZE = 16_000;
public @MonotonicNonNull Format format;
private final byte[] byteArray;
public TrackOutputImpl() {
@ -158,7 +211,9 @@ import org.checkerframework.checker.nullness.qual.Nullable;
}
@Override
public void format(Format format) {}
public void format(Format format) {
this.format = format;
}
@Override
public int sampleData(

65
libraries/transformer/src/test/java/androidx/media3/transformer/Mp4MetadataInfoTest.java
View File

@ -20,6 +20,7 @@ import static org.junit.Assert.assertThrows;
import android.content.Context;
import androidx.media3.common.C;
import androidx.media3.common.Format;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import java.io.IOException;
@ -83,4 +84,68 @@ public class Mp4MetadataInfoTest {
assertThat(mp4MetadataInfo.durationUs).isEqualTo(4_236_600L); // The duration of hdr10-720p.mp4.
}
@Test
public void firstSyncSampleTimestampUsAfterTimeUs_timeUsIsSyncSample_outputsFirstTimestamp()
throws IOException {
String mp4FilePath = "asset:///media/mp4/sample.mp4";
Mp4MetadataInfo mp4MetadataInfo = Mp4MetadataInfo.create(context, mp4FilePath, /* timeUs= */ 0);
assertThat(mp4MetadataInfo.firstSyncSampleTimestampUsAfterTimeUs)
.isEqualTo(0); // The timestamp of the first sample in sample.mp4.
}
@Test
public void firstSyncSampleTimestampUsAfterTimeUs_timeUsNotASyncSample_returnsCorrectTimestamp()
throws IOException {
String mp4FilePath = "asset:///media/mp4/hdr10-720p.mp4";
Mp4MetadataInfo mp4MetadataInfo =
Mp4MetadataInfo.create(context, mp4FilePath, /* timeUs= */ 400);
assertThat(mp4MetadataInfo.firstSyncSampleTimestampUsAfterTimeUs).isEqualTo(1_002_955L);
}
@Test
public void firstSyncSampleTimestampUsAfterTimeUs_timeUsSetToDuration_returnsTimeUnset()
throws IOException {
String mp4FilePath = "asset:///media/mp4/hdr10-720p.mp4";
Mp4MetadataInfo mp4MetadataInfo =
Mp4MetadataInfo.create(context, mp4FilePath, /* timeUs= */ 4_236_600L);
assertThat(mp4MetadataInfo.firstSyncSampleTimestampUsAfterTimeUs).isEqualTo(C.TIME_UNSET);
}
@Test
public void firstSyncSampleTimestampUsAfterTimeUs_ofAudioOnlyMp4File_returnsUnsetValue()
throws IOException {
String mp4FilePath = "asset:///media/mp4/sample_ac3.mp4";
Mp4MetadataInfo mp4MetadataInfo = Mp4MetadataInfo.create(context, mp4FilePath, /* timeUs= */ 0);
assertThat(mp4MetadataInfo.firstSyncSampleTimestampUsAfterTimeUs).isEqualTo(C.TIME_UNSET);
}
@Test
public void videoFormat_outputsFormatObjectWithCorrectInitializationData() throws IOException {
String mp4FilePath = "asset:///media/mp4/sample.mp4";
Mp4MetadataInfo mp4MetadataInfo = Mp4MetadataInfo.create(context, mp4FilePath);
byte[] expectedCsd0 = {
0, 0, 0, 1, 103, 100, 0, 31, -84, -39, 64, 68, 5, -66, 95, 1, 16, 0, 0, 62, -112, 0, 14, -90,
0, -15, -125, 25, 96
};
byte[] expectedCsd1 = {0, 0, 0, 1, 104, -21, -29, -53, 34, -64};
Format actualFormat = mp4MetadataInfo.videoFormat;
assertThat(actualFormat).isNotNull();
assertThat(actualFormat.initializationData.get(0)).isEqualTo(expectedCsd0);
assertThat(actualFormat.initializationData.get(1)).isEqualTo(expectedCsd1);
}
@Test
public void videoFormat_audioOnlyMp4File_outputsNull() throws IOException {
String mp4FilePath = "asset:///media/mp4/sample_ac3.mp4";
Mp4MetadataInfo mp4MetadataInfo = Mp4MetadataInfo.create(context, mp4FilePath);
assertThat(mp4MetadataInfo.videoFormat).isNull();
}
}