commit f7ad0ee1aa095b9e6dd9d15f2465909d6f74c825
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jan 09 22:55:43 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 09 22:55:43 2018 +0000
tree cd7efe21cb181661f37ef93b40d2b88400ff0c9c
parent 7857e9da335366d220c187e67022a910ebabf874
parent 8c6cbbb95f6f6c65072a0f260ab43255c1253693

Merge "codec: Enable VP9 row multithread encoding."

media/libstagefright/codecs/on2/enc/SoftVP9Encoder.cpp

diff --git a/media/libstagefright/codecs/on2/enc/SoftVP9Encoder.cpp b/media/libstagefright/codecs/on2/enc/SoftVP9Encoder.cpp
index 4c7290d..1ea1c85 100644
--- a/media/libstagefright/codecs/on2/enc/SoftVP9Encoder.cpp
+++ b/media/libstagefright/codecs/on2/enc/SoftVP9Encoder.cpp
@@ -69,6 +69,13 @@
               codecReturn);
         return codecReturn;
     }
+    codecReturn = vpx_codec_control(mCodecContext, VP9E_SET_ROW_MT, 1);
+    if (codecReturn != VPX_CODEC_OK) {
+        ALOGE("Error setting VP9E_SET_ROW_MT to 1. vpx_codec_control() "
+              "returned %d", codecReturn);
+        return codecReturn;
+    }
+
     // For VP9, we always set CPU_USED to 8 (because the realtime default is 0
     // which is too slow).
     codecReturn = vpx_codec_control(mCodecContext, VP8E_SET_CPUUSED, 8);