From ec65fe952c292495c9837b9ec88b78b901e8fd86 Mon Sep 17 00:00:00 2001 From: Rik Heijdens Date: Mon, 26 Oct 2015 09:59:19 -0400 Subject: [PATCH] Fixed code indentation --- .../com/google/android/exoplayer/MediaFormat.java | 7 ++++--- .../android/exoplayer/dash/DashChunkSource.java | 15 +++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/library/src/main/java/com/google/android/exoplayer/MediaFormat.java b/library/src/main/java/com/google/android/exoplayer/MediaFormat.java index 07fa0fd060..2a81d92472 100644 --- a/library/src/main/java/com/google/android/exoplayer/MediaFormat.java +++ b/library/src/main/java/com/google/android/exoplayer/MediaFormat.java @@ -15,12 +15,12 @@ */ package com.google.android.exoplayer; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.Util; - import android.annotation.SuppressLint; import android.annotation.TargetApi; +import com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer.util.Util; + import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Collections; @@ -38,6 +38,7 @@ public final class MediaFormat { * the timestamps of their parent samples. */ public static final long OFFSET_SAMPLE_RELATIVE = Long.MAX_VALUE; + /** * The identifier for the track represented by the format, or null if unknown or not * applicable. diff --git a/library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java b/library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java index 3bb88028be..a0e893b77f 100644 --- a/library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java +++ b/library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java @@ -15,6 +15,11 @@ */ package com.google.android.exoplayer.dash; +import android.os.Handler; +import android.text.TextUtils; +import android.util.Log; +import android.util.SparseArray; + import com.google.android.exoplayer.BehindLiveWindowException; import com.google.android.exoplayer.C; import com.google.android.exoplayer.MediaFormat; @@ -51,11 +56,6 @@ import com.google.android.exoplayer.util.ManifestFetcher; import com.google.android.exoplayer.util.MimeTypes; import com.google.android.exoplayer.util.SystemClock; -import android.os.Handler; -import android.text.TextUtils; -import android.util.Log; -import android.util.SparseArray; - import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -846,7 +846,6 @@ public class DashChunkSource implements ChunkSource, Output { public ExposedTrack(MediaFormat trackFormat, int adaptationSetIndex, Format fixedFormat) { this.trackFormat = trackFormat; - this.adaptationSetIndex = adaptationSetIndex; this.fixedFormat = fixedFormat; this.adaptiveFormats = null; @@ -866,9 +865,9 @@ public class DashChunkSource implements ChunkSource, Output { public boolean isAdaptive() { return adaptiveFormats != null; + } - } - } + } private static final class RepresentationHolder {