From dedf60713d32b6989f45707ccab462233c2d7500 Mon Sep 17 00:00:00 2001
From: samrobinson <samrobinson@google.com>
Date: Mon, 18 Jan 2021 12:36:56 +0000
Subject: [PATCH] Enforce stricter SlowMotionData and Segment initialisation
 checks.

PiperOrigin-RevId: 352389366
---
 .../metadata/mp4/SlowMotionData.java          | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/mp4/SlowMotionData.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/mp4/SlowMotionData.java
index 4b8ed859a9..88623f6305 100644
--- a/library/common/src/main/java/com/google/android/exoplayer2/metadata/mp4/SlowMotionData.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/metadata/mp4/SlowMotionData.java
@@ -15,6 +15,8 @@
  */
 package com.google.android.exoplayer2.metadata.mp4;
 
+import static com.google.android.exoplayer2.util.Assertions.checkArgument;
+
 import android.os.Parcel;
 import android.os.Parcelable;
 import androidx.annotation.Nullable;
@@ -45,11 +47,12 @@ public final class SlowMotionData implements Metadata.Entry {
     /**
      * Creates an instance.
      *
-     * @param startTimeMs See {@link #startTimeMs}.
+     * @param startTimeMs See {@link #startTimeMs}. Must be less than endTimeMs.
      * @param endTimeMs See {@link #endTimeMs}.
      * @param speedDivisor See {@link #speedDivisor}.
      */
     public Segment(long startTimeMs, long endTimeMs, int speedDivisor) {
+      checkArgument(startTimeMs < endTimeMs);
       this.startTimeMs = startTimeMs;
       this.endTimeMs = endTimeMs;
       this.speedDivisor = speedDivisor;
@@ -113,9 +116,15 @@ public final class SlowMotionData implements Metadata.Entry {
 
   public final List<Segment> segments;
 
-  /** Creates an instance with a list of {@link Segment}s. */
+  /**
+   * Creates an instance with a list of {@link Segment}s.
+   *
+   * <p>The segments must not overlap, that is that the start time of a segment can not be between
+   * the start and end time of another segment.
+   */
   public SlowMotionData(List<Segment> segments) {
     this.segments = segments;
+    checkArgument(!doSegmentsOverlap(segments));
   }
 
   @Override
@@ -164,4 +173,19 @@ public final class SlowMotionData implements Metadata.Entry {
           return new SlowMotionData[size];
         }
       };
+
+  private static boolean doSegmentsOverlap(List<Segment> segments) {
+    if (segments.isEmpty()) {
+      return false;
+    }
+    long previousEndTimeMs = segments.get(0).endTimeMs;
+    for (int i = 1; i < segments.size(); i++) {
+      if (segments.get(i).startTimeMs < previousEndTimeMs) {
+        return true;
+      }
+      previousEndTimeMs = segments.get(i).endTimeMs;
+    }
+
+    return false;
+  }
 }