diff options
| author | 2018-10-25 22:11:19 +0000 | |
|---|---|---|
| committer | 2018-10-25 22:11:19 +0000 | |
| commit | bef47d02d5ccf0238173027e6830b3f1bf05f0df (patch) | |
| tree | 39b33ed3a2b05c8be6c0a8bdfb9cc5b1ca282c99 | |
| parent | 93399bedcebee8e3bbdd8b4af74796b8b65a9554 (diff) | |
| parent | f4d209cd36bead7d5031b9d23f3627ee4644cacd (diff) | |
Merge "DataSourceDesc: set max time in ms and us"
| -rw-r--r-- | media/java/android/media/DataSourceDesc.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/media/java/android/media/DataSourceDesc.java b/media/java/android/media/DataSourceDesc.java index a53fa11f1777..afc99a08ce3c 100644 --- a/media/java/android/media/DataSourceDesc.java +++ b/media/java/android/media/DataSourceDesc.java @@ -62,6 +62,11 @@ public final class DataSourceDesc { // intentionally less than long.MAX_VALUE public static final long LONG_MAX = 0x7ffffffffffffffL; + // keep consistent with native code + public static final long LONG_MAX_TIME_MS = LONG_MAX / 1000; + public static final long LONG_MAX_TIME_US = LONG_MAX_TIME_MS * 1000; + + private int mType = TYPE_NONE; private Media2DataSource mMedia2DataSource; @@ -77,7 +82,7 @@ public final class DataSourceDesc { private String mMediaId; private long mStartPositionMs = 0; - private long mEndPositionMs = LONG_MAX; + private long mEndPositionMs = LONG_MAX_TIME_MS; private DataSourceDesc() { } @@ -225,7 +230,7 @@ public final class DataSourceDesc { private String mMediaId; private long mStartPositionMs = 0; - private long mEndPositionMs = LONG_MAX; + private long mEndPositionMs = LONG_MAX_TIME_MS; /** * Constructs a new Builder with the defaults. @@ -326,7 +331,7 @@ public final class DataSourceDesc { */ public Builder setEndPosition(long position) { if (position < 0) { - position = LONG_MAX; + position = LONG_MAX_TIME_MS; } mEndPositionMs = position; return this; |