From be43ac756346bab216ad0b2aab48b8d1b63e6fec 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 --- .../exoplayer2/source/DefaultMediaSourceFactory.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java index 1b421de43b..0aef44fb6f 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java @@ -365,15 +365,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); } }