commit c1fdb4b4b9e03302b5126f2a3b9416b2c972d7a1
author Yaowu Xu <yaowu@google.com> Fri Mar 16 08:44:13 2018 -0700
committer Yaowu Xu <yaowu@google.com> Fri Mar 16 20:19:58 2018 +0000
tree b8a9db6b5620f0fa5a0b4f9032f1b0a0749ddf21
parent 59b4ad939ef6a5e02f6af2d9e51f6c8b64583814

Properly support monochrome in profile 0

Several assertions did not take into account that profile 0 supports
monochrome when input video is 4:4:4 but encodeing in monochrome.

BUG=aomedia:1580

Change-Id: Ifc8a749fe83d1fd87a8878083bc5e940b983d349

aomenc.c

diff --git a/aomenc.c b/aomenc.c
index 2886c07..e1ea7ca 100644
--- a/aomenc.c
+++ b/aomenc.c
@@ -2045,8 +2045,10 @@
           case 0:
             if (input.bit_depth < 12 && (input.fmt == AOM_IMG_FMT_I444 ||
                                          input.fmt == AOM_IMG_FMT_I44416)) {
-              stream->config.cfg.g_profile = 1;
-              profile_updated = 1;
+              if (!stream->config.cfg.monochrome) {
+                stream->config.cfg.g_profile = 1;
+                profile_updated = 1;
+              }
             } else if (input.bit_depth == 12 || input.fmt == AOM_IMG_FMT_I422 ||
                        input.fmt == AOM_IMG_FMT_I42216) {
               stream->config.cfg.g_profile = 2;