Commit 34dd4b14 by tonihei Committed by Oliver Woodman

Fix NPE in HLS deriveAudioFormat.

Issue:#5868
PiperOrigin-RevId: 247613811
parent 95495328
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
### dev-v2 (not yet released) ### ### dev-v2 (not yet released) ###
* Fix NPE when using HLS chunkless preparation
([#5868](https://github.com/google/ExoPlayer/issues/5868)).
* Offline: Add option to remove all downloads. * Offline: Add option to remove all downloads.
* Decoders: * Decoders:
* Prefer codecs that advertise format support over ones that do not, even if * Prefer codecs that advertise format support over ones that do not, even if
...@@ -11,7 +13,7 @@ ...@@ -11,7 +13,7 @@
* Audio: fix an issue where not all audio was played out when the configuration * Audio: fix an issue where not all audio was played out when the configuration
for the underlying track was changing (e.g., at some period transitions). for the underlying track was changing (e.g., at some period transitions).
* UI: Change playback controls toggle from touch down to touch up events * UI: Change playback controls toggle from touch down to touch up events
([#5784](https://github.com/google/ExoPlayer/issues/5784)). ([#5784](https://github.com/google/ExoPlayer/issues/5784)).
### 2.10.0 ### ### 2.10.0 ###
......
...@@ -802,7 +802,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper ...@@ -802,7 +802,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
if (isPrimaryTrackInVariant) { if (isPrimaryTrackInVariant) {
channelCount = variantFormat.channelCount; channelCount = variantFormat.channelCount;
selectionFlags = variantFormat.selectionFlags; selectionFlags = variantFormat.selectionFlags;
roleFlags = mediaTagFormat.roleFlags; roleFlags = variantFormat.roleFlags;
language = variantFormat.language; language = variantFormat.language;
label = variantFormat.label; label = variantFormat.label;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment