Merge pull request #2531 from bennettpeter:vobsub-mp4

PiperOrigin-RevId: 773649256

Author: copybara-github

RELEASENOTES.md

@@ -63,6 +63,8 @@
     *   Fix a playback stall when a subtitle segment initially fails to load and
         later loads successfully, followed by several empty subtitle segments
         ([#2517](https://github.com/androidx/media/issues/2517)).
+    *   Add support for VobSub tracks in MP4 files
+        ([#2510](https://github.com/androidx/media/issues/2510)).
 *   Metadata:
     *   Added support for retrieving media duration and `Timeline` to
         `MetadataRetriever` and migrated it to an instance-based,

libraries/container/src/main/java/androidx/media3/container/Mp4Box.java

@@ -335,6 +335,9 @@ public abstract class Mp4Box {
   @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_mp4v = 0x6d703476;
 
+  @SuppressWarnings("ConstantCaseForConstants")
+  public static final int TYPE_mp4s = 0x6D703473;
+
   @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_stts = 0x73747473;
 

libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/Mp4PlaybackTest.java

@@ -15,9 +15,12 @@
  */
 package androidx.media3.exoplayer.e2etest;
 
+import static org.robolectric.annotation.GraphicsMode.Mode.NATIVE;
+
 import android.content.Context;
 import android.graphics.SurfaceTexture;
 import android.view.Surface;
+import androidx.annotation.Nullable;
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.Player;
 import androidx.media3.exoplayer.ExoPlayer;
@@ -35,44 +38,47 @@
 import org.robolectric.ParameterizedRobolectricTestRunner;
 import org.robolectric.ParameterizedRobolectricTestRunner.Parameter;
 import org.robolectric.ParameterizedRobolectricTestRunner.Parameters;
+import org.robolectric.annotation.GraphicsMode;
 
 /** End-to-end tests using MP4 samples. */
+@GraphicsMode(NATIVE)
 @RunWith(ParameterizedRobolectricTestRunner.class)
 public class Mp4PlaybackTest {
 
   @Parameters(name = "{0}")
-  public static ImmutableList<String> mediaSamples() {
+  public static ImmutableList<Sample> mediaSamples() {
     return ImmutableList.of(
-        "midroll-5s.mp4",
-        "postroll-5s.mp4",
-        "preroll-5s.mp4",
-        "pixel-motion-photo-2-hevc-tracks.mp4",
-        "sample_ac3_fragmented.mp4",
-        "sample_ac3.mp4",
-        "sample_ac4_fragmented.mp4",
-        "sample_ac4.mp4",
-        "sample_android_slow_motion.mp4",
-        "sample_eac3_fragmented.mp4",
-        "sample_eac3.mp4",
-        "sample_eac3joc_fragmented.mp4",
-        "sample_eac3joc.mp4",
-        "sample_fragmented.mp4",
-        "sample_fragmented_seekable.mp4",
-        "sample_fragmented_large_bitrates.mp4",
-        "sample_fragmented_sei.mp4",
-        "sample_mdat_too_long.mp4",
-        "sample.mp4",
-        "sample_with_metadata.mp4",
-        "sample_with_numeric_genre.mp4",
-        "sample_opus_fragmented.mp4",
-        "sample_opus.mp4",
-        "sample_partially_fragmented.mp4",
-        "testvid_1022ms.mp4",
-        "sample_edit_list.mp4",
-        "sample_edit_list_no_sync_frame_before_edit.mp4");
+        Sample.forFile("midroll-5s.mp4"),
+        Sample.forFile("postroll-5s.mp4"),
+        Sample.forFile("preroll-5s.mp4"),
+        Sample.forFile("pixel-motion-photo-2-hevc-tracks.mp4"),
+        Sample.forFile("sample_ac3_fragmented.mp4"),
+        Sample.forFile("sample_ac3.mp4"),
+        Sample.forFile("sample_ac4_fragmented.mp4"),
+        Sample.forFile("sample_ac4.mp4"),
+        Sample.forFile("sample_android_slow_motion.mp4"),
+        Sample.forFile("sample_eac3_fragmented.mp4"),
+        Sample.forFile("sample_eac3.mp4"),
+        Sample.forFile("sample_eac3joc_fragmented.mp4"),
+        Sample.forFile("sample_eac3joc.mp4"),
+        Sample.forFile("sample_fragmented.mp4"),
+        Sample.forFile("sample_fragmented_seekable.mp4"),
+        Sample.forFile("sample_fragmented_large_bitrates.mp4"),
+        Sample.forFile("sample_fragmented_sei.mp4"),
+        Sample.forFile("sample_mdat_too_long.mp4"),
+        Sample.forFile("sample.mp4"),
+        Sample.forFile("sample_with_metadata.mp4"),
+        Sample.forFile("sample_with_numeric_genre.mp4"),
+        Sample.forFile("sample_opus_fragmented.mp4"),
+        Sample.forFile("sample_opus.mp4"),
+        Sample.forFile("sample_partially_fragmented.mp4"),
+        Sample.withSubtitles("sample_with_vobsub.mp4", "eng"),
+        Sample.forFile("testvid_1022ms.mp4"),
+        Sample.forFile("sample_edit_list.mp4"),
+        Sample.forFile("sample_edit_list_no_sync_frame_before_edit.mp4"));
   }
 
-  @Parameter public String inputFile;
+  @Parameter public Sample sample;
 
   @Rule
   public ShadowMediaCodecConfig mediaCodecConfig =
@@ -86,19 +92,50 @@ public void test() throws Exception {
         new ExoPlayer.Builder(applicationContext, renderersFactory)
             .setClock(new FakeClock(/* isAutoAdvancing= */ true))
             .build();
+    if (sample.subtitleLanguageToSelect != null) {
+      player.setTrackSelectionParameters(
+          player
+              .getTrackSelectionParameters()
+              .buildUpon()
+              .setPreferredTextLanguage(sample.subtitleLanguageToSelect)
+              .build());
+    }
     Surface surface = new Surface(new SurfaceTexture(/* texName= */ 1));
     player.setVideoSurface(surface);
 
     PlaybackOutput playbackOutput = PlaybackOutput.register(player, renderersFactory);
 
-    player.setMediaItem(MediaItem.fromUri("asset:///media/mp4/" + inputFile));
+    player.setMediaItem(MediaItem.fromUri("asset:///media/mp4/" + sample.filename));
     player.prepare();
     player.play();
     TestPlayerRunHelper.runUntilPlaybackState(player, Player.STATE_ENDED);
     player.release();
     surface.release();
 
     DumpFileAsserts.assertOutput(
-        applicationContext, playbackOutput, "playbackdumps/mp4/" + inputFile + ".dump");
+        applicationContext, playbackOutput, "playbackdumps/mp4/" + sample.filename + ".dump");
+  }
+
+  private static final class Sample {
+    public final String filename;
+    @Nullable public final String subtitleLanguageToSelect;
+
+    private Sample(String filename, @Nullable String subtitleLanguageToSelect) {
+      this.filename = filename;
+      this.subtitleLanguageToSelect = subtitleLanguageToSelect;
+    }
+
+    public static Sample forFile(String filename) {
+      return new Sample(filename, /* subtitleLanguageToSelect= */ null);
+    }
+
+    public static Sample withSubtitles(String filename, String subtitleLanguageToSelect) {
+      return new Sample(filename, /* enableSubtitles= */ subtitleLanguageToSelect);
+    }
+
+    @Override
+    public String toString() {
+      return filename;
+    }
   }
 }