exoplayer, dash parser: fix auto subs by adding visitor cookie

Author: yuliskov

MediaServiceCore

@@ -54,6 +54,7 @@
 import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -529,8 +530,13 @@ protected Chunk newMediaChunk(
     String baseUrl = representation.baseUrl;
     if (representationHolder.extractorWrapper == null) {
       long endTimeUs = representationHolder.getSegmentEndTimeUs(firstSegmentNum);
-      DataSpec dataSpec = new DataSpec(segmentUri.resolveUri(baseUrl),
-          segmentUri.start, segmentUri.length, representation.getCacheKey());
+      // MOD: fix subtitles bot check error by add cookie header
+      // NOTE: extractorWrapper == null on subtitles
+      //DataSpec dataSpec = new DataSpec(segmentUri.resolveUri(baseUrl),
+      //    segmentUri.start, segmentUri.length, representation.getCacheKey());
+      DataSpec dataSpec = new DataSpec(segmentUri.resolveUri(baseUrl), DataSpec.HTTP_METHOD_GET, null,
+              segmentUri.start, segmentUri.start, segmentUri.length, representation.getCacheKey(), 0,
+              manifest.visitorCookie != null ? Collections.singletonMap("Cookie", manifest.visitorCookie) : Collections.emptyMap());
       return new SingleSampleMediaChunk(dataSource, dataSpec, trackFormat, trackSelectionReason,
           trackSelectionData, startTimeUs, endTimeUs, firstSegmentNum, trackType, trackFormat);
     } else {

exoplayer-amzn-2.10.6/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java

@@ -90,6 +90,9 @@ public class DashManifest implements FilterableManifest<DashManifest> {
   /** The {@link ProgramInformation}, or null if not present. */
   @Nullable public final ProgramInformation programInformation;
 
+  // MOD: add subtitles cookie
+  @Nullable public final String visitorCookie;
+
   private final List<Period> periods;
 
   /**
@@ -137,6 +140,36 @@ public DashManifest(
       UtcTimingElement utcTiming,
       Uri location,
       List<Period> periods) {
+    this(
+        availabilityStartTimeMs,
+        durationMs,
+        minBufferTimeMs,
+        dynamic,
+        minUpdatePeriodMs,
+        timeShiftBufferDepthMs,
+        suggestedPresentationDelayMs,
+        publishTimeMs,
+        programInformation,
+        utcTiming,
+        location,
+        /* visitorCookie= */ null,
+        periods);
+  }
+
+  public DashManifest(
+      long availabilityStartTimeMs,
+      long durationMs,
+      long minBufferTimeMs,
+      boolean dynamic,
+      long minUpdatePeriodMs,
+      long timeShiftBufferDepthMs,
+      long suggestedPresentationDelayMs,
+      long publishTimeMs,
+      @Nullable ProgramInformation programInformation,
+      UtcTimingElement utcTiming,
+      Uri location,
+      @Nullable String visitorCookie,
+      List<Period> periods) {
     this.availabilityStartTimeMs = availabilityStartTimeMs;
     this.durationMs = durationMs;
     this.minBufferTimeMs = minBufferTimeMs;
@@ -148,6 +181,7 @@ public DashManifest(
     this.programInformation = programInformation;
     this.utcTiming = utcTiming;
     this.location = location;
+    this.visitorCookie = visitorCookie;
     this.periods = periods == null ? Collections.emptyList() : periods;
   }
 

exoplayer-amzn-2.10.6/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java

@@ -85,6 +85,7 @@ private DashManifest parseDashManifest(MediaItemFormatInfo formatInfo) {
                 null,
                 null,
                 null,
+                formatInfo.getVisitorCookie(),
                 periods);
     }
 

exoplayer-amzn-2.10.6/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser2.java

@@ -57,8 +57,8 @@ android {
         applicationId "app.smarttube"
         minSdkVersion project.properties.minSdkVersion
         targetSdkVersion project.properties.targetSdkVersion
-        versionCode 2324
-        versionName "31.34"
+        versionCode 2325
+        versionName "31.35"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L"