sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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 { public static final class Segment implements Parcelable {
/** The start time, in milliseconds, of the track segment that is intended to be slow motion. */ /** 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. */ /** 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. * The speed reduction factor.
* *
@ -49,7 +49,7 @@ public final class SlowMotionData implements Metadata.Entry {
* @param endTimeMs See {@link #endTimeMs}. * @param endTimeMs See {@link #endTimeMs}.
* @param speedDivisor See {@link #speedDivisor}. * @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.startTimeMs = startTimeMs;
this.endTimeMs = endTimeMs; this.endTimeMs = endTimeMs;
this.speedDivisor = speedDivisor; this.speedDivisor = speedDivisor;
@ -88,8 +88,8 @@ public final class SlowMotionData implements Metadata.Entry {
@Override @Override
public void writeToParcel(Parcel dest, int flags) { public void writeToParcel(Parcel dest, int flags) {
dest.writeInt(startTimeMs); dest.writeLong(startTimeMs);
dest.writeInt(endTimeMs); dest.writeLong(endTimeMs);
dest.writeInt(speedDivisor); dest.writeInt(speedDivisor);
} }
@ -98,8 +98,8 @@ public final class SlowMotionData implements Metadata.Entry {
@Override @Override
public Segment createFromParcel(Parcel in) { public Segment createFromParcel(Parcel in) {
int startTimeMs = in.readInt(); long startTimeMs = in.readLong();
int endTimeMs = in.readInt(); long endTimeMs = in.readLong();
int speedDivisor = in.readInt(); int speedDivisor = in.readInt();
return new Segment(startTimeMs, endTimeMs, speedDivisor); 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(); throw new ParserException();
} }
try { try {
int startTimeMs = Integer.parseInt(values.get(0)); long startTimeMs = Long.parseLong(values.get(0));
int endTimeMs = Integer.parseInt(values.get(1)); long endTimeMs = Long.parseLong(values.get(1));
int speedMode = Integer.parseInt(values.get(2)); int speedMode = Integer.parseInt(values.get(2));
int speedDivisor = 1 << (speedMode - 1); int speedDivisor = 1 << (speedMode - 1);
segments.add(new SlowMotionData.Segment(startTimeMs, endTimeMs, speedDivisor)); segments.add(new SlowMotionData.Segment(startTimeMs, endTimeMs, speedDivisor));