Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
ec65fe95
authored
Oct 26, 2015
by
Rik Heijdens
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Fixed code indentation
parent
bc3125c5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
library/src/main/java/com/google/android/exoplayer/MediaFormat.java
library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java
library/src/main/java/com/google/android/exoplayer/MediaFormat.java
View file @
ec65fe95
...
@@ -15,12 +15,12 @@
...
@@ -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 {
...
@@ -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.
...
...
library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java
View file @
ec65fe95
...
@@ -15,6 +15,11 @@
...
@@ -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;
...
@@ -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 {
...
@@ -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,10 +865,10 @@ public class DashChunkSource implements ChunkSource, Output {
...
@@ -866,10 +865,10 @@ 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
{
public
final
ChunkExtractorWrapper
extractorWrapper
;
public
final
ChunkExtractorWrapper
extractorWrapper
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment