summaryrefslogtreecommitdiff
path: root/vp9/common
diff options
context:
space:
mode:
authorWan-Teh Chang <wtc@google.com>2018-10-17 14:43:22 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-10-17 14:43:22 +0000
commit86db847ab8d17d465f2839c2e5223eb8af1885c8 (patch)
tree8d878af1cbeaba95cc3044439582d4b9b4eeed99 /vp9/common
parent0c5fd59efdb234fe0231615c858e1f9c9945cbfa (diff)
parent9addd7499cc06bac2c04f1aa2bd287a1ee1b67f3 (diff)
downloadlibvpx-86db847ab8d17d465f2839c2e5223eb8af1885c8.tar
libvpx-86db847ab8d17d465f2839c2e5223eb8af1885c8.tar.gz
libvpx-86db847ab8d17d465f2839c2e5223eb8af1885c8.tar.bz2
libvpx-86db847ab8d17d465f2839c2e5223eb8af1885c8.zip
Merge "Reduce the cpi->scaled_ref_idx array size by 1."
Diffstat (limited to 'vp9/common')
-rw-r--r--vp9/common/vp9_onyxc_int.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h
index c5c63e476..662b8ef5e 100644
--- a/vp9/common/vp9_onyxc_int.h
+++ b/vp9/common/vp9_onyxc_int.h
@@ -37,10 +37,9 @@ extern "C" {
#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, REFS_PER_FRAME for scaled references on
+// the encoder.
+#define FRAME_BUFFERS (REF_FRAMES + 1 + REFS_PER_FRAME)
#define FRAME_CONTEXTS_LOG2 2
#define FRAME_CONTEXTS (1 << FRAME_CONTEXTS_LOG2)