loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust SEF reader times to long.

Browse Source 
PiperOrigin-RevId: 342642410
This commit is contained in:
samrobinson 2020-11-16 16:33:27 +00:00 committed by Ian Baker
parent 4ff7eb4905
commit e832a4e0fc
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/common/src/main/java/com/google/android/exoplayer2/metadata/mp4/SlowMotionData.java
View File

@ -31,9 +31,9 @@ public final class SlowMotionData implements Metadata.Entry {
public static final class Segment implements Parcelable {
/** The start time, in milliseconds, of the track segment that is intended to be slow motion. */
public final int startTimeMs;
public final long startTimeMs;
/** The end time, in milliseconds, of the track segment that is intended to be slow motion. */
public final int endTimeMs;
public final long endTimeMs;
/**
* The speed reduction factor.
*
@ -49,7 +49,7 @@ public final class SlowMotionData implements Metadata.Entry {
* @param endTimeMs See {@link #endTimeMs}.
* @param speedDivisor See {@link #speedDivisor}.
*/
public Segment(int startTimeMs, int endTimeMs, int speedDivisor) {
public Segment(long startTimeMs, long endTimeMs, int speedDivisor) {
this.startTimeMs = startTimeMs;
this.endTimeMs = endTimeMs;
this.speedDivisor = speedDivisor;
@ -88,8 +88,8 @@ public final class SlowMotionData implements Metadata.Entry {
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeInt(startTimeMs);
dest.writeInt(endTimeMs);
dest.writeLong(startTimeMs);
dest.writeLong(endTimeMs);
dest.writeInt(speedDivisor);
}
@ -98,8 +98,8 @@ public final class SlowMotionData implements Metadata.Entry {
@Override
public Segment createFromParcel(Parcel in) {
int startTimeMs = in.readInt();
int endTimeMs = in.readInt();
long startTimeMs = in.readLong();
long endTimeMs = in.readLong();
int speedDivisor = in.readInt();
return new Segment(startTimeMs, endTimeMs, speedDivisor);
}

4
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/SefReader.java
View File

@ -234,8 +234,8 @@ import java.util.List;
throw new ParserException();
}
try {
int startTimeMs = Integer.parseInt(values.get(0));
int endTimeMs = Integer.parseInt(values.get(1));
long startTimeMs = Long.parseLong(values.get(0));
long endTimeMs = Long.parseLong(values.get(1));
int speedMode = Integer.parseInt(values.get(2));
int speedDivisor = 1 << (speedMode - 1);
segments.add(new SlowMotionData.Segment(startTimeMs, endTimeMs, speedDivisor));