Commit 8c848a2a by andrewlewis Committed by Oliver Woodman

Remove option to disable loop filter for VP9

PiperOrigin-RevId: 281039634
parent 35d9bdea
...@@ -68,7 +68,6 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer { ...@@ -68,7 +68,6 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer {
private static final int DEFAULT_INPUT_BUFFER_SIZE = 768 * 1024; private static final int DEFAULT_INPUT_BUFFER_SIZE = 768 * 1024;
private final boolean enableRowMultiThreadMode; private final boolean enableRowMultiThreadMode;
private final boolean disableLoopFilter;
private final int threads; private final int threads;
private VpxDecoder decoder; private VpxDecoder decoder;
...@@ -102,8 +101,7 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer { ...@@ -102,8 +101,7 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer {
eventListener, eventListener,
maxDroppedFramesToNotify, maxDroppedFramesToNotify,
/* drmSessionManager= */ null, /* drmSessionManager= */ null,
/* playClearSamplesWithoutKeys= */ false, /* playClearSamplesWithoutKeys= */ false);
/* disableLoopFilter= */ false);
} }
/** /**
...@@ -121,7 +119,6 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer { ...@@ -121,7 +119,6 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer {
* begin in parallel with key acquisition. This parameter specifies whether the renderer is * 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} * permitted to play clear regions of encrypted media files before {@code drmSessionManager}
* has obtained the keys necessary to decrypt encrypted regions of the media. * has obtained the keys necessary to decrypt encrypted regions of the media.
* @param disableLoopFilter Disable the libvpx in-loop smoothing filter.
*/ */
public LibvpxVideoRenderer( public LibvpxVideoRenderer(
long allowedJoiningTimeMs, long allowedJoiningTimeMs,
...@@ -129,8 +126,7 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer { ...@@ -129,8 +126,7 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer {
@Nullable VideoRendererEventListener eventListener, @Nullable VideoRendererEventListener eventListener,
int maxDroppedFramesToNotify, int maxDroppedFramesToNotify,
@Nullable DrmSessionManager<ExoMediaCrypto> drmSessionManager, @Nullable DrmSessionManager<ExoMediaCrypto> drmSessionManager,
boolean playClearSamplesWithoutKeys, boolean playClearSamplesWithoutKeys) {
boolean disableLoopFilter) {
this( this(
allowedJoiningTimeMs, allowedJoiningTimeMs,
eventHandler, eventHandler,
...@@ -138,7 +134,6 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer { ...@@ -138,7 +134,6 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer {
maxDroppedFramesToNotify, maxDroppedFramesToNotify,
drmSessionManager, drmSessionManager,
playClearSamplesWithoutKeys, playClearSamplesWithoutKeys,
disableLoopFilter,
/* enableRowMultiThreadMode= */ false, /* enableRowMultiThreadMode= */ false,
getRuntime().availableProcessors(), getRuntime().availableProcessors(),
/* numInputBuffers= */ 4, /* numInputBuffers= */ 4,
...@@ -160,7 +155,6 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer { ...@@ -160,7 +155,6 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer {
* begin in parallel with key acquisition. This parameter specifies whether the renderer is * 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} * permitted to play clear regions of encrypted media files before {@code drmSessionManager}
* has obtained the keys necessary to decrypt encrypted regions of the media. * 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 enableRowMultiThreadMode Whether row multi threading decoding is enabled.
* @param threads Number of threads libvpx will use to decode. * @param threads Number of threads libvpx will use to decode.
* @param numInputBuffers Number of input buffers. * @param numInputBuffers Number of input buffers.
...@@ -173,7 +167,6 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer { ...@@ -173,7 +167,6 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer {
int maxDroppedFramesToNotify, int maxDroppedFramesToNotify,
@Nullable DrmSessionManager<ExoMediaCrypto> drmSessionManager, @Nullable DrmSessionManager<ExoMediaCrypto> drmSessionManager,
boolean playClearSamplesWithoutKeys, boolean playClearSamplesWithoutKeys,
boolean disableLoopFilter,
boolean enableRowMultiThreadMode, boolean enableRowMultiThreadMode,
int threads, int threads,
int numInputBuffers, int numInputBuffers,
...@@ -185,7 +178,6 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer { ...@@ -185,7 +178,6 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer {
maxDroppedFramesToNotify, maxDroppedFramesToNotify,
drmSessionManager, drmSessionManager,
playClearSamplesWithoutKeys); playClearSamplesWithoutKeys);
this.disableLoopFilter = disableLoopFilter;
this.enableRowMultiThreadMode = enableRowMultiThreadMode; this.enableRowMultiThreadMode = enableRowMultiThreadMode;
this.threads = threads; this.threads = threads;
this.numInputBuffers = numInputBuffers; this.numInputBuffers = numInputBuffers;
...@@ -225,7 +217,6 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer { ...@@ -225,7 +217,6 @@ public class LibvpxVideoRenderer extends SimpleDecoderVideoRenderer {
numOutputBuffers, numOutputBuffers,
initialInputBufferSize, initialInputBufferSize,
mediaCrypto, mediaCrypto,
disableLoopFilter,
enableRowMultiThreadMode, enableRowMultiThreadMode,
threads); threads);
TraceUtil.endSection(); TraceUtil.endSection();
......
...@@ -53,7 +53,6 @@ import java.nio.ByteBuffer; ...@@ -53,7 +53,6 @@ import java.nio.ByteBuffer;
* @param initialInputBufferSize The initial size of each input buffer. * @param initialInputBufferSize The initial size of each input buffer.
* @param exoMediaCrypto The {@link ExoMediaCrypto} object required for decoding encrypted * @param exoMediaCrypto The {@link ExoMediaCrypto} object required for decoding encrypted
* content. Maybe null and can be ignored if decoder does not handle encrypted content. * 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 enableRowMultiThreadMode Whether row multi threading decoding is enabled.
* @param threads Number of threads libvpx will use to decode. * @param threads Number of threads libvpx will use to decode.
* @throws VpxDecoderException Thrown if an exception occurs when initializing the decoder. * @throws VpxDecoderException Thrown if an exception occurs when initializing the decoder.
...@@ -63,7 +62,6 @@ import java.nio.ByteBuffer; ...@@ -63,7 +62,6 @@ import java.nio.ByteBuffer;
int numOutputBuffers, int numOutputBuffers,
int initialInputBufferSize, int initialInputBufferSize,
@Nullable ExoMediaCrypto exoMediaCrypto, @Nullable ExoMediaCrypto exoMediaCrypto,
boolean disableLoopFilter,
boolean enableRowMultiThreadMode, boolean enableRowMultiThreadMode,
int threads) int threads)
throws VpxDecoderException { throws VpxDecoderException {
...@@ -77,7 +75,7 @@ import java.nio.ByteBuffer; ...@@ -77,7 +75,7 @@ import java.nio.ByteBuffer;
if (exoMediaCrypto != null && !VpxLibrary.vpxIsSecureDecodeSupported()) { if (exoMediaCrypto != null && !VpxLibrary.vpxIsSecureDecodeSupported()) {
throw new VpxDecoderException("Vpx decoder does not support secure decode."); throw new VpxDecoderException("Vpx decoder does not support secure decode.");
} }
vpxDecContext = vpxInit(disableLoopFilter, enableRowMultiThreadMode, threads); vpxDecContext = vpxInit(/* disableLoopFilter= */ false, enableRowMultiThreadMode, threads);
if (vpxDecContext == 0) { if (vpxDecContext == 0) {
throw new VpxDecoderException("Failed to initialize decoder"); throw new VpxDecoderException("Failed to initialize decoder");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment