From 383b6d42f1d88ad5135f71aa1bf140188b6cd8b3 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Tue, 9 Mar 2021 17:31:50 +0000
Subject: [PATCH] Publish API for using MediaParser in DASH

PiperOrigin-RevId: 361828018
---
 .../source/dash/DefaultDashChunkSource.java   | 29 +++++++++++++++++++
 .../dash/DefaultDashChunkSourceTest.java      |  3 ++
 2 files changed, 32 insertions(+)

diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
index 809f0d10c3..829d13ac5b 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
@@ -62,12 +62,37 @@ public class DefaultDashChunkSource implements DashChunkSource {
 
     private final DataSource.Factory dataSourceFactory;
     private final int maxSegmentsPerLoad;
+    private final ChunkExtractor.Factory chunkExtractorFactory;
 
+    /**
+     * Equivalent to {@link #Factory(ChunkExtractor.Factory, DataSource.Factory, int) new
+     * Factory(BundledChunkExtractor.FACTORY, dataSourceFactory, maxSegmentsPerLoad = 1)}.
+     */
     public Factory(DataSource.Factory dataSourceFactory) {
       this(dataSourceFactory, /* maxSegmentsPerLoad= */ 1);
     }
 
+    /**
+     * Equivalent to {@link #Factory(ChunkExtractor.Factory, DataSource.Factory, int) new
+     * Factory(BundledChunkExtractor.FACTORY, dataSourceFactory, maxSegmentsPerLoad)}.
+     */
     public Factory(DataSource.Factory dataSourceFactory, int maxSegmentsPerLoad) {
+      this(BundledChunkExtractor.FACTORY, dataSourceFactory, maxSegmentsPerLoad);
+    }
+
+    /**
+     * Creates a new instance.
+     *
+     * @param chunkExtractorFactory Creates {@link ChunkExtractor} instances to use for extracting
+     *     chunks.
+     * @param dataSourceFactory Creates the {@link DataSource} to use for downloading chunks.
+     * @param maxSegmentsPerLoad See {@link DefaultDashChunkSource#DefaultDashChunkSource}.
+     */
+    public Factory(
+        ChunkExtractor.Factory chunkExtractorFactory,
+        DataSource.Factory dataSourceFactory,
+        int maxSegmentsPerLoad) {
+      this.chunkExtractorFactory = chunkExtractorFactory;
       this.dataSourceFactory = dataSourceFactory;
       this.maxSegmentsPerLoad = maxSegmentsPerLoad;
     }
@@ -90,6 +115,7 @@ public class DefaultDashChunkSource implements DashChunkSource {
         dataSource.addTransferListener(transferListener);
       }
       return new DefaultDashChunkSource(
+          chunkExtractorFactory,
           manifestLoaderErrorThrower,
           manifest,
           periodIndex,
@@ -123,6 +149,8 @@ public class DefaultDashChunkSource implements DashChunkSource {
   private boolean missingLastSegment;
 
   /**
+   * @param chunkExtractorFactory Creates {@link ChunkExtractor} instances to use for extracting
+   *     chunks.
    * @param manifestLoaderErrorThrower Throws errors affecting loading of manifests.
    * @param manifest The initial manifest.
    * @param periodIndex The index of the period in the manifest.
@@ -142,6 +170,7 @@ public class DefaultDashChunkSource implements DashChunkSource {
    *     messages targeting the player. Maybe null if this is not necessary.
    */
   public DefaultDashChunkSource(
+      ChunkExtractor.Factory chunkExtractorFactory,
       LoaderErrorThrower manifestLoaderErrorThrower,
       DashManifest manifest,
       int periodIndex,
diff --git a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSourceTest.java b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSourceTest.java
index 93700d5ec3..e403482b6c 100644
--- a/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSourceTest.java
+++ b/library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSourceTest.java
@@ -24,6 +24,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.TrackGroup;
+import com.google.android.exoplayer2.source.chunk.BundledChunkExtractor;
 import com.google.android.exoplayer2.source.chunk.ChunkHolder;
 import com.google.android.exoplayer2.source.dash.manifest.DashManifest;
 import com.google.android.exoplayer2.source.dash.manifest.DashManifestParser;
@@ -58,6 +59,7 @@ public class DefaultDashChunkSourceTest {
                     SAMPLE_MPD_LIVE_WITH_OFFSET_INSIDE_WINDOW));
     DefaultDashChunkSource chunkSource =
         new DefaultDashChunkSource(
+            BundledChunkExtractor.FACTORY,
             new LoaderErrorThrower.Dummy(),
             manifest,
             /* periodIndex= */ 0,
@@ -104,6 +106,7 @@ public class DefaultDashChunkSourceTest {
                     ApplicationProvider.getApplicationContext(), SAMPLE_MPD_VOD));
     DefaultDashChunkSource chunkSource =
         new DefaultDashChunkSource(
+            BundledChunkExtractor.FACTORY,
             new LoaderErrorThrower.Dummy(),
             manifest,
             /* periodIndex= */ 0,