From 8b230d8df0822d818d22e5aaba343468c0ccb2d5 Mon Sep 17 00:00:00 2001 From: ibaker Date: Thu, 27 Jan 2022 09:25:27 +0000 Subject: [PATCH] Propagate error policy to ProgressiveMediaSource used for subtitles This only affects playbacks using the experimentalUseProgressiveMediaSourceForSubtitles method. Also update the SingleSampleMediaSource instantiation to be more similar, to try and highlight differences like this in future. PiperOrigin-RevId: 424545980 --- .../exoplayer/source/DefaultMediaSourceFactory.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/DefaultMediaSourceFactory.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/DefaultMediaSourceFactory.java index ff68373682..c1604e7352 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/DefaultMediaSourceFactory.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/DefaultMediaSourceFactory.java @@ -380,15 +380,14 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory { }; mediaSources[i + 1] = new ProgressiveMediaSource.Factory(dataSourceFactory, extractorsFactory) + .setLoadErrorHandlingPolicy(loadErrorHandlingPolicy) .createMediaSource( MediaItem.fromUri(subtitleConfigurations.get(i).uri.toString())); } else { - SingleSampleMediaSource.Factory singleSampleSourceFactory = - new SingleSampleMediaSource.Factory(dataSourceFactory) - .setLoadErrorHandlingPolicy(loadErrorHandlingPolicy); mediaSources[i + 1] = - singleSampleSourceFactory.createMediaSource( - subtitleConfigurations.get(i), /* durationUs= */ C.TIME_UNSET); + new SingleSampleMediaSource.Factory(dataSourceFactory) + .setLoadErrorHandlingPolicy(loadErrorHandlingPolicy) + .createMediaSource(subtitleConfigurations.get(i), /* durationUs= */ C.TIME_UNSET); } }