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
b689fbd4
authored
Aug 17, 2021
by
olly
Committed by
Oliver Woodman
Aug 17, 2021
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Rename DecryptionException to CryptoException
PiperOrigin-RevId: 391272611
parent
ce4c8e40
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
9 deletions
RELEASENOTES.md
extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java
extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java
library/common/src/main/java/com/google/android/exoplayer2/decoder/DecryptionException.java → library/common/src/main/java/com/google/android/exoplayer2/decoder/CryptoException.java
RELEASENOTES.md
View file @
b689fbd4
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
*
Move
`com.google.android.exoplayer2.device.DeviceInfo`
to
*
Move
`com.google.android.exoplayer2.device.DeviceInfo`
to
`com.google.android.exoplayer2.DeviceInfo`
.
`com.google.android.exoplayer2.DeviceInfo`
.
*
Move
`com.google.android.exoplayer2.drm.DecryptionException`
to
*
Move
`com.google.android.exoplayer2.drm.DecryptionException`
to
`com.google.android.exoplayer2.decoder.
Decryption
Exception`
.
`com.google.android.exoplayer2.decoder.
Crypto
Exception`
.
*
Make
`ExoPlayer.Builder`
return a
`SimpleExoPlayer`
instance.
*
Make
`ExoPlayer.Builder`
return a
`SimpleExoPlayer`
instance.
*
Deprecate
`SimpleExoPlayer.Builder`
. Use
`ExoPlayer.Builder`
instead.
*
Deprecate
`SimpleExoPlayer.Builder`
. Use
`ExoPlayer.Builder`
instead.
*
Android 12 compatibility:
*
Android 12 compatibility:
...
...
extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java
View file @
b689fbd4
...
@@ -21,9 +21,9 @@ import androidx.annotation.Nullable;
...
@@ -21,9 +21,9 @@ import androidx.annotation.Nullable;
import
androidx.annotation.VisibleForTesting
;
import
androidx.annotation.VisibleForTesting
;
import
com.google.android.exoplayer2.C
;
import
com.google.android.exoplayer2.C
;
import
com.google.android.exoplayer2.audio.OpusUtil
;
import
com.google.android.exoplayer2.audio.OpusUtil
;
import
com.google.android.exoplayer2.decoder.CryptoException
;
import
com.google.android.exoplayer2.decoder.CryptoInfo
;
import
com.google.android.exoplayer2.decoder.CryptoInfo
;
import
com.google.android.exoplayer2.decoder.DecoderInputBuffer
;
import
com.google.android.exoplayer2.decoder.DecoderInputBuffer
;
import
com.google.android.exoplayer2.decoder.DecryptionException
;
import
com.google.android.exoplayer2.decoder.SimpleDecoder
;
import
com.google.android.exoplayer2.decoder.SimpleDecoder
;
import
com.google.android.exoplayer2.decoder.SimpleOutputBuffer
;
import
com.google.android.exoplayer2.decoder.SimpleOutputBuffer
;
import
com.google.android.exoplayer2.drm.ExoMediaCrypto
;
import
com.google.android.exoplayer2.drm.ExoMediaCrypto
;
...
@@ -193,8 +193,8 @@ public final class OpusDecoder
...
@@ -193,8 +193,8 @@ public final class OpusDecoder
if
(
result
<
0
)
{
if
(
result
<
0
)
{
if
(
result
==
DRM_ERROR
)
{
if
(
result
==
DRM_ERROR
)
{
String
message
=
"Drm error: "
+
opusGetErrorMessage
(
nativeDecoderContext
);
String
message
=
"Drm error: "
+
opusGetErrorMessage
(
nativeDecoderContext
);
Decryption
Exception
cause
=
Crypto
Exception
cause
=
new
Decryption
Exception
(
opusGetErrorCode
(
nativeDecoderContext
),
message
);
new
Crypto
Exception
(
opusGetErrorCode
(
nativeDecoderContext
),
message
);
return
new
OpusDecoderException
(
message
,
cause
);
return
new
OpusDecoderException
(
message
,
cause
);
}
else
{
}
else
{
return
new
OpusDecoderException
(
"Decode error: "
+
opusGetErrorMessage
(
result
));
return
new
OpusDecoderException
(
"Decode error: "
+
opusGetErrorMessage
(
result
));
...
...
extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java
View file @
b689fbd4
...
@@ -21,9 +21,9 @@ import android.view.Surface;
...
@@ -21,9 +21,9 @@ import android.view.Surface;
import
androidx.annotation.Nullable
;
import
androidx.annotation.Nullable
;
import
androidx.annotation.VisibleForTesting
;
import
androidx.annotation.VisibleForTesting
;
import
com.google.android.exoplayer2.C
;
import
com.google.android.exoplayer2.C
;
import
com.google.android.exoplayer2.decoder.CryptoException
;
import
com.google.android.exoplayer2.decoder.CryptoInfo
;
import
com.google.android.exoplayer2.decoder.CryptoInfo
;
import
com.google.android.exoplayer2.decoder.DecoderInputBuffer
;
import
com.google.android.exoplayer2.decoder.DecoderInputBuffer
;
import
com.google.android.exoplayer2.decoder.DecryptionException
;
import
com.google.android.exoplayer2.decoder.SimpleDecoder
;
import
com.google.android.exoplayer2.decoder.SimpleDecoder
;
import
com.google.android.exoplayer2.drm.ExoMediaCrypto
;
import
com.google.android.exoplayer2.drm.ExoMediaCrypto
;
import
com.google.android.exoplayer2.util.Assertions
;
import
com.google.android.exoplayer2.util.Assertions
;
...
@@ -145,8 +145,7 @@ public final class VpxDecoder
...
@@ -145,8 +145,7 @@ public final class VpxDecoder
if
(
result
!=
NO_ERROR
)
{
if
(
result
!=
NO_ERROR
)
{
if
(
result
==
DRM_ERROR
)
{
if
(
result
==
DRM_ERROR
)
{
String
message
=
"Drm error: "
+
vpxGetErrorMessage
(
vpxDecContext
);
String
message
=
"Drm error: "
+
vpxGetErrorMessage
(
vpxDecContext
);
DecryptionException
cause
=
CryptoException
cause
=
new
CryptoException
(
vpxGetErrorCode
(
vpxDecContext
),
message
);
new
DecryptionException
(
vpxGetErrorCode
(
vpxDecContext
),
message
);
return
new
VpxDecoderException
(
message
,
cause
);
return
new
VpxDecoderException
(
message
,
cause
);
}
else
{
}
else
{
return
new
VpxDecoderException
(
"Decode error: "
+
vpxGetErrorMessage
(
vpxDecContext
));
return
new
VpxDecoderException
(
"Decode error: "
+
vpxGetErrorMessage
(
vpxDecContext
));
...
...
library/common/src/main/java/com/google/android/exoplayer2/decoder/
Decryption
Exception.java
→
library/common/src/main/java/com/google/android/exoplayer2/decoder/
Crypto
Exception.java
View file @
b689fbd4
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
package
com
.
google
.
android
.
exoplayer2
.
decoder
;
package
com
.
google
.
android
.
exoplayer2
.
decoder
;
/** Thrown when a non-platform component fails to decrypt data. */
/** Thrown when a non-platform component fails to decrypt data. */
public
class
Decryption
Exception
extends
Exception
{
public
class
Crypto
Exception
extends
Exception
{
/** A component specific error code. */
/** A component specific error code. */
public
final
int
errorCode
;
public
final
int
errorCode
;
...
@@ -25,7 +25,7 @@ public class DecryptionException extends Exception {
...
@@ -25,7 +25,7 @@ public class DecryptionException extends Exception {
* @param errorCode A component specific error code.
* @param errorCode A component specific error code.
* @param message The detail message.
* @param message The detail message.
*/
*/
public
Decryption
Exception
(
int
errorCode
,
String
message
)
{
public
Crypto
Exception
(
int
errorCode
,
String
message
)
{
super
(
message
);
super
(
message
);
this
.
errorCode
=
errorCode
;
this
.
errorCode
=
errorCode
;
}
}
...
...
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