exoplayer: upd sabr classes

Author: yuliskov

MediaServiceCore

@@ -202,7 +202,7 @@ public class SabrExtractor implements Extractor {
     private final SabrStream sabrStream;
     private final SparseArray<Track> tracks;
     private final boolean seekForCuesEnabled;
-    private final Format format;
+    private Format format;
     private final int trackType;
 
     // Temporary arrays.
@@ -365,6 +365,8 @@ private void initializeFormat(FormatInitializedSabrPart part) throws ParserExcep
         //startMasterElement
         //endMasterElement
 
+        format = part.formatSelector.getSelectedFormat();
+
         initCurrentTrack();
 
         // TODO: init seekMap

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

@@ -700,8 +700,8 @@ public int getLiveSegmentTargetDurationSec() {
     //}
 
     public VideoPlaybackAbrRequest buildVideoPlaybackAbrRequest(int trackType, boolean isInit) {
-        Format selectedVideoFormat = getSelectedFormat(videoFormatSelector);
-        Format selectedAudioFormat = getSelectedFormat(audioFormatSelector);
+        Format selectedVideoFormat = videoFormatSelector.getSelectedFormat();
+        Format selectedAudioFormat = audioFormatSelector.getSelectedFormat();
         int height = trackType == C.TRACK_TYPE_VIDEO && selectedVideoFormat != null
                 ? selectedVideoFormat.height : -1;
         int bandwidthEstimate = trackType == C.TRACK_TYPE_VIDEO && selectedVideoFormat != null
@@ -725,11 +725,11 @@ public VideoPlaybackAbrRequest buildVideoPlaybackAbrRequest(int trackType, boole
             //        .setAudioTrackId("0");
         }
 
-        ClientAbrState clientAbrStateMod = clientAbrStateBuilder.build();
+        ClientAbrState clientAbrState = clientAbrStateBuilder.build();
 
         Pair<List<BufferedRange>, FormatId> bufferRanges = addBufferingInfoToAbrRequest(trackType);
 
-        List<FormatId> selectedFormats = getSelectedFormatIds(trackType);
+        List<FormatId> selectedFormats = createSelectedFormatIds(trackType);
 
         if (isInit) {
             selectedFormats.clear();
@@ -740,7 +740,7 @@ public VideoPlaybackAbrRequest buildVideoPlaybackAbrRequest(int trackType, boole
         }
 
         return VideoPlaybackAbrRequest.newBuilder()
-                .setClientAbrState(clientAbrStateMod)
+                .setClientAbrState(clientAbrState)
                 .addAllPreferredVideoFormatIds(videoFormatSelector.formatIds)
                 .addAllPreferredAudioFormatIds(audioFormatSelector.formatIds)
                 .addAllPreferredSubtitleFormatIds(captionFormatSelector.formatIds)
@@ -755,11 +755,7 @@ public VideoPlaybackAbrRequest buildVideoPlaybackAbrRequest(int trackType, boole
                 .build();
     }
 
-    private static Format getSelectedFormat(FormatSelector formatSelector) {
-        return formatSelector != null && !formatSelector.selectedFormats.isEmpty() ? formatSelector.selectedFormats.get(0) : null;
-    }
-
-    private List<FormatId> getSelectedFormatIds() {
+    private List<FormatId> createSelectedFormatIds() {
         List<FormatId> result = new ArrayList<>();
 
         for (SelectedFormat selectedFormat : selectedFormats.values()) {
@@ -769,15 +765,15 @@ private List<FormatId> getSelectedFormatIds() {
         return result;
     }
 
-    private List<FormatId> getSelectedFormatIds(int trackType) {
+    private List<FormatId> createSelectedFormatIds(int trackType) {
         List<FormatId> result = new ArrayList<>();
 
         if (!videoFormatSelector.formatIds.isEmpty() && trackType == C.TRACK_TYPE_VIDEO) {
-            result = videoFormatSelector.formatIds;
+            result.addAll(videoFormatSelector.formatIds);
         } else if (!audioFormatSelector.formatIds.isEmpty() && trackType == C.TRACK_TYPE_AUDIO) {
-            result = audioFormatSelector.formatIds;
+            result.addAll(audioFormatSelector.formatIds);
         } else if (!captionFormatSelector.formatIds.isEmpty() && trackType == C.TRACK_TYPE_TEXT) {
-            result = captionFormatSelector.formatIds;
+            result.addAll(captionFormatSelector.formatIds);
         }
 
         return result;

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

@@ -53,6 +53,10 @@ public boolean isDiscardMedia() {
         return discardMedia;
     }
 
+    public Format getSelectedFormat() {
+        return !selectedFormats.isEmpty() ? selectedFormats.get(0) : null;
+    }
+
     private static FormatId createFormatId(Format format) {
         FormatId formatId = FormatId.newBuilder()
                 .setItag(Helpers.parseInt(format.id))