From c19936895b8b27a24e94f96342503cf3aaaa418e Mon Sep 17 00:00:00 2001 From: christosts Date: Wed, 20 Apr 2022 08:24:21 +0100 Subject: [PATCH] DownloadHelper: propagate errors to callback When downlading an adaptive asset, if an ExoPlaybackException happens during track selection, the player raises an UnsupportedOperationException which is not handled gracefully and can crash the app main thread. This change catches the error and forwards it to DownloadHelper.Callback.onPrepareError() as an IOException. PiperOrigin-RevId: 443015332 --- .../exoplayer2/offline/DownloadHelper.java | 226 ++++++++++-------- 1 file changed, 125 insertions(+), 101 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java index 07d4007c50..3c585f9e17 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java @@ -619,9 +619,13 @@ public final class DownloadHelper { */ public void replaceTrackSelections( int periodIndex, TrackSelectionParameters trackSelectionParameters) { - assertPreparedWithMedia(); - clearTrackSelections(periodIndex); - addTrackSelectionInternal(periodIndex, trackSelectionParameters); + try { + assertPreparedWithMedia(); + clearTrackSelections(periodIndex); + addTrackSelectionInternal(periodIndex, trackSelectionParameters); + } catch (ExoPlaybackException e) { + throw new IllegalStateException(e); + } } /** @@ -634,8 +638,12 @@ public final class DownloadHelper { */ public void addTrackSelection( int periodIndex, TrackSelectionParameters trackSelectionParameters) { - assertPreparedWithMedia(); - addTrackSelectionInternal(periodIndex, trackSelectionParameters); + try { + assertPreparedWithMedia(); + addTrackSelectionInternal(periodIndex, trackSelectionParameters); + } catch (ExoPlaybackException e) { + throw new IllegalStateException(e); + } } /** @@ -647,27 +655,31 @@ public final class DownloadHelper { * selection, as IETF BCP 47 conformant tags. */ public void addAudioLanguagesToSelection(String... languages) { - assertPreparedWithMedia(); + try { + assertPreparedWithMedia(); - TrackSelectionParameters.Builder parametersBuilder = - DEFAULT_TRACK_SELECTOR_PARAMETERS_WITHOUT_CONTEXT.buildUpon(); - // Prefer highest supported bitrate for downloads. - parametersBuilder.setForceHighestSupportedBitrate(true); - // Disable all non-audio track types supported by the renderers. - for (RendererCapabilities capabilities : rendererCapabilities) { - @C.TrackType int trackType = capabilities.getTrackType(); - parametersBuilder.setTrackTypeDisabled( - trackType, /* disabled= */ trackType != C.TRACK_TYPE_AUDIO); - } - - // Add a track selection to each period for each of the languages. - int periodCount = getPeriodCount(); - for (String language : languages) { - TrackSelectionParameters parameters = - parametersBuilder.setPreferredAudioLanguage(language).build(); - for (int periodIndex = 0; periodIndex < periodCount; periodIndex++) { - addTrackSelectionInternal(periodIndex, parameters); + TrackSelectionParameters.Builder parametersBuilder = + DEFAULT_TRACK_SELECTOR_PARAMETERS_WITHOUT_CONTEXT.buildUpon(); + // Prefer highest supported bitrate for downloads. + parametersBuilder.setForceHighestSupportedBitrate(true); + // Disable all non-audio track types supported by the renderers. + for (RendererCapabilities capabilities : rendererCapabilities) { + @C.TrackType int trackType = capabilities.getTrackType(); + parametersBuilder.setTrackTypeDisabled( + trackType, /* disabled= */ trackType != C.TRACK_TYPE_AUDIO); } + + // Add a track selection to each period for each of the languages. + int periodCount = getPeriodCount(); + for (String language : languages) { + TrackSelectionParameters parameters = + parametersBuilder.setPreferredAudioLanguage(language).build(); + for (int periodIndex = 0; periodIndex < periodCount; periodIndex++) { + addTrackSelectionInternal(periodIndex, parameters); + } + } + } catch (ExoPlaybackException e) { + throw new IllegalStateException(e); } } @@ -683,28 +695,32 @@ public final class DownloadHelper { */ public void addTextLanguagesToSelection( boolean selectUndeterminedTextLanguage, String... languages) { - assertPreparedWithMedia(); + try { + assertPreparedWithMedia(); - TrackSelectionParameters.Builder parametersBuilder = - DEFAULT_TRACK_SELECTOR_PARAMETERS_WITHOUT_CONTEXT.buildUpon(); - parametersBuilder.setSelectUndeterminedTextLanguage(selectUndeterminedTextLanguage); - // Prefer highest supported bitrate for downloads. - parametersBuilder.setForceHighestSupportedBitrate(true); - // Disable all non-text track types supported by the renderers. - for (RendererCapabilities capabilities : rendererCapabilities) { - @C.TrackType int trackType = capabilities.getTrackType(); - parametersBuilder.setTrackTypeDisabled( - trackType, /* disabled= */ trackType != C.TRACK_TYPE_TEXT); - } - - // Add a track selection to each period for each of the languages. - int periodCount = getPeriodCount(); - for (String language : languages) { - TrackSelectionParameters parameters = - parametersBuilder.setPreferredTextLanguage(language).build(); - for (int periodIndex = 0; periodIndex < periodCount; periodIndex++) { - addTrackSelectionInternal(periodIndex, parameters); + TrackSelectionParameters.Builder parametersBuilder = + DEFAULT_TRACK_SELECTOR_PARAMETERS_WITHOUT_CONTEXT.buildUpon(); + parametersBuilder.setSelectUndeterminedTextLanguage(selectUndeterminedTextLanguage); + // Prefer highest supported bitrate for downloads. + parametersBuilder.setForceHighestSupportedBitrate(true); + // Disable all non-text track types supported by the renderers. + for (RendererCapabilities capabilities : rendererCapabilities) { + @C.TrackType int trackType = capabilities.getTrackType(); + parametersBuilder.setTrackTypeDisabled( + trackType, /* disabled= */ trackType != C.TRACK_TYPE_TEXT); } + + // Add a track selection to each period for each of the languages. + int periodCount = getPeriodCount(); + for (String language : languages) { + TrackSelectionParameters parameters = + parametersBuilder.setPreferredTextLanguage(language).build(); + for (int periodIndex = 0; periodIndex < periodCount; periodIndex++) { + addTrackSelectionInternal(periodIndex, parameters); + } + } + } catch (ExoPlaybackException e) { + throw new IllegalStateException(e); } } @@ -724,19 +740,24 @@ public final class DownloadHelper { int rendererIndex, DefaultTrackSelector.Parameters trackSelectorParameters, List overrides) { - assertPreparedWithMedia(); - DefaultTrackSelector.ParametersBuilder builder = trackSelectorParameters.buildUpon(); - for (int i = 0; i < mappedTrackInfos[periodIndex].getRendererCount(); i++) { - builder.setRendererDisabled(/* rendererIndex= */ i, /* disabled= */ i != rendererIndex); - } - if (overrides.isEmpty()) { - addTrackSelectionInternal(periodIndex, builder.build()); - } else { - TrackGroupArray trackGroupArray = mappedTrackInfos[periodIndex].getTrackGroups(rendererIndex); - for (int i = 0; i < overrides.size(); i++) { - builder.setSelectionOverride(rendererIndex, trackGroupArray, overrides.get(i)); - addTrackSelectionInternal(periodIndex, builder.build()); + try { + assertPreparedWithMedia(); + DefaultTrackSelector.ParametersBuilder builder = trackSelectorParameters.buildUpon(); + for (int i = 0; i < mappedTrackInfos[periodIndex].getRendererCount(); i++) { + builder.setRendererDisabled(/* rendererIndex= */ i, /* disabled= */ i != rendererIndex); } + if (overrides.isEmpty()) { + addTrackSelectionInternal(periodIndex, builder.build()); + } else { + TrackGroupArray trackGroupArray = + mappedTrackInfos[periodIndex].getTrackGroups(rendererIndex); + for (int i = 0; i < overrides.size(); i++) { + builder.setSelectionOverride(rendererIndex, trackGroupArray, overrides.get(i)); + addTrackSelectionInternal(periodIndex, builder.build()); + } + } + } catch (ExoPlaybackException e) { + throw new IllegalStateException(e); } } @@ -794,7 +815,8 @@ public final class DownloadHelper { "mediaPreparer.timeline" }) private void addTrackSelectionInternal( - int periodIndex, TrackSelectionParameters trackSelectionParameters) { + int periodIndex, TrackSelectionParameters trackSelectionParameters) + throws ExoPlaybackException { trackSelector.setParameters(trackSelectionParameters); runTrackSelection(periodIndex); // TrackSelectionParameters can contain multiple overrides for each track type. The track @@ -809,7 +831,7 @@ public final class DownloadHelper { } @SuppressWarnings("unchecked") // Initialization of array of Lists. - private void onMediaPrepared() { + private void onMediaPrepared() throws ExoPlaybackException { checkNotNull(mediaPreparer); checkNotNull(mediaPreparer.mediaPeriods); checkNotNull(mediaPreparer.timeline); @@ -879,52 +901,47 @@ public final class DownloadHelper { "mediaPreparer", "mediaPreparer.timeline" }) - private TrackSelectorResult runTrackSelection(int periodIndex) { - try { - TrackSelectorResult trackSelectorResult = - trackSelector.selectTracks( - rendererCapabilities, - trackGroupArrays[periodIndex], - new MediaPeriodId(mediaPreparer.timeline.getUidOfPeriod(periodIndex)), - mediaPreparer.timeline); - for (int i = 0; i < trackSelectorResult.length; i++) { - @Nullable ExoTrackSelection newSelection = trackSelectorResult.selections[i]; - if (newSelection == null) { - continue; - } - List existingSelectionList = - trackSelectionsByPeriodAndRenderer[periodIndex][i]; - boolean mergedWithExistingSelection = false; - for (int j = 0; j < existingSelectionList.size(); j++) { - ExoTrackSelection existingSelection = existingSelectionList.get(j); - if (existingSelection.getTrackGroup().equals(newSelection.getTrackGroup())) { - // Merge with existing selection. - scratchSet.clear(); - for (int k = 0; k < existingSelection.length(); k++) { - scratchSet.put(existingSelection.getIndexInTrackGroup(k), 0); - } - for (int k = 0; k < newSelection.length(); k++) { - scratchSet.put(newSelection.getIndexInTrackGroup(k), 0); - } - int[] mergedTracks = new int[scratchSet.size()]; - for (int k = 0; k < scratchSet.size(); k++) { - mergedTracks[k] = scratchSet.keyAt(k); - } - existingSelectionList.set( - j, new DownloadTrackSelection(existingSelection.getTrackGroup(), mergedTracks)); - mergedWithExistingSelection = true; - break; + private TrackSelectorResult runTrackSelection(int periodIndex) throws ExoPlaybackException { + TrackSelectorResult trackSelectorResult = + trackSelector.selectTracks( + rendererCapabilities, + trackGroupArrays[periodIndex], + new MediaPeriodId(mediaPreparer.timeline.getUidOfPeriod(periodIndex)), + mediaPreparer.timeline); + for (int i = 0; i < trackSelectorResult.length; i++) { + @Nullable ExoTrackSelection newSelection = trackSelectorResult.selections[i]; + if (newSelection == null) { + continue; + } + List existingSelectionList = + trackSelectionsByPeriodAndRenderer[periodIndex][i]; + boolean mergedWithExistingSelection = false; + for (int j = 0; j < existingSelectionList.size(); j++) { + ExoTrackSelection existingSelection = existingSelectionList.get(j); + if (existingSelection.getTrackGroup().equals(newSelection.getTrackGroup())) { + // Merge with existing selection. + scratchSet.clear(); + for (int k = 0; k < existingSelection.length(); k++) { + scratchSet.put(existingSelection.getIndexInTrackGroup(k), 0); } - } - if (!mergedWithExistingSelection) { - existingSelectionList.add(newSelection); + for (int k = 0; k < newSelection.length(); k++) { + scratchSet.put(newSelection.getIndexInTrackGroup(k), 0); + } + int[] mergedTracks = new int[scratchSet.size()]; + for (int k = 0; k < scratchSet.size(); k++) { + mergedTracks[k] = scratchSet.keyAt(k); + } + existingSelectionList.set( + j, new DownloadTrackSelection(existingSelection.getTrackGroup(), mergedTracks)); + mergedWithExistingSelection = true; + break; } } - return trackSelectorResult; - } catch (ExoPlaybackException e) { - // DefaultTrackSelector does not throw exceptions during track selection. - throw new UnsupportedOperationException(e); + if (!mergedWithExistingSelection) { + existingSelectionList.add(newSelection); + } } + return trackSelectorResult; } private static MediaSource createMediaSourceInternal( @@ -1095,7 +1112,14 @@ public final class DownloadHelper { } switch (msg.what) { case DOWNLOAD_HELPER_CALLBACK_MESSAGE_PREPARED: - downloadHelper.onMediaPrepared(); + try { + downloadHelper.onMediaPrepared(); + } catch (ExoPlaybackException e) { + downloadHelperHandler + .obtainMessage( + DOWNLOAD_HELPER_CALLBACK_MESSAGE_FAILED, /* obj= */ new IOException(e)) + .sendToTarget(); + } return true; case DOWNLOAD_HELPER_CALLBACK_MESSAGE_FAILED: release();