exoplayer: refactor sabr classes

Author: yuliskov

exoplayer-amzn-2.10.6/library/sabr/src/main/java/com/google/android/exoplayer2/source/sabr/DefaultSabrChunkSource.java

@@ -29,7 +29,7 @@
 import com.google.android.exoplayer2.source.sabr.parser.models.AudioSelector;
 import com.google.android.exoplayer2.source.sabr.parser.models.CaptionSelector;
 import com.google.android.exoplayer2.source.sabr.parser.models.VideoSelector;
-import com.google.android.exoplayer2.source.sabr.parser.processor.Utils;
+import com.google.android.exoplayer2.source.sabr.parser.misc.Utils;
 import com.google.android.exoplayer2.source.sabr.protos.misc.FormatId;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
 import com.google.android.exoplayer2.upstream.DataSource;
@@ -304,7 +304,6 @@ public void getNextChunk(long playbackPositionUs, long loadPositionUs, List<? ex
             if (representationHolder.extractorWrapper.getSampleFormats() == null) {
                 pendingInitializationUri = selectedRepresentation.getInitializationUri();
             }
-            // TODO: remove segmentIndex entity (
             // No segment index in SABR
             //if (representationHolder.segmentIndex == null) {
             //    pendingIndexUri = selectedRepresentation.getIndexUri();

…sabr/parser/processor/SabrProcessor.java …r2/source/sabr/parser/SabrProcessor.javaexoplayer-amzn-2.10.6/library/sabr/src/main/java/com/google/android/exoplayer2/source/sabr/parser/processor/SabrProcessor.java renamed to exoplayer-amzn-2.10.6/library/sabr/src/main/java/com/google/android/exoplayer2/source/sabr/parser/SabrProcessor.java exoplayer-amzn-2.10.6/library/sabr/src/main/java/com/google/android/exoplayer2/source/sabr/parser/processor/SabrProcessor.java renamed to exoplayer-amzn-2.10.6/library/sabr/src/main/java/com/google/android/exoplayer2/source/sabr/parser/SabrProcessor.java

@@ -1,4 +1,4 @@
-package com.google.android.exoplayer2.source.sabr.parser.processor;
+package com.google.android.exoplayer2.source.sabr.parser;
 
 import android.util.Base64;
 import android.util.Pair;
@@ -22,6 +22,14 @@
 import com.google.android.exoplayer2.source.sabr.parser.parts.MediaSegmentInitSabrPart;
 import com.google.android.exoplayer2.source.sabr.parser.parts.PoTokenStatusSabrPart;
 import com.google.android.exoplayer2.source.sabr.parser.parts.PoTokenStatusSabrPart.PoTokenStatus;
+import com.google.android.exoplayer2.source.sabr.parser.results.ProcessFormatInitializationMetadataResult;
+import com.google.android.exoplayer2.source.sabr.parser.results.ProcessLiveMetadataResult;
+import com.google.android.exoplayer2.source.sabr.parser.results.ProcessMediaEndResult;
+import com.google.android.exoplayer2.source.sabr.parser.results.ProcessMediaHeaderResult;
+import com.google.android.exoplayer2.source.sabr.parser.results.ProcessMediaResult;
+import com.google.android.exoplayer2.source.sabr.parser.results.ProcessSabrSeekResult;
+import com.google.android.exoplayer2.source.sabr.parser.results.ProcessStreamProtectionStatusResult;
+import com.google.android.exoplayer2.source.sabr.parser.misc.Utils;
 import com.google.android.exoplayer2.source.sabr.protos.videostreaming.BufferedRange;
 import com.google.android.exoplayer2.source.sabr.protos.videostreaming.ClientAbrState;
 import com.google.android.exoplayer2.source.sabr.protos.videostreaming.StreamerContext.ClientInfo;
@@ -685,7 +693,7 @@ public int getLiveSegmentTargetDurationSec() {
     //}
 
     public VideoPlaybackAbrRequest buildVideoPlaybackAbrRequest(int trackType, boolean isInit) {
-        int resolution = trackType == C.TRACK_TYPE_VIDEO ? 720 : 0; // current track height (if video)
+        int resolution = trackType == C.TRACK_TYPE_VIDEO && videoFormatSelector != null ? Utils.parseHeight(videoFormatSelector.displayName) : 0;
         int bandwidthEstimate = 1350000; // ???
 
         ClientAbrState clientAbrStateTest = ClientAbrState.newBuilder()
@@ -893,7 +901,7 @@ private Pair<List<BufferedRange>, FormatId> createBufferedRangesAndDiscardFormat
             }
 
             boolean shouldDiscard = currentFormatITag != activeFormat.getItag();
-            FormatId initializedFormat = null;
+            SelectedFormat initializedFormat = null; // TODO: not implemented
 
             BufferedRange bufferedRange = shouldDiscard ? createFullBufferRange(activeFormat) : createPartialBufferRange(initializedFormat);
 
@@ -935,7 +943,7 @@ private BufferedRange createFullBufferRange(@NonNull FormatId format) {
      * @param initializedFormat - The format with initialization data.
      * @return A BufferedRange object with segment information, or null if no metadata is available.
      */
-    private BufferedRange createPartialBufferRange(FormatId initializedFormat) {
+    private BufferedRange createPartialBufferRange(SelectedFormat initializedFormat) {
         if (initializedFormat == null) {
             return null;
         }

exoplayer-amzn-2.10.6/library/sabr/src/main/java/com/google/android/exoplayer2/source/sabr/parser/SabrStream.java

@@ -16,12 +16,11 @@
 import com.google.android.exoplayer2.source.sabr.parser.parts.PoTokenStatusSabrPart;
 import com.google.android.exoplayer2.source.sabr.parser.parts.RefreshPlayerResponseSabrPart;
 import com.google.android.exoplayer2.source.sabr.parser.parts.SabrPart;
-import com.google.android.exoplayer2.source.sabr.parser.processor.ProcessFormatInitializationMetadataResult;
-import com.google.android.exoplayer2.source.sabr.parser.processor.ProcessMediaEndResult;
-import com.google.android.exoplayer2.source.sabr.parser.processor.ProcessMediaHeaderResult;
-import com.google.android.exoplayer2.source.sabr.parser.processor.ProcessMediaResult;
-import com.google.android.exoplayer2.source.sabr.parser.processor.ProcessStreamProtectionStatusResult;
-import com.google.android.exoplayer2.source.sabr.parser.processor.SabrProcessor;
+import com.google.android.exoplayer2.source.sabr.parser.results.ProcessFormatInitializationMetadataResult;
+import com.google.android.exoplayer2.source.sabr.parser.results.ProcessMediaEndResult;
+import com.google.android.exoplayer2.source.sabr.parser.results.ProcessMediaHeaderResult;
+import com.google.android.exoplayer2.source.sabr.parser.results.ProcessMediaResult;
+import com.google.android.exoplayer2.source.sabr.parser.results.ProcessStreamProtectionStatusResult;
 import com.google.android.exoplayer2.source.sabr.parser.ump.UMPDecoder;
 import com.google.android.exoplayer2.source.sabr.parser.ump.UMPPart;
 import com.google.android.exoplayer2.source.sabr.parser.ump.UMPPartId;

…/source/sabr/parser/processor/Utils.java …ayer2/source/sabr/parser/misc/Utils.javaexoplayer-amzn-2.10.6/library/sabr/src/main/java/com/google/android/exoplayer2/source/sabr/parser/processor/Utils.java renamed to exoplayer-amzn-2.10.6/library/sabr/src/main/java/com/google/android/exoplayer2/source/sabr/parser/misc/Utils.java exoplayer-amzn-2.10.6/library/sabr/src/main/java/com/google/android/exoplayer2/source/sabr/parser/processor/Utils.java renamed to exoplayer-amzn-2.10.6/library/sabr/src/main/java/com/google/android/exoplayer2/source/sabr/parser/misc/Utils.java

@@ -1,6 +1,7 @@
-package com.google.android.exoplayer2.source.sabr.parser.processor;
+package com.google.android.exoplayer2.source.sabr.parser.misc;
 
 import com.google.android.exoplayer2.extractor.ExtractorInput;
+import com.liskovsoft.sharedutils.helpers.Helpers;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -38,4 +39,12 @@ public static String updateQuery(String baseUrl, String key, Object value) {
         String separator = baseUrl.contains("?") ? "&" : "?";
         return baseUrl + separator + key + "=" + value;
     }
+
+    public static int parseHeight(String displayName) {
+        if (displayName == null) {
+            return 0;
+        }
+
+        return Helpers.isNumeric(displayName) ? Helpers.parseInt(displayName) : Helpers.parseInt(displayName.replace("p", ""));
+    }
 }