Merge pull request #3 from DiceTechnology/feat/DORIS-246-dvr-changes

Feat/DORIS-246 DVR changes
DiceTechnology · Apr 14, 2020 · 9c46c75 · 9c46c75
2 parents ec9b1c4 + 6408e6b
commit 9c46c75
Show file tree

Hide file tree

Showing 14 changed files with 144 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -20,6 +20,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:3.5.1'
         classpath 'com.novoda:bintray-release:0.9.1'
         classpath 'com.google.android.gms:strict-version-matcher-plugin:1.2.0'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
 }
 allprojects {

diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
@@ -528,6 +528,16 @@ public long getCurrentPosition() {
             : lastReportedPositionMs;
   }
 
+  @Override
+  public long getStartPosition() {
+    return 0;
+  }
+
+  @Override
+  public long getEndPosition() {
+    return getDuration();
+  }
+
   @Override
   public long getBufferedPosition() {
     return getCurrentPosition();

diff --git a/library/all/build.gradle b/library/all/build.gradle
@@ -13,6 +13,9 @@
 // limitations under the License.
 apply from: '../../constants.gradle'
 apply plugin: 'com.android.library'
+apply plugin: 'com.github.dcendents.android-maven'
+
+group='com.github.DiceTechnology'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion

diff --git a/library/core/build.gradle b/library/core/build.gradle
@@ -13,6 +13,9 @@
 // limitations under the License.
 apply plugin: 'com.android.library'
 apply from: '../../constants.gradle'
+apply plugin: 'com.github.dcendents.android-maven'
+
+group='com.github.DiceTechnology'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -498,6 +498,16 @@ public long getCurrentPosition() {
     }
   }
 
+  @Override
+  public long getStartPosition() {
+    return 0;
+  }
+
+  @Override
+  public long getEndPosition() {
+    return getDuration();
+  }
+
   @Override
   public long getBufferedPosition() {
     if (isPlayingAd()) {

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Player.java b/library/core/src/main/java/com/google/android/exoplayer2/Player.java
@@ -959,6 +959,18 @@ public void onTimelineChanged(Timeline timeline, @Nullable Object manifest) {
   /** Returns the playback position in the current content window or ad, in milliseconds. */
   long getCurrentPosition();
 
+  /**
+   * Returns the position in the current content window at which playback should start, in
+   * milliseconds. For live video streams with DVR content this will return a negative number.
+   * */
+  long getStartPosition();
+
+  /**
+   * Returns the position in the current content window at which playback should end, in
+   * milliseconds. For live video streams this will return {@code 0}.
+   */
+  long getEndPosition();
+
   /**
    * Returns an estimate of the position in the current content window or ad up to which data is
    * buffered, in milliseconds.

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -1379,6 +1379,16 @@ public long getCurrentPosition() {
     return player.getCurrentPosition();
   }
 
+  @Override
+  public long getStartPosition() {
+    return 0;
+  }
+
+  @Override
+  public long getEndPosition() {
+    return getDuration();
+  }
+
   @Override
   public long getBufferedPosition() {
     verifyApplicationThread();

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/DvrMiddleware.java b/library/core/src/main/java/com/google/android/exoplayer2/util/DvrMiddleware.java
@@ -0,0 +1,41 @@
+package com.google.android.exoplayer2.util;
+
+public final class DvrMiddleware {
+
+    /**
+     * The time, in milliseconds, to use as the end position for a live DVR window.
+     */
+    public static final long LIVE_DVR_END_POSITION = 0;
+    /**
+     * The length of one video segment in milliseconds.
+     */
+    private static final long SEGMENT_LENGTH_MS = 6000;
+
+    /**
+     * Converts a positive position, in milliseconds, to a negative position. A negative position
+     * is typically required for live DVR windows.
+     *
+     * @param positionMs The positive position, in milliseconds, to be converted.
+     * @param durationMs The duration of the current content window, in milliseconds.
+     * @return A {@code long} position in milliseconds. This will always be negative.
+     * @throws IllegalArgumentException If {@param positionMs} isn't positive.
+     */
+    public static long convertToNegativePosition(long positionMs, long durationMs) {
+        Assertions.checkArgument(positionMs >= -1 * SEGMENT_LENGTH_MS);
+        return positionMs - durationMs;
+    }
+
+    /**
+     * Converts a negative position, in milliseconds, to a positive position. A positive position
+     * is typically required for VOD windows.
+     *
+     * @param positionMs The negative position, in milliseconds, to be converted.
+     * @param durationMs The duration of the current content window, in milliseconds.
+     * @return A {@code long} position in milliseconds. This will always be positive.
+     * @throws IllegalArgumentException If {@param positionMs} isn't negative.
+     */
+    public static long convertToPositivePosition(long positionMs, long durationMs) {
+        Assertions.checkArgument(positionMs <= 0);
+        return positionMs + durationMs;
+    }
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
@@ -15,8 +15,6 @@
  */
 package com.google.android.exoplayer2.util;
 
-import static android.content.Context.UI_MODE_SERVICE;
-
 import android.Manifest.permission;
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
@@ -45,7 +43,9 @@
 import android.view.Display;
 import android.view.SurfaceView;
 import android.view.WindowManager;
+
 import androidx.annotation.Nullable;
+
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.Format;
@@ -57,6 +57,12 @@
 import com.google.android.exoplayer2.audio.AudioRendererEventListener;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.video.VideoRendererEventListener;
+
+import org.checkerframework.checker.initialization.qual.UnknownInitialization;
+import org.checkerframework.checker.nullness.compatqual.NullableType;
+import org.checkerframework.checker.nullness.qual.EnsuresNonNull;
+import org.checkerframework.checker.nullness.qual.PolyNull;
+
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.File;
@@ -82,10 +88,8 @@
 import java.util.regex.Pattern;
 import java.util.zip.DataFormatException;
 import java.util.zip.Inflater;
-import org.checkerframework.checker.initialization.qual.UnknownInitialization;
-import org.checkerframework.checker.nullness.compatqual.NullableType;
-import org.checkerframework.checker.nullness.qual.EnsuresNonNull;
-import org.checkerframework.checker.nullness.qual.PolyNull;
+
+import static android.content.Context.UI_MODE_SERVICE;
 
 /**
  * Miscellaneous utility methods.
@@ -1605,8 +1609,20 @@ public static String getStringForTime(StringBuilder builder, Formatter formatter
     long minutes = (totalSeconds / 60) % 60;
     long hours = totalSeconds / 3600;
     builder.setLength(0);
-    return hours > 0 ? formatter.format("%d:%02d:%02d", hours, minutes, seconds).toString()
-        : formatter.format("%02d:%02d", minutes, seconds).toString();
+
+    if (hours == 0) {
+      if (minutes < 0) {
+        return formatter.format("%02d:%02d", minutes, seconds * -1).toString();
+      } else {
+        return formatter.format("%02d:%02d", minutes, seconds).toString();
+      }
+    } else {
+      if (hours < 0) {
+        return formatter.format("%d:%02d:%02d", hours, minutes * -1, seconds * -1).toString();
+      } else {
+        return formatter.format("%d:%02d:%02d", hours, minutes, seconds).toString();
+      }
+    }
   }
 
   /**

diff --git a/library/dash/build.gradle b/library/dash/build.gradle
@@ -13,6 +13,9 @@
 // limitations under the License.
 apply from: '../../constants.gradle'
 apply plugin: 'com.android.library'
+apply plugin: 'com.github.dcendents.android-maven'
+
+group='com.github.DiceTechnology'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion

diff --git a/library/hls/build.gradle b/library/hls/build.gradle
@@ -13,6 +13,9 @@
 // limitations under the License.
 apply from: '../../constants.gradle'
 apply plugin: 'com.android.library'
+apply plugin: 'com.github.dcendents.android-maven'
+
+group='com.github.DiceTechnology'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion

diff --git a/library/smoothstreaming/build.gradle b/library/smoothstreaming/build.gradle
@@ -13,6 +13,9 @@
 // limitations under the License.
 apply from: '../../constants.gradle'
 apply plugin: 'com.android.library'
+apply plugin: 'com.github.dcendents.android-maven'
+
+group='com.github.DiceTechnology'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion

diff --git a/library/ui/build.gradle b/library/ui/build.gradle
@@ -13,6 +13,9 @@
 // limitations under the License.
 apply from: '../../constants.gradle'
 apply plugin: 'com.android.library'
+apply plugin: 'com.github.dcendents.android-maven'
+
+group='com.github.DiceTechnology'
 
 android {
     compileSdkVersion project.ext.compileSdkVersion

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
@@ -38,6 +38,7 @@
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.DvrMiddleware;
 import com.google.android.exoplayer2.util.RepeatModeUtil;
 import com.google.android.exoplayer2.util.Util;
 import java.util.Arrays;
@@ -960,7 +961,7 @@ private void updateTimeline() {
     }
     long durationMs = C.usToMs(durationUs);
     if (durationView != null) {
-      durationView.setText(Util.getStringForTime(formatBuilder, formatter, durationMs));
+      durationView.setText(Util.getStringForTime(formatBuilder, formatter, player.getEndPosition()));
     }
     if (timeBar != null) {
       timeBar.setDuration(durationMs);
@@ -990,7 +991,7 @@ private void updateProgress() {
       bufferedPosition = currentWindowOffset + player.getContentBufferedPosition();
     }
     if (positionView != null && !scrubbing) {
-      positionView.setText(Util.getStringForTime(formatBuilder, formatter, position));
+      positionView.setText(Util.getStringForTime(formatBuilder, formatter, player.getStartPosition()));
     }
     if (timeBar != null) {
       timeBar.setPosition(position);
@@ -1256,22 +1257,34 @@ private final class ComponentListener
     public void onScrubStart(TimeBar timeBar, long position) {
       scrubbing = true;
       if (positionView != null) {
-        positionView.setText(Util.getStringForTime(formatBuilder, formatter, position));
+          if (player.isCurrentWindowLive()) {
+              positionView.setText(Util.getStringForTime(formatBuilder, formatter, DvrMiddleware.convertToNegativePosition(position, player.getDuration())));
+          } else {
+              positionView.setText(Util.getStringForTime(formatBuilder, formatter, position));
+          }
       }
     }
 
     @Override
     public void onScrubMove(TimeBar timeBar, long position) {
       if (positionView != null) {
-        positionView.setText(Util.getStringForTime(formatBuilder, formatter, position));
+          if (player.isCurrentWindowLive()) {
+              positionView.setText(Util.getStringForTime(formatBuilder, formatter, DvrMiddleware.convertToNegativePosition(position, player.getDuration())));
+          } else {
+              positionView.setText(Util.getStringForTime(formatBuilder, formatter, position));
+          }
       }
     }
 
     @Override
     public void onScrubStop(TimeBar timeBar, long position, boolean canceled) {
       scrubbing = false;
       if (!canceled && player != null) {
-        seekToTimeBarPosition(player, position);
+        if (player.isCurrentWindowLive()) {
+          seekToTimeBarPosition(player, DvrMiddleware.convertToNegativePosition(position, player.getDuration()));
+        } else {
+          seekToTimeBarPosition(player, position);
+        }
       }
     }