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
f8c76f62
authored
Jan 03, 2018
by
Oliver Woodman
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Fix ClippingSampleStream
parent
f6578939
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
6 deletions
library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaPeriod.java
library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaPeriod.java
View file @
f8c76f62
...
@@ -112,7 +112,7 @@ public final class ClippingMediaPeriod implements MediaPeriod, MediaPeriod.Callb
...
@@ -112,7 +112,7 @@ public final class ClippingMediaPeriod implements MediaPeriod, MediaPeriod.Callb
if
(
internalStreams
[
i
]
==
null
)
{
if
(
internalStreams
[
i
]
==
null
)
{
sampleStreams
[
i
]
=
null
;
sampleStreams
[
i
]
=
null
;
}
else
if
(
streams
[
i
]
==
null
||
sampleStreams
[
i
].
stream
!=
internalStreams
[
i
])
{
}
else
if
(
streams
[
i
]
==
null
||
sampleStreams
[
i
].
stream
!=
internalStreams
[
i
])
{
sampleStreams
[
i
]
=
new
ClippingSampleStream
(
this
,
internalStreams
[
i
],
startUs
,
endUs
,
sampleStreams
[
i
]
=
new
ClippingSampleStream
(
internalStreams
[
i
],
startUs
,
endUs
,
pendingInitialDiscontinuity
);
pendingInitialDiscontinuity
);
}
}
streams
[
i
]
=
sampleStreams
[
i
];
streams
[
i
]
=
sampleStreams
[
i
];
...
@@ -222,9 +222,8 @@ public final class ClippingMediaPeriod implements MediaPeriod, MediaPeriod.Callb
...
@@ -222,9 +222,8 @@ public final class ClippingMediaPeriod implements MediaPeriod, MediaPeriod.Callb
/**
/**
* Wraps a {@link SampleStream} and clips its samples.
* Wraps a {@link SampleStream} and clips its samples.
*/
*/
private
static
final
class
ClippingSampleStream
implements
SampleStream
{
private
final
class
ClippingSampleStream
implements
SampleStream
{
private
final
MediaPeriod
mediaPeriod
;
private
final
SampleStream
stream
;
private
final
SampleStream
stream
;
private
final
long
startUs
;
private
final
long
startUs
;
private
final
long
endUs
;
private
final
long
endUs
;
...
@@ -232,9 +231,8 @@ public final class ClippingMediaPeriod implements MediaPeriod, MediaPeriod.Callb
...
@@ -232,9 +231,8 @@ public final class ClippingMediaPeriod implements MediaPeriod, MediaPeriod.Callb
private
boolean
pendingDiscontinuity
;
private
boolean
pendingDiscontinuity
;
private
boolean
sentEos
;
private
boolean
sentEos
;
public
ClippingSampleStream
(
MediaPeriod
mediaPeriod
,
SampleStream
stream
,
long
startUs
,
public
ClippingSampleStream
(
SampleStream
stream
,
long
startUs
,
long
endUs
,
long
endUs
,
boolean
pendingDiscontinuity
)
{
boolean
pendingDiscontinuity
)
{
this
.
mediaPeriod
=
mediaPeriod
;
this
.
stream
=
stream
;
this
.
stream
=
stream
;
this
.
startUs
=
startUs
;
this
.
startUs
=
startUs
;
this
.
endUs
=
endUs
;
this
.
endUs
=
endUs
;
...
...
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