diff options
author | James Zern <jzern@google.com> | 2023-03-10 15:38:01 -0800 |
---|---|---|
committer | James Zern <jzern@google.com> | 2023-03-10 15:38:01 -0800 |
commit | c68f89fd9adca0d253e1cc39062cf5ae8012e1b9 (patch) | |
tree | df8ac59400fe86a4c5d849a6d131b4c884eccb60 | |
parent | 74e23150b9aed960e59c8d570d153a6e94cf122c (diff) | |
download | libwebm-c68f89fd9adca0d253e1cc39062cf5ae8012e1b9.tar.gz |
Vp9LevelTable: fix initializer order
max_luma_picture_breadth was added after max_luma_picture_size (index 2)
in: 9e37f34 Update VP9 level definition, but the values were added to
the end of the table rather than at index 3.
Change-Id: I491d9003bb8870cfd723dc5d73afc11786df00a9
-rw-r--r-- | common/vp9_level_stats.cc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/common/vp9_level_stats.cc b/common/vp9_level_stats.cc index 76891e6..6f473cf 100644 --- a/common/vp9_level_stats.cc +++ b/common/vp9_level_stats.cc @@ -17,21 +17,21 @@ namespace vp9_parser { const Vp9LevelRow Vp9LevelStats::Vp9LevelTable[kNumVp9Levels] = { - {LEVEL_1, 829440, 36864, 200, 400, 2, 1, 4, 8, 512}, - {LEVEL_1_1, 2764800, 73728, 800, 1000, 2, 1, 4, 8, 768}, - {LEVEL_2, 4608000, 122880, 1800, 1500, 2, 1, 4, 8, 960}, - {LEVEL_2_1, 9216000, 245760, 3600, 2800, 2, 2, 4, 8, 1344}, - {LEVEL_3, 20736000, 552960, 7200, 6000, 2, 4, 4, 8, 2048}, - {LEVEL_3_1, 36864000, 983040, 12000, 10000, 2, 4, 4, 8, 2752}, - {LEVEL_4, 83558400, 2228224, 18000, 16000, 4, 4, 4, 8, 4160}, - {LEVEL_4_1, 160432128, 2228224, 30000, 18000, 4, 4, 5, 6, 4160}, - {LEVEL_5, 311951360, 8912896, 60000, 36000, 6, 8, 6, 4, 8384}, - {LEVEL_5_1, 588251136, 8912896, 120000, 46000, 8, 8, 10, 4, 8384}, + {LEVEL_1, 829440, 36864, 512, 200, 400, 2, 1, 4, 8}, + {LEVEL_1_1, 2764800, 73728, 768, 800, 1000, 2, 1, 4, 8}, + {LEVEL_2, 4608000, 122880, 960, 1800, 1500, 2, 1, 4, 8}, + {LEVEL_2_1, 9216000, 245760, 1344, 3600, 2800, 2, 2, 4, 8}, + {LEVEL_3, 20736000, 552960, 2048, 7200, 6000, 2, 4, 4, 8}, + {LEVEL_3_1, 36864000, 983040, 2752, 12000, 10000, 2, 4, 4, 8}, + {LEVEL_4, 83558400, 2228224, 4160, 18000, 16000, 4, 4, 4, 8}, + {LEVEL_4_1, 160432128, 2228224, 4160, 30000, 18000, 4, 4, 5, 6}, + {LEVEL_5, 311951360, 8912896, 8384, 60000, 36000, 6, 8, 6, 4}, + {LEVEL_5_1, 588251136, 8912896, 8384, 120000, 46000, 8, 8, 10, 4}, // CPB Size = 0 for levels 5_2 to 6_2 - {LEVEL_5_2, 1176502272, 8912896, 180000, 0, 8, 8, 10, 4, 8384}, - {LEVEL_6, 1176502272, 35651584, 180000, 0, 8, 16, 10, 4, 16832}, - {LEVEL_6_1, 2353004544, 35651584, 240000, 0, 8, 16, 10, 4, 16832}, - {LEVEL_6_2, 4706009088, 35651584, 480000, 0, 8, 16, 10, 4, 16832}}; + {LEVEL_5_2, 1176502272, 8912896, 8384, 180000, 0, 8, 8, 10, 4}, + {LEVEL_6, 1176502272, 35651584, 16832, 180000, 0, 8, 16, 10, 4}, + {LEVEL_6_1, 2353004544, 35651584, 16832, 240000, 0, 8, 16, 10, 4}, + {LEVEL_6_2, 4706009088, 35651584, 16832, 480000, 0, 8, 16, 10, 4}}; void Vp9LevelStats::AddFrame(const Vp9HeaderParser& parser, int64_t time_ns) { ++frames; |