commit 108564edc974f64f7f6fa8572970003a816259fa
author Wan-Teh Chang <wtc@google.com> Thu Jun 11 12:32:44 2020 -0700
committer Wan-Teh Chang <wtc@google.com> Fri Jun 19 23:16:05 2020 +0000
tree 06d6b5455481d08587ff8e64f9d1203cf58f2de7
parent bb35ba9148543f22ba7d8642e4fbd29ae301f5dc

chroma_check: don't access UV planes if monochrome

In chroma_check(), return immediately if we are generating a monochrome
encoded stream. This avoids accessing the U, V planes when they are
NULL.

BUG=aomedia:2723

Change-Id: I26a39791f820b4d4e1d63ff7141f594c3c7181f5
(cherry picked from commit 098327e0a20fbbcf8e942261f43b30be8475f903)

av1/encoder/var_based_part.c

diff --git a/av1/encoder/var_based_part.c b/av1/encoder/var_based_part.c
index 504833e..e3cb1fa 100644
--- a/av1/encoder/var_based_part.c
+++ b/av1/encoder/var_based_part.c
@@ -581,7 +581,7 @@
   int i;
   MACROBLOCKD *xd = &x->e_mbd;
 
-  if (is_key_frame) return;
+  if (is_key_frame || cpi->oxcf.monochrome) return;
 
   for (i = 1; i <= 2; ++i) {
     unsigned int uv_sad = UINT_MAX;