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
fc1eca10
authored
Oct 28, 2022
by
andrewlewis
Committed by
microkatz
Oct 31, 2022
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Upgrade dackka and fix some generation errors
#minor-release PiperOrigin-RevId: 484483080
parent
42057cc9
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
javadoc_combined.gradle
library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/avi/AviExtractor.java
javadoc_combined.gradle
View file @
fc1eca10
...
@@ -21,7 +21,7 @@ class CombinedJavadocPlugin implements Plugin<Project> {
...
@@ -21,7 +21,7 @@ class CombinedJavadocPlugin implements Plugin<Project> {
// Dackka snapshots are listed at https://androidx.dev/dackka/builds.
// Dackka snapshots are listed at https://androidx.dev/dackka/builds.
static
final
String
DACKKA_JAR_URL
=
static
final
String
DACKKA_JAR_URL
=
"https://androidx.dev/dackka/builds/
8003564/artifacts/dackka-0.0.14
.jar"
"https://androidx.dev/dackka/builds/
9221390/artifacts/dackka-1.0.4-all
.jar"
@Override
@Override
void
apply
(
Project
project
)
{
void
apply
(
Project
project
)
{
...
...
library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
View file @
fc1eca10
...
@@ -573,10 +573,10 @@ public class SampleQueue implements TrackOutput {
...
@@ -573,10 +573,10 @@ public class SampleQueue implements TrackOutput {
// TrackOutput implementation. Called by the loading thread.
// TrackOutput implementation. Called by the loading thread.
@Override
@Override
public
final
void
format
(
Format
unadjustedUpstreamF
ormat
)
{
public
final
void
format
(
Format
f
ormat
)
{
Format
adjustedUpstreamFormat
=
getAdjustedUpstreamFormat
(
unadjustedUpstreamF
ormat
);
Format
adjustedUpstreamFormat
=
getAdjustedUpstreamFormat
(
f
ormat
);
upstreamFormatAdjustmentRequired
=
false
;
upstreamFormatAdjustmentRequired
=
false
;
this
.
unadjustedUpstreamFormat
=
unadjustedUpstreamF
ormat
;
unadjustedUpstreamFormat
=
f
ormat
;
boolean
upstreamFormatChanged
=
setUpstreamFormat
(
adjustedUpstreamFormat
);
boolean
upstreamFormatChanged
=
setUpstreamFormat
(
adjustedUpstreamFormat
);
if
(
upstreamFormatChangeListener
!=
null
&&
upstreamFormatChanged
)
{
if
(
upstreamFormatChangeListener
!=
null
&&
upstreamFormatChanged
)
{
upstreamFormatChangeListener
.
onUpstreamFormatChanged
(
adjustedUpstreamFormat
);
upstreamFormatChangeListener
.
onUpstreamFormatChanged
(
adjustedUpstreamFormat
);
...
...
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/avi/AviExtractor.java
View file @
fc1eca10
...
@@ -169,8 +169,8 @@ public final class AviExtractor implements Extractor {
...
@@ -169,8 +169,8 @@ public final class AviExtractor implements Extractor {
}
}
@Override
@Override
public
int
read
(
ExtractorInput
input
,
PositionHolder
positionHolder
)
throws
IOException
{
public
int
read
(
ExtractorInput
input
,
PositionHolder
seekPosition
)
throws
IOException
{
if
(
resolvePendingReposition
(
input
,
positionHolder
))
{
if
(
resolvePendingReposition
(
input
,
seekPosition
))
{
return
RESULT_SEEK
;
return
RESULT_SEEK
;
}
}
switch
(
state
)
{
switch
(
state
)
{
...
@@ -303,14 +303,14 @@ public final class AviExtractor implements Extractor {
...
@@ -303,14 +303,14 @@ public final class AviExtractor implements Extractor {
* {@link ExtractorInput#getPosition() current position}, but not further than {@link
* {@link ExtractorInput#getPosition() current position}, but not further than {@link
* #RELOAD_MINIMUM_SEEK_DISTANCE}.
* #RELOAD_MINIMUM_SEEK_DISTANCE}.
*/
*/
private
boolean
resolvePendingReposition
(
ExtractorInput
input
,
PositionHolder
positionHolder
)
private
boolean
resolvePendingReposition
(
ExtractorInput
input
,
PositionHolder
seekPosition
)
throws
IOException
{
throws
IOException
{
boolean
needSeek
=
false
;
boolean
needSeek
=
false
;
if
(
pendingReposition
!=
C
.
POSITION_UNSET
)
{
if
(
pendingReposition
!=
C
.
POSITION_UNSET
)
{
long
currentPosition
=
input
.
getPosition
();
long
currentPosition
=
input
.
getPosition
();
if
(
pendingReposition
<
currentPosition
if
(
pendingReposition
<
currentPosition
||
pendingReposition
>
currentPosition
+
RELOAD_MINIMUM_SEEK_DISTANCE
)
{
||
pendingReposition
>
currentPosition
+
RELOAD_MINIMUM_SEEK_DISTANCE
)
{
positionHolder
.
position
=
pendingReposition
;
seekPosition
.
position
=
pendingReposition
;
needSeek
=
true
;
needSeek
=
true
;
}
else
{
}
else
{
// The distance to the target position is short enough that it makes sense to just skip the
// The distance to the target position is short enough that it makes sense to just skip the
...
...
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