sabr: add more protos

Author: yuliskov

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

@@ -34,7 +34,7 @@
 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.protos.videostreaming.FormatId;
+import com.google.android.exoplayer2.source.sabr.protos.misc.FormatId;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DataSpec;
@@ -637,7 +637,7 @@ private static CaptionSelector createCaptionSelection(int trackType, TrackSelect
     private static FormatId createFormatId(Format format) {
         FormatId formatId = FormatId.newBuilder()
                 .setItag(Helpers.parseInt(format.id))
-                .setLmt(format.lastModified)
+                .setLastModified(format.lastModified)
                 .build();
         return formatId;
     }

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

@@ -1,6 +1,6 @@
 package com.google.android.exoplayer2.source.sabr.parser.exceptions;
 
-import com.google.android.exoplayer2.source.sabr.protos.videostreaming.FormatId;
+import com.google.android.exoplayer2.source.sabr.protos.misc.FormatId;
 
 public class MediaSegmentMismatchError extends SabrStreamError {
     public final long expectedSequenceNumber;

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

@@ -1,6 +1,6 @@
 package com.google.android.exoplayer2.source.sabr.parser.models;
 
-import com.google.android.exoplayer2.source.sabr.protos.videostreaming.FormatId;
+import com.google.android.exoplayer2.source.sabr.protos.misc.FormatId;
 
 public class AudioSelector extends FormatSelector {
     public AudioSelector(String displayName, boolean discardMedia) {

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

@@ -1,6 +1,6 @@
 package com.google.android.exoplayer2.source.sabr.parser.models;
 
-import com.google.android.exoplayer2.source.sabr.protos.videostreaming.FormatId;
+import com.google.android.exoplayer2.source.sabr.protos.misc.FormatId;
 
 public class CaptionSelector extends FormatSelector {
     public CaptionSelector(String displayName, boolean discardMedia) {

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

@@ -1,6 +1,6 @@
 package com.google.android.exoplayer2.source.sabr.parser.models;
 
-import com.google.android.exoplayer2.source.sabr.protos.videostreaming.FormatId;
+import com.google.android.exoplayer2.source.sabr.protos.misc.FormatId;
 
 import java.util.ArrayList;
 import java.util.Arrays;

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

@@ -1,6 +1,6 @@
 package com.google.android.exoplayer2.source.sabr.parser.models;
 
-import com.google.android.exoplayer2.source.sabr.protos.videostreaming.FormatId;
+import com.google.android.exoplayer2.source.sabr.protos.misc.FormatId;
 
 public class Segment {
     public final FormatId formatId;
@@ -11,7 +11,7 @@ public class Segment {
     public final long contentLength;
     public final boolean contentLengthEstimated;
     public final int startMs;
-    public final InitializedFormat initializedFormat;
+    public final SelectedFormat initializedFormat;
     public final boolean durationEstimated;
     public final boolean discard;
     public final boolean consumed;
@@ -26,7 +26,7 @@ public Segment(FormatId formatId,
                    long contentLength,
                    boolean contentLengthEstimated,
                    int startMs,
-                   InitializedFormat initializedFormat,
+                   SelectedFormat initializedFormat,
                    boolean durationEstimated,
                    boolean discard,
                    boolean consumed,

…abr/parser/models/InitializedFormat.java …e/sabr/parser/models/SelectedFormat.javaexoplayer-amzn-2.10.6/library/sabr/src/main/java/com/google/android/exoplayer2/source/sabr/parser/models/InitializedFormat.java renamed to exoplayer-amzn-2.10.6/library/sabr/src/main/java/com/google/android/exoplayer2/source/sabr/parser/models/SelectedFormat.java exoplayer-amzn-2.10.6/library/sabr/src/main/java/com/google/android/exoplayer2/source/sabr/parser/models/InitializedFormat.java renamed to exoplayer-amzn-2.10.6/library/sabr/src/main/java/com/google/android/exoplayer2/source/sabr/parser/models/SelectedFormat.java

@@ -1,11 +1,11 @@
 package com.google.android.exoplayer2.source.sabr.parser.models;
 
-import com.google.android.exoplayer2.source.sabr.protos.videostreaming.FormatId;
+import com.google.android.exoplayer2.source.sabr.protos.misc.FormatId;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class InitializedFormat {
+public class SelectedFormat {
     public final FormatId formatId;
     public final int durationMs;
     public final int endTimeMs;
@@ -19,7 +19,7 @@ public class InitializedFormat {
     public Segment initSegment;
     public final List<ConsumedRange> consumedRanges = new ArrayList<>();
 
-    public InitializedFormat(
+    public SelectedFormat(
             FormatId formatId,
             int durationMs,
             int endTimeMs,

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

@@ -1,6 +1,6 @@
 package com.google.android.exoplayer2.source.sabr.parser.models;
 
-import com.google.android.exoplayer2.source.sabr.protos.videostreaming.FormatId;
+import com.google.android.exoplayer2.source.sabr.protos.misc.FormatId;
 
 public class VideoSelector extends FormatSelector {
     public VideoSelector(String displayName, boolean discardMedia) {

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

@@ -1,7 +1,7 @@
 package com.google.android.exoplayer2.source.sabr.parser.parts;
 
 import com.google.android.exoplayer2.source.sabr.parser.models.FormatSelector;
-import com.google.android.exoplayer2.source.sabr.protos.videostreaming.FormatId;
+import com.google.android.exoplayer2.source.sabr.protos.misc.FormatId;
 
 public class FormatInitializedSabrPart implements SabrPart {
     public final FormatId formatId;

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

@@ -1,7 +1,7 @@
 package com.google.android.exoplayer2.source.sabr.parser.parts;
 
 import com.google.android.exoplayer2.source.sabr.parser.models.FormatSelector;
-import com.google.android.exoplayer2.source.sabr.protos.videostreaming.FormatId;
+import com.google.android.exoplayer2.source.sabr.protos.misc.FormatId;
 
 public class MediaSeekSabrPart implements SabrPart {
     public Reason reason;