Deduplicate profile check

Change-Id: I5dbccf4d39f0ec5d93300913dd0a37640eb2a444

Deduplicate profile check
Change-Id: I5dbccf4d39f0ec5d93300913dd0a37640eb2a444
b9c652a7 · Sebastien Alaiwan · sebastien alaiwan · 15ad8e4e · b9c652a7
Commit b9c652a7 authored May 03, 2017 by Sebastien Alaiwan Committed by sebastien alaiwan May 03, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 7 deletions

av1/decoder/decodeframe.c av1/decoder/decodeframe.c +5 -7

No files found.
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -4049,15 +4049,13 @@ static size_t read_uncompressed_header(AV1Decoder *pbi,
                       "Invalid frame marker");

  cm->profile = av1_read_profile(rb);
-#if CONFIG_HIGHBITDEPTH
-  if (cm->profile >= MAX_PROFILES)
-    aom_internal_error(&cm->error, AOM_CODEC_UNSUP_BITSTREAM,
-                       "Unsupported bitstream profile");
-#else
-  if (cm->profile >= PROFILE_2)
+
+  const BITSTREAM_PROFILE MAX_SUPPORTED_PROFILE =
+      CONFIG_HIGHBITDEPTH ? MAX_PROFILES : PROFILE_2;
+
+  if (cm->profile >= MAX_SUPPORTED_PROFILE)
    aom_internal_error(&cm->error, AOM_CODEC_UNSUP_BITSTREAM,
                       "Unsupported bitstream profile");
-#endif

  cm->show_existing_frame = aom_rb_read_bit(rb);