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
0bfbcea6
authored
Jan 14, 2019
by
olly
Committed by
Oliver Woodman
Jan 14, 2019
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Reset requiresSecureDecoder boolean on codec release
PiperOrigin-RevId: 229253065
parent
1b62277a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
11 deletions
library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
View file @
0bfbcea6
...
...
@@ -296,7 +296,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
@Nullable
private
DrmSession
<
FrameworkMediaCrypto
>
codecDrmSession
;
@Nullable
private
DrmSession
<
FrameworkMediaCrypto
>
sourceDrmSession
;
@Nullable
private
MediaCrypto
mediaCrypto
;
private
boolean
drmSession
RequiresSecureDecoder
;
private
boolean
mediaCrypto
RequiresSecureDecoder
;
private
long
renderTimeLimitMs
;
private
float
rendererOperatingRate
;
@Nullable
private
MediaCodec
codec
;
...
...
@@ -481,7 +481,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
}
catch
(
MediaCryptoException
e
)
{
throw
ExoPlaybackException
.
createForRenderer
(
e
,
getIndex
());
}
drmSession
RequiresSecureDecoder
=
mediaCrypto
RequiresSecureDecoder
=
!
sessionMediaCrypto
.
forceAllowInsecureDecoderComponents
&&
mediaCrypto
.
requiresSecureDecoderComponent
(
mimeType
);
}
...
...
@@ -498,7 +498,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
}
try
{
maybeInitCodecWithFallback
(
mediaCrypto
,
drmSession
RequiresSecureDecoder
);
maybeInitCodecWithFallback
(
mediaCrypto
,
mediaCrypto
RequiresSecureDecoder
);
}
catch
(
DecoderInitializationException
e
)
{
throw
ExoPlaybackException
.
createForRenderer
(
e
,
getIndex
());
}
...
...
@@ -606,6 +606,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
}
}
finally
{
mediaCrypto
=
null
;
mediaCryptoRequiresSecureDecoder
=
false
;
setCodecDrmSession
(
null
);
}
}
...
...
@@ -727,18 +728,18 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
}
private
void
maybeInitCodecWithFallback
(
MediaCrypto
crypto
,
boolean
drmSession
RequiresSecureDecoder
)
MediaCrypto
crypto
,
boolean
mediaCrypto
RequiresSecureDecoder
)
throws
DecoderInitializationException
{
if
(
availableCodecInfos
==
null
)
{
try
{
availableCodecInfos
=
new
ArrayDeque
<>(
getAvailableCodecInfos
(
drmSession
RequiresSecureDecoder
));
new
ArrayDeque
<>(
getAvailableCodecInfos
(
mediaCrypto
RequiresSecureDecoder
));
preferredDecoderInitializationException
=
null
;
}
catch
(
DecoderQueryException
e
)
{
throw
new
DecoderInitializationException
(
inputFormat
,
e
,
drmSession
RequiresSecureDecoder
,
mediaCrypto
RequiresSecureDecoder
,
DecoderInitializationException
.
DECODER_QUERY_ERROR
);
}
}
...
...
@@ -747,7 +748,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
throw
new
DecoderInitializationException
(
inputFormat
,
/* cause= */
null
,
drmSession
RequiresSecureDecoder
,
mediaCrypto
RequiresSecureDecoder
,
DecoderInitializationException
.
NO_SUITABLE_DECODER_ERROR
);
}
...
...
@@ -766,7 +767,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
availableCodecInfos
.
removeFirst
();
DecoderInitializationException
exception
=
new
DecoderInitializationException
(
inputFormat
,
e
,
drmSession
RequiresSecureDecoder
,
codecInfo
.
name
);
inputFormat
,
e
,
mediaCrypto
RequiresSecureDecoder
,
codecInfo
.
name
);
if
(
preferredDecoderInitializationException
==
null
)
{
preferredDecoderInitializationException
=
exception
;
}
else
{
...
...
@@ -782,11 +783,11 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
availableCodecInfos
=
null
;
}
private
List
<
MediaCodecInfo
>
getAvailableCodecInfos
(
boolean
drmSession
RequiresSecureDecoder
)
private
List
<
MediaCodecInfo
>
getAvailableCodecInfos
(
boolean
mediaCrypto
RequiresSecureDecoder
)
throws
DecoderQueryException
{
List
<
MediaCodecInfo
>
codecInfos
=
getDecoderInfos
(
mediaCodecSelector
,
inputFormat
,
drmSession
RequiresSecureDecoder
);
if
(
codecInfos
.
isEmpty
()
&&
drmSession
RequiresSecureDecoder
)
{
getDecoderInfos
(
mediaCodecSelector
,
inputFormat
,
mediaCrypto
RequiresSecureDecoder
);
if
(
codecInfos
.
isEmpty
()
&&
mediaCrypto
RequiresSecureDecoder
)
{
// The drm session indicates that a secure decoder is required, but the device does not
// have one. Assuming that supportsFormat indicated support for the media being played, we
// know that it does not require a secure output path. Most CDM implementations allow
...
...
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