From df25cefd7a7b7d950fcf93566362722700652960 Mon Sep 17 00:00:00 2001 From: ibaker Date: Wed, 28 Apr 2021 15:53:09 +0100 Subject: [PATCH] Simplify boolean ternary statements in SsaStyle PiperOrigin-RevId: 370902227 --- .../google/android/exoplayer2/text/ssa/SsaStyle.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaStyle.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaStyle.java index 3ae6bd133d..cf1ae43a36 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaStyle.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaStyle.java @@ -142,17 +142,13 @@ import java.util.regex.Pattern; ? parseFontSize(styleValues[format.fontSizeIndex].trim()) : Cue.DIMEN_UNSET, format.boldIndex != C.INDEX_UNSET - ? parseBooleanValue(styleValues[format.boldIndex].trim()) - : false, + && parseBooleanValue(styleValues[format.boldIndex].trim()), format.italicIndex != C.INDEX_UNSET - ? parseBooleanValue(styleValues[format.italicIndex].trim()) - : false, + && parseBooleanValue(styleValues[format.italicIndex].trim()), format.underlineIndex != C.INDEX_UNSET - ? parseBooleanValue(styleValues[format.underlineIndex].trim()) - : false, + && parseBooleanValue(styleValues[format.underlineIndex].trim()), format.strikeoutIndex != C.INDEX_UNSET - ? parseBooleanValue(styleValues[format.strikeoutIndex].trim()) - : false); + && parseBooleanValue(styleValues[format.strikeoutIndex].trim())); } catch (RuntimeException e) { Log.w(TAG, "Skipping malformed 'Style:' line: '" + styleLine + "'", e); return null;