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
0add067e
authored
May 26, 2020
by
tonihei
Committed by
Oliver Woodman
May 27, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Make fallback value more explicitly unset.
PiperOrigin-RevId: 313171970
parent
03ea39b1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java
View file @
0add067e
...
@@ -628,14 +628,14 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
...
@@ -628,14 +628,14 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
return
;
return
;
}
}
int
newQueueSize
=
Integer
.
MAX_VALUE
;
int
newQueueSize
=
C
.
LENGTH_UNSET
;
for
(
int
i
=
preferredQueueSize
;
i
<
currentQueueSize
;
i
++)
{
for
(
int
i
=
preferredQueueSize
;
i
<
currentQueueSize
;
i
++)
{
if
(!
haveReadFromMediaChunk
(
i
))
{
if
(!
haveReadFromMediaChunk
(
i
))
{
newQueueSize
=
i
;
newQueueSize
=
i
;
break
;
break
;
}
}
}
}
if
(
newQueueSize
>=
currentQueueSize
)
{
if
(
newQueueSize
==
C
.
LENGTH_UNSET
)
{
return
;
return
;
}
}
...
...
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
View file @
0add067e
...
@@ -881,15 +881,14 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
...
@@ -881,15 +881,14 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
private
void
discardUpstream
(
int
preferredQueueSize
)
{
private
void
discardUpstream
(
int
preferredQueueSize
)
{
Assertions
.
checkState
(!
loader
.
isLoading
());
Assertions
.
checkState
(!
loader
.
isLoading
());
int
currentQueueSize
=
mediaChunks
.
size
();
int
newQueueSize
=
C
.
LENGTH_UNSET
;
int
newQueueSize
=
Integer
.
MAX_VALUE
;
for
(
int
i
=
preferredQueueSize
;
i
<
mediaChunks
.
size
();
i
++)
{
for
(
int
i
=
preferredQueueSize
;
i
<
currentQueueSize
;
i
++)
{
if
(!
haveReadFromMediaChunkDiscardRange
(
i
))
{
if
(!
haveReadFromMediaChunkDiscardRange
(
i
))
{
newQueueSize
=
i
;
newQueueSize
=
i
;
break
;
break
;
}
}
}
}
if
(
newQueueSize
>=
currentQueueSize
)
{
if
(
newQueueSize
==
C
.
LENGTH_UNSET
)
{
return
;
return
;
}
}
...
...
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