sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-03-29 10:05:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove deprecated Timeline.getWindow method.

Browse source 
Removing this method requires custom MediaSource implementations to switch
to the new version. While this breaks the implmentation, it also avoids problems
with accidentely forwarding to the wrong method or with accidental stack
overflows when none of the two methods gets implemented.

It's unlikely any callers are affected because this is only the extended version
with the defaultProjectionPositionUs parameter that no caller except the
internal player will use.

PiperOrigin-RevId: 267323042
This commit is contained in:
tonihei 2019-09-05 09:41:06 +01:00 committed by Toni
parent 40870b8780
commit b57c556194
2 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
library/core/src/main/java/com/google/android/exoplayer2/Timeline.java
View file

@ -657,17 +657,8 @@ public abstract class Timeline {
* default start position should be projected.
* @return The populated {@link Window}, for convenience.
*/
@SuppressWarnings("deprecation")
public Window getWindow(int windowIndex, Window window, long defaultPositionProjectionUs) {
return getWindow(windowIndex, window, /* setTag= */ true, defaultPositionProjectionUs);
}
/** @deprecated Implement {@link #getWindow(int, Window, long)} instead and always set the tag. */
@Deprecated
public Window getWindow(
int windowIndex, Window window, boolean setTag, long defaultPositionProjectionUs) {
return getWindow(windowIndex, window, defaultPositionProjectionUs);
}
public abstract Window getWindow(
int windowIndex, Window window, long defaultPositionProjectionUs);
/**
* Returns the number of periods in the timeline.

6
library/core/src/main/java/com/google/android/exoplayer2/source/ForwardingTimeline.java
View file

@ -61,12 +61,6 @@ public abstract class ForwardingTimeline extends Timeline {
return timeline.getWindow(windowIndex, window, defaultPositionProjectionUs);
}
@Override
public final Window getWindow(
int windowIndex, Window window, boolean setIds, long defaultPositionProjectionUs) {
return getWindow(windowIndex, window, defaultPositionProjectionUs);
}
@Override
public int getPeriodCount() {
return timeline.getPeriodCount();