make merged segment size configurable

androidx · Jan 30, 2023 · dcdc9aa · dcdc9aa
1 parent e2ece2f
commit dcdc9aa
Show file tree

Hide file tree

Showing 4 changed files with 105 additions and 7 deletions.
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/offline/SegmentDownloader.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/offline/SegmentDownloader.java
@@ -76,7 +76,8 @@ public int compareTo(Segment other) {
   }
 
   private static final int BUFFER_SIZE_BYTES = 128 * 1024;
-  private static final long MAX_MERGED_SEGMENT_START_TIME_DIFF_US = 20 * C.MICROS_PER_SECOND;
+  public static final long DEFAULT_MAX_MERGED_SEGMENT_START_TIME_DIFF_US = 20 * C.MICROS_PER_SECOND;
+  private static long MAX_MERGED_SEGMENT_START_TIME_DIFF_US = DEFAULT_MAX_MERGED_SEGMENT_START_TIME_DIFF_US;
 
   private final DataSpec manifestDataSpec;
   private final Parser<M> manifestParser;
@@ -107,7 +108,29 @@ public int compareTo(Segment other) {
    * @param executor An {@link Executor} used to make requests for the media being downloaded.
    *     Providing an {@link Executor} that uses multiple threads will speed up the download by
    *     allowing parts of it to be executed in parallel.
+   * @param maxMergedSegmentStartTimeDiffUs max merged size for each segment duration
    */
+  public SegmentDownloader(
+      MediaItem mediaItem,
+      Parser<M> manifestParser,
+      CacheDataSource.Factory cacheDataSourceFactory,
+      Executor executor,
+      long maxMergedSegmentStartTimeDiffUs
+  ) {
+    checkNotNull(mediaItem.localConfiguration);
+    this.manifestDataSpec = getCompressibleDataSpec(mediaItem.localConfiguration.uri);
+    this.manifestParser = manifestParser;
+    this.streamKeys = new ArrayList<>(mediaItem.localConfiguration.streamKeys);
+    this.cacheDataSourceFactory = cacheDataSourceFactory;
+    this.executor = executor;
+    cache = Assertions.checkNotNull(cacheDataSourceFactory.getCache());
+    cacheKeyFactory = cacheDataSourceFactory.getCacheKeyFactory();
+    priorityTaskManager = cacheDataSourceFactory.getUpstreamPriorityTaskManager();
+    activeRunnables = new ArrayList<>();
+    MAX_MERGED_SEGMENT_START_TIME_DIFF_US = maxMergedSegmentStartTimeDiffUs * C.MICROS_PER_SECOND;
+  }
+
+  @Deprecated
   public SegmentDownloader(
       MediaItem mediaItem,
       Parser<M> manifestParser,

diff --git a/...s/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/offline/DashDownloader.java b/...s/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/offline/DashDownloader.java
@@ -100,7 +100,7 @@ public DashDownloader(MediaItem mediaItem, CacheDataSource.Factory cacheDataSour
    */
   public DashDownloader(
       MediaItem mediaItem, CacheDataSource.Factory cacheDataSourceFactory, Executor executor) {
-    this(mediaItem, new DashManifestParser(), cacheDataSourceFactory, executor);
+    this(mediaItem, new DashManifestParser(), cacheDataSourceFactory, executor, DEFAULT_MAX_MERGED_SEGMENT_START_TIME_DIFF_US);
   }
 
   /**
@@ -113,13 +113,32 @@ public DashDownloader(
    * @param executor An {@link Executor} used to make requests for the media being downloaded.
    *     Providing an {@link Executor} that uses multiple threads will speed up the download by
    *     allowing parts of it to be executed in parallel.
+   * @param maxMergedSegmentStartTimeDiffUs max merged size for each segment duration
    */
+  public DashDownloader(
+      MediaItem mediaItem,
+      Parser<DashManifest> manifestParser,
+      CacheDataSource.Factory cacheDataSourceFactory,
+      Executor executor,
+      long maxMergedSegmentStartTimeDiffUs
+  ) {
+    super(mediaItem, manifestParser, cacheDataSourceFactory, executor, maxMergedSegmentStartTimeDiffUs);
+    baseUrlExclusionList = new BaseUrlExclusionList();
+  }
+
+  @Deprecated
   public DashDownloader(
       MediaItem mediaItem,
       Parser<DashManifest> manifestParser,
       CacheDataSource.Factory cacheDataSourceFactory,
       Executor executor) {
-    super(mediaItem, manifestParser, cacheDataSourceFactory, executor);
+    super(
+        mediaItem,
+        manifestParser,
+        cacheDataSourceFactory,
+        executor,
+        DEFAULT_MAX_MERGED_SEGMENT_START_TIME_DIFF_US
+    );
     baseUrlExclusionList = new BaseUrlExclusionList();
   }
 

diff --git a/...ries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/offline/HlsDownloader.java b/...ries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/offline/HlsDownloader.java
@@ -89,7 +89,13 @@ public HlsDownloader(MediaItem mediaItem, CacheDataSource.Factory cacheDataSourc
    */
   public HlsDownloader(
       MediaItem mediaItem, CacheDataSource.Factory cacheDataSourceFactory, Executor executor) {
-    this(mediaItem, new HlsPlaylistParser(), cacheDataSourceFactory, executor);
+    this(
+        mediaItem,
+        new HlsPlaylistParser(),
+        cacheDataSourceFactory,
+        executor,
+        DEFAULT_MAX_MERGED_SEGMENT_START_TIME_DIFF_US
+    );
   }
 
   /**
@@ -102,13 +108,37 @@ public HlsDownloader(
    * @param executor An {@link Executor} used to make requests for the media being downloaded.
    *     Providing an {@link Executor} that uses multiple threads will speed up the download by
    *     allowing parts of it to be executed in parallel.
+   * @param maxMergedSegmentStartTimeDiffUs max merged size for each segment duration
    */
+  public HlsDownloader(
+      MediaItem mediaItem,
+      Parser<HlsPlaylist> manifestParser,
+      CacheDataSource.Factory cacheDataSourceFactory,
+      Executor executor,
+      long maxMergedSegmentStartTimeDiffUs
+  ) {
+    super(
+        mediaItem,
+        manifestParser,
+        cacheDataSourceFactory,
+        executor,
+        maxMergedSegmentStartTimeDiffUs
+    );
+  }
+
+  @Deprecated
   public HlsDownloader(
       MediaItem mediaItem,
       Parser<HlsPlaylist> manifestParser,
       CacheDataSource.Factory cacheDataSourceFactory,
       Executor executor) {
-    super(mediaItem, manifestParser, cacheDataSourceFactory, executor);
+    super(
+        mediaItem,
+        manifestParser,
+        cacheDataSourceFactory,
+        executor,
+        DEFAULT_MAX_MERGED_SEGMENT_START_TIME_DIFF_US
+    );
   }
 
   @Override

diff --git a/...reaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/offline/SsDownloader.java b/...reaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/offline/SsDownloader.java
@@ -93,7 +93,9 @@ public SsDownloader(
             .build(),
         new SsManifestParser(),
         cacheDataSourceFactory,
-        executor);
+        executor,
+        DEFAULT_MAX_MERGED_SEGMENT_START_TIME_DIFF_US
+    );
   }
 
   /**
@@ -106,13 +108,37 @@ public SsDownloader(
    * @param executor An {@link Executor} used to make requests for the media being downloaded.
    *     Providing an {@link Executor} that uses multiple threads will speed up the download by
    *     allowing parts of it to be executed in parallel.
+   * @param maxMergedSegmentStartTimeDiffUs max merged size for each segment duration
    */
+  public SsDownloader(
+      MediaItem mediaItem,
+      Parser<SsManifest> manifestParser,
+      CacheDataSource.Factory cacheDataSourceFactory,
+      Executor executor,
+      long maxMergedSegmentStartTimeDiffUs
+  ) {
+    super(
+        mediaItem,
+        manifestParser,
+        cacheDataSourceFactory,
+        executor,
+        maxMergedSegmentStartTimeDiffUs
+    );
+  }
+
+  @Deprecated
   public SsDownloader(
       MediaItem mediaItem,
       Parser<SsManifest> manifestParser,
       CacheDataSource.Factory cacheDataSourceFactory,
       Executor executor) {
-    super(mediaItem, manifestParser, cacheDataSourceFactory, executor);
+    super(
+        mediaItem,
+        manifestParser,
+        cacheDataSourceFactory,
+        executor,
+        DEFAULT_MAX_MERGED_SEGMENT_START_TIME_DIFF_US
+    );
   }
 
   @Override