Increase FRAME_BUFFERS to 16.
Increase FRAME_BUFFERS to 16, one greater than the old value (15).
This reverts the following change in commit
64e4cba53b6ecd6ca72aa0300246d614c97045ee
(https://aomedia-review.googlesource.com/c/aom/+/69001):
Reduce FRAME_BUFFERS by 3. This is the counterpart of
https://chromium-review.googlesource.com/c/webm/libvpx/+/560620.
That change is wrong for libaom because the cpi->scaled_ref_idx array in
libaom has a bigger size (8 vs. 4).
The last element in the cpi->scaled_ref_idx array is unused. So the
frame buffer pool needs a total of REF_FRAMES + 1 + 7 frame buffers.
Also remove an old TODO(jkoleszar) comment.
BUG=aomedia:2110
BUG=aomedia:2193
Change-Id: Ic376b1959f75a45c4c36bffec86e869604a43d0e
diff --git a/av1/common/enums.h b/av1/common/enums.h
index 8a991e3..30a4463 100644
--- a/av1/common/enums.h
+++ b/av1/common/enums.h
@@ -66,10 +66,8 @@
#define REF_FRAMES_LOG2 3
#define REF_FRAMES (1 << REF_FRAMES_LOG2)
-// 1 scratch frame for the new frame, 3 for scaled references on the encoder.
-// TODO(jkoleszar): These 3 extra references could probably come from the
-// normal reference pool.
-#define FRAME_BUFFERS (REF_FRAMES + 4)
+// 1 scratch frame for the new frame, 7 for scaled references on the encoder.
+#define FRAME_BUFFERS (REF_FRAMES + 1 + 7)
// 4 frame filter levels: y plane vertical, y plane horizontal,
// u plane, and v plane
