diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/MkvPlaybackTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/MkvPlaybackTest.java index a55cdabed5..53b01ac993 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/MkvPlaybackTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/e2etest/MkvPlaybackTest.java @@ -18,12 +18,10 @@ package androidx.media3.exoplayer.e2etest; import android.content.Context; import android.graphics.SurfaceTexture; import android.view.Surface; -import androidx.media3.common.C; import androidx.media3.common.MediaItem; import androidx.media3.common.Player; import androidx.media3.exoplayer.ExoPlayer; import androidx.media3.exoplayer.source.DefaultMediaSourceFactory; -import androidx.media3.exoplayer.trackselection.DefaultTrackSelector; import androidx.media3.extractor.DefaultExtractorsFactory; import androidx.media3.test.utils.CapturingRenderersFactory; import androidx.media3.test.utils.DumpFileAsserts; @@ -77,20 +75,6 @@ public final class MkvPlaybackTest { new ExoPlayer.Builder(applicationContext, capturingRenderersFactory, mediaSourceFactory) .setClock(new FakeClock(/* isAutoAdvancing= */ true)) .build(); - // TODO: b/181312195 - Remove this when WebVTT is supported by DefaultSubtitleParserFactory. - if (inputFile.contains("_vtt_")) { - for (int textRendererIndex = 0; - textRendererIndex < player.getRendererCount(); - textRendererIndex++) { - if (player.getRendererType(textRendererIndex) == C.TRACK_TYPE_TEXT) { - player.setTrackSelectionParameters( - new DefaultTrackSelector.ParametersBuilder(applicationContext) - .setRendererDisabled(textRendererIndex, /* disabled= */ true) - .build()); - break; - } - } - } Surface surface = new Surface(new SurfaceTexture(/* texName= */ 1)); player.setVideoSurface(surface); PlaybackOutput playbackOutput = PlaybackOutput.register(player, capturingRenderersFactory); diff --git a/libraries/test_data/src/test/assets/playbackdumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.dump b/libraries/test_data/src/test/assets/playbackdumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.dump index 20c69525c0..e9db89936b 100644 --- a/libraries/test_data/src/test/assets/playbackdumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.dump +++ b/libraries/test_data/src/test/assets/playbackdumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.dump @@ -522,3 +522,18 @@ AudioSink: buffer #28: time = 1000001037319 data = 1 +TextOutput: + Subtitle[0]: + presentationTimeUs = 0 + Cues = [] + Subtitle[1]: + presentationTimeUs = 0 + Cue[0]: + text = This is the first + textAlignment = ALIGN_CENTER + line = -1.0 + lineType = 1 + lineAnchor = 0 + position = 0.5 + positionAnchor = 1 + size = 1.0 diff --git a/libraries/test_data/src/test/assets/playbackdumps/mkv/sample_with_vtt_subtitles.mkv.dump b/libraries/test_data/src/test/assets/playbackdumps/mkv/sample_with_vtt_subtitles.mkv.dump index 20c69525c0..d280ae9877 100644 --- a/libraries/test_data/src/test/assets/playbackdumps/mkv/sample_with_vtt_subtitles.mkv.dump +++ b/libraries/test_data/src/test/assets/playbackdumps/mkv/sample_with_vtt_subtitles.mkv.dump @@ -522,3 +522,18 @@ AudioSink: buffer #28: time = 1000001037319 data = 1 +TextOutput: + Subtitle[0]: + presentationTimeUs = 0 + Cues = [] + Subtitle[1]: + presentationTimeUs = 0 + Cue[0]: + text = This is the first subtitle. + textAlignment = ALIGN_CENTER + line = -1.0 + lineType = 1 + lineAnchor = 0 + position = 0.5 + positionAnchor = 1 + size = 1.0