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
5b2e8543
authored
Jul 06, 2021
by
aquilescanta
Committed by
kim-vde
Jul 09, 2021
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Add missing call and rename getErrorCodeForMediaDrmErrorCode
PiperOrigin-RevId: 383251000
parent
6dbc1eb1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
library/common/src/main/java/com/google/android/exoplayer2/C.java
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
library/common/src/main/java/com/google/android/exoplayer2/C.java
View file @
5b2e8543
...
...
@@ -1116,7 +1116,7 @@ public final class C {
private
static
final
int
ERROR_PROVISIONING_RETRY
=
28
;
@PlaybackException
.
ErrorCode
public
static
int
getErrorCode
CorrespondingToPlatform
DrmErrorCode
(
int
mediaDrmErrorCode
)
{
public
static
int
getErrorCode
ForMedia
DrmErrorCode
(
int
mediaDrmErrorCode
)
{
switch
(
mediaDrmErrorCode
)
{
case
ERROR_PROVISIONING_CONFIG:
case
ERROR_PROVISIONING_PARSE:
...
...
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
View file @
5b2e8543
...
...
@@ -3120,10 +3120,12 @@ import java.util.concurrent.atomic.AtomicBoolean;
}
@DoNotInline
@ErrorCode
public
static
int
mediaDrmStateExceptionToErrorCode
(
Throwable
throwable
)
{
@Nullable
String
diagnosticsInfo
=
((
MediaDrm
.
MediaDrmStateException
)
throwable
).
getDiagnosticInfo
();
return
Util
.
getErrorCodeFromPlatformDiagnosticsInfo
(
diagnosticsInfo
);
int
drmErrorCode
=
Util
.
getErrorCodeFromPlatformDiagnosticsInfo
(
diagnosticsInfo
);
return
C
.
getErrorCodeForMediaDrmErrorCode
(
drmErrorCode
);
}
}
...
...
library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
View file @
5b2e8543
...
...
@@ -1302,7 +1302,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
}
}
catch
(
CryptoException
e
)
{
throw
createRendererException
(
e
,
inputFormat
,
C
.
getErrorCode
CorrespondingToPlatform
DrmErrorCode
(
e
.
getErrorCode
()));
e
,
inputFormat
,
C
.
getErrorCode
ForMedia
DrmErrorCode
(
e
.
getErrorCode
()));
}
return
false
;
}
...
...
@@ -1373,7 +1373,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
}
}
catch
(
CryptoException
e
)
{
throw
createRendererException
(
e
,
inputFormat
,
C
.
getErrorCode
CorrespondingToPlatform
DrmErrorCode
(
e
.
getErrorCode
()));
e
,
inputFormat
,
C
.
getErrorCode
ForMedia
DrmErrorCode
(
e
.
getErrorCode
()));
}
resetInputBuffer
();
...
...
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