sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove unused vpxInit methods

Browse source 
PiperOrigin-RevId: 231578828
This commit is contained in:
andrewlewis 2019-01-30 13:48:30 +00:00 committed by Oliver Woodman
parent dc7bc4785e
commit 55b5814842
3 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java
View file

@ -68,7 +68,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, true); vpxDecContext = vpxInit(disableLoopFilter);
if (vpxDecContext == 0) { if (vpxDecContext == 0) {
throw new VpxDecoderException("Failed to initialize decoder"); throw new VpxDecoderException("Failed to initialize decoder");
} }
@ -165,7 +165,7 @@ import java.nio.ByteBuffer;
} }
} }
private native long vpxInit(boolean disableLoopFilter, boolean enableSurfaceYuvOutputMode); private native long vpxInit(boolean disableLoopFilter);
private native long vpxClose(long context); private native long vpxClose(long context);
private native long vpxDecode(long context, ByteBuffer encoded, int length); private native long vpxDecode(long context, ByteBuffer encoded, int length);

1
extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java
View file

@ -67,7 +67,6 @@ public final class VpxOutputBuffer extends OutputBuffer {
this.timeUs = timeUs; this.timeUs = timeUs;
this.mode = mode; this.mode = mode;
} }
/** /**
* Resizes the buffer based on the given stride. Called via JNI after decoding completes. * Resizes the buffer based on the given stride. Called via JNI after decoding completes.
* *

11
extensions/vp9/src/main/jni/vpx_jni.cc
View file

@ -433,7 +433,7 @@ int vpx_release_frame_buffer(void* priv, vpx_codec_frame_buffer_t* fb) {
return buffer_manager->release(*(int*)fb->priv); return buffer_manager->release(*(int*)fb->priv);
} }
jlong vpxInit(JNIEnv* env, jboolean disableLoopFilter) { DECODER_FUNC(jlong, vpxInit, jboolean disableLoopFilter) {
JniCtx* context = new JniCtx(); JniCtx* context = new JniCtx();
context->decoder = new vpx_codec_ctx_t(); context->decoder = new vpx_codec_ctx_t();
vpx_codec_dec_cfg_t cfg = {0, 0, 0}; vpx_codec_dec_cfg_t cfg = {0, 0, 0};
@ -482,15 +482,6 @@ jlong vpxInit(JNIEnv* env, jboolean disableLoopFilter) {
return reinterpret_cast<intptr_t>(context); return reinterpret_cast<intptr_t>(context);
} }
DECODER_FUNC(jlong, vpxInit, jboolean disableLoopFilter,
jboolean enableBufferManager) {
return vpxInit(env, disableLoopFilter);
}
DECODER_FUNC(jlong, vpxInitilization, jboolean disableLoopFilter) {
return vpxInit(env, disableLoopFilter);
}
DECODER_FUNC(jlong, vpxDecode, jlong jContext, jobject encoded, jint len) { DECODER_FUNC(jlong, vpxDecode, jlong jContext, jobject encoded, jint len) {
JniCtx* const context = reinterpret_cast<JniCtx*>(jContext); JniCtx* const context = reinterpret_cast<JniCtx*>(jContext);
const uint8_t* const buffer = const uint8_t* const buffer =