From 3169b140fc5cceba848fa1bd6a103645e873c115 Mon Sep 17 00:00:00 2001 From: vigneshv Date: Fri, 5 Apr 2019 20:21:33 +0100 Subject: [PATCH] vp9_extension: Use the vp9_codec_control macro This is part of the public API and the underscored versions weren't intended to be used outside the library. Also updating the external instructions to checkout the version of libvpx that supports this macro for this particular constant. #codehealth PiperOrigin-RevId: 242170926 --- extensions/vp9/README.md | 2 +- extensions/vp9/src/main/jni/vpx_jni.cc | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/extensions/vp9/README.md b/extensions/vp9/README.md index 110fad90cc..e1d1eef3ab 100644 --- a/extensions/vp9/README.md +++ b/extensions/vp9/README.md @@ -47,7 +47,7 @@ git clone https://chromium.googlesource.com/webm/libvpx libvpx ``` cd "${VP9_EXT_PATH}/jni/libvpx" && \ -git checkout tags/v1.7.0 -b v1.7.0 +git checkout tags/v1.8.0 -b v1.8.0 ``` * Run a script that generates necessary configuration files for libvpx: diff --git a/extensions/vp9/src/main/jni/vpx_jni.cc b/extensions/vp9/src/main/jni/vpx_jni.cc index 8036e78cbe..82c023afbc 100644 --- a/extensions/vp9/src/main/jni/vpx_jni.cc +++ b/extensions/vp9/src/main/jni/vpx_jni.cc @@ -448,15 +448,14 @@ DECODER_FUNC(jlong, vpxInit, jboolean disableLoopFilter, return 0; } #ifdef VPX_CTRL_VP9_DECODE_SET_ROW_MT - err = vpx_codec_control_(context->decoder, VP9D_SET_ROW_MT, - enableRowMultiThreadMode); + err = vpx_codec_control(context->decoder, VP9D_SET_ROW_MT, + enableRowMultiThreadMode); if (err) { LOGE("ERROR: Failed to enable row multi thread mode, error = %d.", err); } #endif if (disableLoopFilter) { - // TODO(b/71930387): Use vpx_codec_control(), not vpx_codec_control_(). - err = vpx_codec_control_(context->decoder, VP9_SET_SKIP_LOOP_FILTER, true); + err = vpx_codec_control(context->decoder, VP9_SET_SKIP_LOOP_FILTER, true); if (err) { LOGE("ERROR: Failed to shut off libvpx loop filter, error = %d.", err); }