Simplify FRAME_ID constants

Change-Id: I75890c0f64f93f48299895d1e0bcfbf91846a4ab

av1/common/onyxc_int.h

diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h
index 65c2f46..8a470c6 100644
--- a/av1/common/onyxc_int.h
+++ b/av1/common/onyxc_int.h
@@ -59,9 +59,9 @@
 #if CONFIG_REFERENCE_BUFFER
 /* Constant values while waiting for the sequence header */
 #define FRAME_ID_NUMBERS_PRESENT_FLAG 1
-#define FRAME_ID_LENGTH_MINUS7 8         // Allows frame id up to 2^15-1
-#define DELTA_FRAME_ID_LENGTH_MINUS2 12  // Allows frame id deltas up to 2^14-1
-#endif                                   // CONFIG_REFERENCE_BUFFER
+#define FRAME_ID_LENGTH 15
+#define DELTA_FRAME_ID_LENGTH 14
+#endif  // CONFIG_REFERENCE_BUFFER
 
 #if CONFIG_NO_FRAME_CONTEXT_SIGNALING
 #define FRAME_CONTEXTS (FRAME_BUFFERS + 1)

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index ca429b5..8540a74 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -3592,8 +3592,8 @@
       cm->large_scale_tile ? 0 :
 #endif  // CONFIG_EXT_TILE
                            FRAME_ID_NUMBERS_PRESENT_FLAG;
-  seq_params->frame_id_length = FRAME_ID_LENGTH_MINUS7 + 7;
-  seq_params->delta_frame_id_length = DELTA_FRAME_ID_LENGTH_MINUS2 + 2;
+  seq_params->frame_id_length = FRAME_ID_LENGTH;
+  seq_params->delta_frame_id_length = DELTA_FRAME_ID_LENGTH;
 
   aom_wb_write_bit(wb, seq_params->frame_id_numbers_present_flag);
   if (seq_params->frame_id_numbers_present_flag) {
@@ -4714,8 +4714,8 @@
   seq_params->frame_id_numbers_present_flag = FRAME_ID_NUMBERS_PRESENT_FLAG;
   aom_wb_write_literal(&wb, seq_params->frame_id_numbers_present_flag, 1);
   if (seq_params->frame_id_numbers_present_flag) {
-    seq_params->frame_id_length = FRAME_ID_LENGTH_MINUS7 + 7;
-    seq_params->delta_frame_id_length = DELTA_FRAME_ID_LENGTH_MINUS2 + 2;
+    seq_params->frame_id_length = FRAME_ID_LENGTH;
+    seq_params->delta_frame_id_length = DELTA_FRAME_ID_LENGTH;
     // We must always have delta_frame_id_length < frame_id_length,
     // in order for a frame to be referenced with a unique delta.
     // Avoid wasting bits by using a coding that enforces this restriction.

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 7b5c0cc..cfce8d2 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -5398,7 +5398,7 @@
   if (cm->seq_params.frame_id_numbers_present_flag) {
     /* Non-normative definition of current_frame_id ("frame counter" with
     * wraparound) */
-    const int frame_id_length = FRAME_ID_LENGTH_MINUS7 + 7;
+    const int frame_id_length = FRAME_ID_LENGTH;
     if (cm->current_frame_id == -1) {
       int lsb, msb;
 /* quasi-random initialization of current_frame_id for a key frame */