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
5f1921f5
authored
Jun 11, 2021
by
aquilescanta
Committed by
Oliver Woodman
Jun 15, 2021
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Make Player.getPlayerError return a PlaybackException
PiperOrigin-RevId: 378899373
parent
5f77bf04
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
5 deletions
library/common/src/main/java/com/google/android/exoplayer2/ForwardingPlayer.java
library/common/src/main/java/com/google/android/exoplayer2/Player.java
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackStatsListener.java
testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java
library/common/src/main/java/com/google/android/exoplayer2/ForwardingPlayer.java
View file @
5f1921f5
...
...
@@ -178,7 +178,7 @@ public class ForwardingPlayer implements Player {
@Nullable
@Override
public
Exo
PlaybackException
getPlayerError
()
{
public
PlaybackException
getPlayerError
()
{
return
player
.
getPlayerError
();
}
...
...
library/common/src/main/java/com/google/android/exoplayer2/Player.java
View file @
5f1921f5
...
...
@@ -1472,7 +1472,7 @@ public interface Player {
* @see Listener#onPlayerError(ExoPlaybackException)
*/
@Nullable
Exo
PlaybackException
getPlayerError
();
PlaybackException
getPlayerError
();
/**
* Resumes playback as soon as {@link #getPlaybackState()} == {@link #STATE_READY}. Equivalent to
...
...
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
View file @
5f1921f5
...
...
@@ -834,6 +834,13 @@ public interface ExoPlayer extends Player {
}
}
/**
* Equivalent to {@link Player#getPlayerError()}, except the exception is guaranteed to be an
* {@link ExoPlaybackException}.
*/
@Override
ExoPlaybackException
getPlayerError
();
/** Returns the component of this player for audio output, or null if audio is not supported. */
@Nullable
AudioComponent
getAudioComponent
();
...
...
library/core/src/main/java/com/google/android/exoplayer2/analytics/PlaybackStatsListener.java
View file @
5f1921f5
...
...
@@ -22,8 +22,8 @@ import android.os.SystemClock;
import
android.util.Pair
;
import
androidx.annotation.Nullable
;
import
com.google.android.exoplayer2.C
;
import
com.google.android.exoplayer2.ExoPlaybackException
;
import
com.google.android.exoplayer2.Format
;
import
com.google.android.exoplayer2.PlaybackException
;
import
com.google.android.exoplayer2.Player
;
import
com.google.android.exoplayer2.Timeline
;
import
com.google.android.exoplayer2.Timeline.Period
;
...
...
@@ -489,7 +489,7 @@ public final class PlaybackStatsListener
int
droppedFrameCount
,
boolean
hasAudioUnderun
,
boolean
startedLoading
,
@Nullable
Exo
PlaybackException
fatalError
,
@Nullable
PlaybackException
fatalError
,
@Nullable
Exception
nonFatalException
,
long
bandwidthTimeMs
,
long
bandwidthBytes
,
...
...
testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java
View file @
5f1921f5
...
...
@@ -195,7 +195,9 @@ public abstract class ExoHostedTest implements AnalyticsListener, HostedTest {
}
}
if
(
events
.
contains
(
EVENT_PLAYER_ERROR
))
{
playerError
=
checkNotNull
(
player
.
getPlayerError
());
// The exception is guaranteed to be an ExoPlaybackException because the underlying player is
// an ExoPlayer instance.
playerError
=
(
ExoPlaybackException
)
checkNotNull
(
player
.
getPlayerError
());
onPlayerErrorInternal
(
playerError
);
}
if
(
events
.
contains
(
EVENT_PLAYBACK_STATE_CHANGED
))
{
...
...
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