Mp4Extractor: add smta metadata to audio track

This is needed for slomo audio flattening. PiperOrigin-RevId: 346965990
google · Dec 14, 2020 · 4ee02a2 · 4ee02a2
1 parent 73b9cee
commit 4ee02a2
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/MetadataRetrieverTest.java b/library/core/src/test/java/com/google/android/exoplayer2/MetadataRetrieverTest.java
@@ -17,15 +17,18 @@
 package com.google.android.exoplayer2;
 
 import static com.google.android.exoplayer2.MetadataRetriever.retrieveMetadata;
+import static com.google.android.exoplayer2.metadata.mp4.MdtaMetadataEntry.KEY_ANDROID_CAPTURE_FPS;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertThrows;
 
 import android.content.Context;
 import android.net.Uri;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.android.exoplayer2.metadata.mp4.MdtaMetadataEntry;
 import com.google.android.exoplayer2.metadata.mp4.MotionPhotoMetadata;
 import com.google.android.exoplayer2.metadata.mp4.SlowMotionData;
+import com.google.android.exoplayer2.metadata.mp4.SmtaMetadataEntry;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.testutil.AutoAdvancingFakeClock;
 import com.google.android.exoplayer2.util.MimeTypes;
@@ -141,6 +144,8 @@ public void retrieveMetadata_heicStillPhoto_outputsEmptyMetadata() throws Except
   public void retrieveMetadata_sefSlowMotion_outputsExpectedMetadata() throws Exception {
     MediaItem mediaItem =
         MediaItem.fromUri(Uri.parse("asset://android_asset/media/mp4/sample_sef_slow_motion.mp4"));
+    SmtaMetadataEntry expectedSmtaEntry =
+        new SmtaMetadataEntry(/* captureFrameRate= */ 240, /* svcTemporalLayerCount= */ 4);
     List<SlowMotionData.Segment> segments = new ArrayList<>();
     segments.add(
         new SlowMotionData.Segment(
@@ -149,18 +154,26 @@ public void retrieveMetadata_sefSlowMotion_outputsExpectedMetadata() throws Exce
         new SlowMotionData.Segment(
             /* startTimeMs= */ 1255, /* endTimeMs= */ 1970, /* speedDivisor= */ 8));
     SlowMotionData expectedSlowMotionData = new SlowMotionData(segments);
+    MdtaMetadataEntry expectedMdtaEntry =
+        new MdtaMetadataEntry(
+            KEY_ANDROID_CAPTURE_FPS,
+            /* value= */ new byte[] {67, 112, 0, 0},
+            /* localeIndicator= */ 0,
+            /* typeIndicator= */ 23);
 
     ListenableFuture<TrackGroupArray> trackGroupsFuture =
         retrieveMetadata(context, mediaItem, clock);
     TrackGroupArray trackGroups = trackGroupsFuture.get(TEST_TIMEOUT_SEC, TimeUnit.SECONDS);
 
     assertThat(trackGroups.length).isEqualTo(2); // Video and audio
     // Audio
-    assertThat(trackGroups.get(0).getFormat(0).metadata.length()).isEqualTo(1);
-    assertThat(trackGroups.get(0).getFormat(0).metadata.get(0)).isEqualTo(expectedSlowMotionData);
+    assertThat(trackGroups.get(0).getFormat(0).metadata.length()).isEqualTo(2);
+    assertThat(trackGroups.get(0).getFormat(0).metadata.get(0)).isEqualTo(expectedSmtaEntry);
+    assertThat(trackGroups.get(0).getFormat(0).metadata.get(1)).isEqualTo(expectedSlowMotionData);
     // Video
-    assertThat(trackGroups.get(1).getFormat(0).metadata.length())
-        .isEqualTo(3); // 2 Mdta entries and 1 slow motion entry.
+    assertThat(trackGroups.get(1).getFormat(0).metadata.length()).isEqualTo(3);
+    assertThat(trackGroups.get(1).getFormat(0).metadata.get(0)).isEqualTo(expectedMdtaEntry);
+    assertThat(trackGroups.get(1).getFormat(0).metadata.get(1)).isEqualTo(expectedSmtaEntry);
     assertThat(trackGroups.get(1).getFormat(0).metadata.get(2)).isEqualTo(expectedSlowMotionData);
   }
 

diff --git a/...ary/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java b/...ary/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java
@@ -31,6 +31,7 @@
 import com.google.android.exoplayer2.metadata.mp4.MdtaMetadataEntry;
 import com.google.android.exoplayer2.util.Log;
 import com.google.android.exoplayer2.util.ParsableByteArray;
+import org.checkerframework.checker.nullness.compatqual.NullableType;
 
 /** Utilities for handling metadata in MP4. */
 /* package */ final class MetadataUtil {
@@ -290,9 +291,8 @@ public static void setFormatMetadata(
       int trackType,
       @Nullable Metadata udtaMetaMetadata,
       @Nullable Metadata mdtaMetadata,
-      @Nullable Metadata smtaMetadata,
       Format.Builder formatBuilder,
-      Metadata.Entry... additionalEntries) {
+      @NullableType Metadata... additionalMetadata) {
     Metadata formatMetadata = new Metadata();
 
     if (trackType == C.TRACK_TYPE_AUDIO) {
@@ -314,12 +314,11 @@ public static void setFormatMetadata(
           }
         }
       }
-      if (smtaMetadata != null) {
-        formatMetadata = formatMetadata.copyWithAppendedEntriesFrom(smtaMetadata);
-      }
     }
 
-    formatMetadata = formatMetadata.copyWithAppendedEntries(additionalEntries);
+    for (Metadata metadata : additionalMetadata) {
+      formatMetadata = formatMetadata.copyWithAppendedEntriesFrom(metadata);
+    }
 
     if (formatMetadata.length() > 0) {
       formatBuilder.setMetadata(formatMetadata);

diff --git a/...ary/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java b/...ary/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
@@ -525,9 +525,9 @@ private void processMoovAtom(ContainerAtom moov) throws ParserException {
           track.type,
           udtaMetaMetadata,
           mdtaMetadata,
-          smtaMetadata,
           formatBuilder,
-          /* additionalEntries...= */ slowMotionMetadataEntries.toArray(new Metadata.Entry[0]));
+          smtaMetadata,
+          slowMotionMetadataEntries.isEmpty() ? null : new Metadata(slowMotionMetadataEntries));
       mp4Track.trackOutput.format(formatBuilder.build());
 
       if (track.type == C.TRACK_TYPE_VIDEO && firstVideoTrackIndex == C.INDEX_UNSET) {