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
8c848a2a
authored
Nov 18, 2019
by
andrewlewis
Committed by
Oliver Woodman
Nov 19, 2019
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Remove option to disable loop filter for VP9
PiperOrigin-RevId: 281039634
parent
35d9bdea
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
14 deletions
extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java
extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
View file @
8c848a2a
...
...
@@ -68,7 +68,6 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer {
private
static
final
int
DEFAULT_INPUT_BUFFER_SIZE
=
768
*
1024
;
private
final
boolean
enableRowMultiThreadMode
;
private
final
boolean
disableLoopFilter
;
private
final
int
threads
;
private
VpxDecoder
decoder
;
...
...
@@ -102,8 +101,7 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer {
eventListener
,
maxDroppedFramesToNotify
,
/* drmSessionManager= */
null
,
/* playClearSamplesWithoutKeys= */
false
,
/* disableLoopFilter= */
false
);
/* playClearSamplesWithoutKeys= */
false
);
}
/**
...
...
@@ -121,7 +119,6 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer {
* begin in parallel with key acquisition. This parameter specifies whether the renderer is
* permitted to play clear regions of encrypted media files before {@code drmSessionManager}
* has obtained the keys necessary to decrypt encrypted regions of the media.
* @param disableLoopFilter Disable the libvpx in-loop smoothing filter.
*/
public
LibvpxVideoRenderer
(
long
allowedJoiningTimeMs
,
...
...
@@ -129,8 +126,7 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer {
@Nullable
VideoRendererEventListener
eventListener
,
int
maxDroppedFramesToNotify
,
@Nullable
DrmSessionManager
<
ExoMediaCrypto
>
drmSessionManager
,
boolean
playClearSamplesWithoutKeys
,
boolean
disableLoopFilter
)
{
boolean
playClearSamplesWithoutKeys
)
{
this
(
allowedJoiningTimeMs
,
eventHandler
,
...
...
@@ -138,7 +134,6 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer {
maxDroppedFramesToNotify
,
drmSessionManager
,
playClearSamplesWithoutKeys
,
disableLoopFilter
,
/* enableRowMultiThreadMode= */
false
,
getRuntime
().
availableProcessors
(),
/* numInputBuffers= */
4
,
...
...
@@ -160,7 +155,6 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer {
* begin in parallel with key acquisition. This parameter specifies whether the renderer is
* permitted to play clear regions of encrypted media files before {@code drmSessionManager}
* has obtained the keys necessary to decrypt encrypted regions of the media.
* @param disableLoopFilter Disable the libvpx in-loop smoothing filter.
* @param enableRowMultiThreadMode Whether row multi threading decoding is enabled.
* @param threads Number of threads libvpx will use to decode.
* @param numInputBuffers Number of input buffers.
...
...
@@ -173,7 +167,6 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer {
int
maxDroppedFramesToNotify
,
@Nullable
DrmSessionManager
<
ExoMediaCrypto
>
drmSessionManager
,
boolean
playClearSamplesWithoutKeys
,
boolean
disableLoopFilter
,
boolean
enableRowMultiThreadMode
,
int
threads
,
int
numInputBuffers
,
...
...
@@ -185,7 +178,6 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer {
maxDroppedFramesToNotify
,
drmSessionManager
,
playClearSamplesWithoutKeys
);
this
.
disableLoopFilter
=
disableLoopFilter
;
this
.
enableRowMultiThreadMode
=
enableRowMultiThreadMode
;
this
.
threads
=
threads
;
this
.
numInputBuffers
=
numInputBuffers
;
...
...
@@ -225,7 +217,6 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer {
numOutputBuffers
,
initialInputBufferSize
,
mediaCrypto
,
disableLoopFilter
,
enableRowMultiThreadMode
,
threads
);
TraceUtil
.
endSection
();
...
...
extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java
View file @
8c848a2a
...
...
@@ -53,7 +53,6 @@ import java.nio.ByteBuffer;
* @param initialInputBufferSize The initial size of each input buffer.
* @param exoMediaCrypto The {@link ExoMediaCrypto} object required for decoding encrypted
* content. Maybe null and can be ignored if decoder does not handle encrypted content.
* @param disableLoopFilter Disable the libvpx in-loop smoothing filter.
* @param enableRowMultiThreadMode Whether row multi threading decoding is enabled.
* @param threads Number of threads libvpx will use to decode.
* @throws VpxDecoderException Thrown if an exception occurs when initializing the decoder.
...
...
@@ -63,7 +62,6 @@ import java.nio.ByteBuffer;
int
numOutputBuffers
,
int
initialInputBufferSize
,
@Nullable
ExoMediaCrypto
exoMediaCrypto
,
boolean
disableLoopFilter
,
boolean
enableRowMultiThreadMode
,
int
threads
)
throws
VpxDecoderException
{
...
...
@@ -77,7 +75,7 @@ import java.nio.ByteBuffer;
if
(
exoMediaCrypto
!=
null
&&
!
VpxLibrary
.
vpxIsSecureDecodeSupported
())
{
throw
new
VpxDecoderException
(
"Vpx decoder does not support secure decode."
);
}
vpxDecContext
=
vpxInit
(
disableLoopFilter
,
enableRowMultiThreadMode
,
threads
);
vpxDecContext
=
vpxInit
(
/* disableLoopFilter= */
false
,
enableRowMultiThreadMode
,
threads
);
if
(
vpxDecContext
==
0
)
{
throw
new
VpxDecoderException
(
"Failed to initialize decoder"
);
}
...
...
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