loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-15 11:39:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed code indentation

Browse Source
This commit is contained in:
Rik Heijdens 2015-10-26 09:59:19 -04:00
parent bc3125c5d2
commit ec65fe952c
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/src/main/java/com/google/android/exoplayer/MediaFormat.java
View File

@ -15,12 +15,12 @@
*/ */
package com.google.android.exoplayer; 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.SuppressLint;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import com.google.android.exoplayer.util.Assertions;
import com.google.android.exoplayer.util.Util;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
@ -38,6 +38,7 @@ public final class MediaFormat {
* the timestamps of their parent samples. * the timestamps of their parent samples.
*/ */
public static final long OFFSET_SAMPLE_RELATIVE = Long.MAX_VALUE; 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 * The identifier for the track represented by the format, or null if unknown or not
* applicable. * applicable.

15
library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java
View File

@ -15,6 +15,11 @@
*/ */
package com.google.android.exoplayer.dash; 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.BehindLiveWindowException;
import com.google.android.exoplayer.C; import com.google.android.exoplayer.C;
import com.google.android.exoplayer.MediaFormat; 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.MimeTypes;
import com.google.android.exoplayer.util.SystemClock; 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.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -846,7 +846,6 @@ public class DashChunkSource implements ChunkSource, Output {
public ExposedTrack(MediaFormat trackFormat, int adaptationSetIndex, Format fixedFormat) { public ExposedTrack(MediaFormat trackFormat, int adaptationSetIndex, Format fixedFormat) {
this.trackFormat = trackFormat; this.trackFormat = trackFormat;
this.adaptationSetIndex = adaptationSetIndex; this.adaptationSetIndex = adaptationSetIndex;
this.fixedFormat = fixedFormat; this.fixedFormat = fixedFormat;
this.adaptiveFormats = null; this.adaptiveFormats = null;
@ -866,9 +865,9 @@ public class DashChunkSource implements ChunkSource, Output {
public boolean isAdaptive() { public boolean isAdaptive() {
return adaptiveFormats != null; return adaptiveFormats != null;
}
} }
}
private static final class RepresentationHolder { private static final class RepresentationHolder {