summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-06-24 23:01:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-24 23:01:56 +0000
commitce0cc669459911355b331276b20b38f04a775b0b (patch)
treef0a152537d3348190e93a871ca9a5bb667b1ec17
parenta0637ae24b015594f5efdd19720690346338685c (diff)
parent59e7273da12a47383b0d073cf8e5c776c4452f70 (diff)
Merge "Add subsample offset to the exposed MediaFormat" into rvc-dev
-rw-r--r--apex/media/framework/java/android/media/MediaParser.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/apex/media/framework/java/android/media/MediaParser.java b/apex/media/framework/java/android/media/MediaParser.java
index 1cb212167497..71cc044d0cec 100644
--- a/apex/media/framework/java/android/media/MediaParser.java
+++ b/apex/media/framework/java/android/media/MediaParser.java
@@ -1920,8 +1920,10 @@ public final class MediaParser {
// format for convenient use from ExoPlayer.
result.setString("crypto-mode-fourcc", format.drmInitData.schemeType);
}
+ if (format.subsampleOffsetUs != Format.OFFSET_SAMPLE_RELATIVE) {
+ result.setLong("subsample-offset-us-long", format.subsampleOffsetUs);
+ }
// LACK OF SUPPORT FOR:
- // format.containerMimeType;
// format.id;
// format.metadata;
// format.stereoMode;