shithub: libvpx

Info  •  Files  •  Log  •  Branches

vp9 level: add tentative max cpb values for high levels

Add tentative max cpb size values for levels 5.2 and up. Otherwise
encoding will fail when targeting for these levels.

Change-Id: Ib7e0ba4b9836ea1ac900b6822543812843d48463

--- a/vp9/encoder/vp9_encoder.c

+++ b/vp9/encoder/vp9_encoder.c

@@ -110,22 +110,22 @@

 /* clang-format off */

 const Vp9LevelSpec vp9_level_defs[VP9_LEVELS] = {

-  { LEVEL_1,   829440,      36864,    200,    400,   2, 1,  4,  8 },

-  { LEVEL_1_1, 2764800,     73728,    800,    1000,  2, 1,  4,  8 },

-  { LEVEL_2,   4608000,     122880,   1800,   1500,  2, 1,  4,  8 },

-  { LEVEL_2_1, 9216000,     245760,   3600,   2800,  2, 2,  4,  8 },

-  { LEVEL_3,   20736000,    552960,   7200,   6000,  2, 4,  4,  8 },

-  { LEVEL_3_1, 36864000,    983040,   12000,  10000, 2, 4,  4,  8 },

-  { LEVEL_4,   83558400,    2228224,  18000,  16000, 4, 4,  4,  8 },

-  { LEVEL_4_1, 160432128,   2228224,  30000,  18000, 4, 4,  5,  6 },

-  { LEVEL_5,   311951360,   8912896,  60000,  36000, 6, 8,  6,  4 },

-  { LEVEL_5_1, 588251136,   8912896,  120000, 46000, 8, 8,  10, 4 },

+  { LEVEL_1,   829440,      36864,    200,    400,    2, 1,  4,  8 },

+  { LEVEL_1_1, 2764800,     73728,    800,    1000,   2, 1,  4,  8 },

+  { LEVEL_2,   4608000,     122880,   1800,   1500,   2, 1,  4,  8 },

+  { LEVEL_2_1, 9216000,     245760,   3600,   2800,   2, 2,  4,  8 },

+  { LEVEL_3,   20736000,    552960,   7200,   6000,   2, 4,  4,  8 },

+  { LEVEL_3_1, 36864000,    983040,   12000,  10000,  2, 4,  4,  8 },

+  { LEVEL_4,   83558400,    2228224,  18000,  16000,  4, 4,  4,  8 },

+  { LEVEL_4_1, 160432128,   2228224,  30000,  18000,  4, 4,  5,  6 },

+  { LEVEL_5,   311951360,   8912896,  60000,  36000,  6, 8,  6,  4 },

+  { LEVEL_5_1, 588251136,   8912896,  120000, 46000,  8, 8,  10, 4 },

   // TODO(huisu): update max_cpb_size for level 5_2 ~ 6_2 when

-  // they are finalized (currently TBD).

-  { LEVEL_5_2, 1176502272,  8912896,  180000, 0,     8, 8,  10, 4 },

-  { LEVEL_6,   1176502272,  35651584, 180000, 0,     8, 16, 10, 4 },

-  { LEVEL_6_1, 2353004544u, 35651584, 240000, 0,     8, 16, 10, 4 },

-  { LEVEL_6_2, 4706009088u, 35651584, 480000, 0,     8, 16, 10, 4 },

+  // they are finalized (currently tentative).

+  { LEVEL_5_2, 1176502272,  8912896,  180000, 90000,  8, 8,  10, 4 },

+  { LEVEL_6,   1176502272,  35651584, 180000, 90000,  8, 16, 10, 4 },

+  { LEVEL_6_1, 2353004544u, 35651584, 240000, 180000, 8, 16, 10, 4 },

+  { LEVEL_6_2, 4706009088u, 35651584, 480000, 360000, 8, 16, 10, 4 },

 };

 /* clang-format on */