commit 9dd777964b824eb888621e47569751b3854809d5
author Debargha Mukherjee <debargha@google.com> Fri Mar 30 16:31:36 2018 -0700
committer Debargha Mukherjee <debargha@google.com> Sat Mar 31 06:12:27 2018 +0000
tree f60d3f6c854b07e597e7d421196afab425388e94
parent 6eacb99c233c0ac766deae8041282ec6c629c46d

[NORMATIVE] Explicit bit-depth profile check

BUG=aomedia:1683

Change-Id: I22b36b45575e0beafc5313315f222eb7207e2e3c

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 3b0b2ef..bf0e321 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -2022,11 +2022,15 @@
 }
 
 void av1_read_bitdepth(AV1_COMMON *cm, struct aom_read_bit_buffer *rb) {
-  cm->bit_depth = aom_rb_read_bit(rb) ? AOM_BITS_10 : AOM_BITS_8;
-  if (cm->profile < PROFILE_2 || cm->bit_depth == AOM_BITS_8) {
-    return;
+  const int high_bitdepth = aom_rb_read_bit(rb);
+  if (cm->profile == PROFILE_2 && high_bitdepth) {
+    const int twelve_bit = aom_rb_read_bit(rb);
+    cm->bit_depth = twelve_bit ? AOM_BITS_12 : AOM_BITS_10;
+  } else if (cm->profile <= PROFILE_2) {
+    cm->bit_depth = high_bitdepth ? AOM_BITS_10 : AOM_BITS_8;
+  } else {
+    assert(0 && "unsupported profile/bit-depth combination");
   }
-  cm->bit_depth = aom_rb_read_bit(rb) ? AOM_BITS_12 : AOM_BITS_10;
   return;
 }