From 44c45fd18db8345d389ed3335aaffd69b658dcf0 Mon Sep 17 00:00:00 2001 From: olly Date: Mon, 9 Jul 2018 08:17:36 -0700 Subject: [PATCH] Move subsampleOffset in Format It's no longer text specific (it's used for metadata as well, and in theory could apply to any stream in which samples contain multiple sub-samples) ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=203767825 --- .../com/google/android/exoplayer2/Format.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Format.java b/library/core/src/main/java/com/google/android/exoplayer2/Format.java index 61d416da09..1614e53164 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/Format.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/Format.java @@ -80,6 +80,13 @@ public final class Format implements Parcelable { /** DRM initialization data if the stream is protected, or null otherwise. */ public final @Nullable DrmInitData drmInitData; + /** + * For samples that contain subsamples, this is an offset that should be added to subsample + * timestamps. A value of {@link #OFFSET_SAMPLE_RELATIVE} indicates that subsample timestamps are + * relative to the timestamps of their parent samples. + */ + public final long subsampleOffsetUs; + // Video specific. /** @@ -141,15 +148,6 @@ public final class Format implements Parcelable { */ public final int encoderPadding; - // Text specific. - - /** - * For samples that contain subsamples, this is an offset that should be added to subsample - * timestamps. A value of {@link #OFFSET_SAMPLE_RELATIVE} indicates that subsample timestamps are - * relative to the timestamps of their parent samples. - */ - public final long subsampleOffsetUs; - // Audio and text specific. /**