commit aae7a167288d8dd37fe41f813e75c78fc0b5e379
author Yunqing Wang <yunqingwang@google.com> Thu Jul 09 16:03:01 2020 -0700
committer Yunqing Wang <yunqingwang@google.com> Fri Jul 10 17:08:08 2020 +0000
tree fb93ef4e760e450c5a3d3170ee416c11a1124f33
parent bcb301fd6a38019766ef800109b85dbc2e73c70b

Fix error message in profile checking

Fixed error message in profile checking, and also added an explanation
about the purpose of having the profile checking.

Change-Id: Idbfa99fe0abf08918eb5dccd3d9404d4692c516d

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 3b2c246..57891b1 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -4314,6 +4314,14 @@
   aom_usec_timer_mark(&timer);
   cpi->time_receive_data += aom_usec_timer_elapsed(&timer);
 #endif
+
+  // Note: Regarding profile setting, the following checks are added to help
+  // choose a proper profile for the input video. The criterion is that all
+  // bitstreams must be designated as the lowest profile that match its content.
+  // E.G. A bitstream that contains 4:4:4 video must be designated as High
+  // Profile in the seq header, and likewise a bitstream that contains 4:2:2
+  // bitstream must be designated as Professional Profile in the sequence
+  // header.
   if ((seq_params->profile == PROFILE_0) && !seq_params->monochrome &&
       (subsampling_x != 1 || subsampling_y != 1)) {
     aom_internal_error(&cm->error, AOM_CODEC_INVALID_PARAM,
@@ -4330,7 +4338,7 @@
       (seq_params->bit_depth <= AOM_BITS_10) &&
       !(subsampling_x == 1 && subsampling_y == 0)) {
     aom_internal_error(&cm->error, AOM_CODEC_INVALID_PARAM,
-                       "Profile 2 bit-depth < 10 requires 4:2:2 color format");
+                       "Profile 2 bit-depth <= 10 requires 4:2:2 color format");
     res = -1;
   }