diff options
| -rw-r--r-- | src/video_core/command_classes/codecs/vp9.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/video_core/command_classes/codecs/vp9.cpp b/src/video_core/command_classes/codecs/vp9.cpp index a95618913..c01431441 100644 --- a/src/video_core/command_classes/codecs/vp9.cpp +++ b/src/video_core/command_classes/codecs/vp9.cpp | |||
| @@ -153,7 +153,7 @@ constexpr Vp9EntropyProbs default_probs{ | |||
| 153 | .high_precision{128, 128}, | 153 | .high_precision{128, 128}, |
| 154 | }; | 154 | }; |
| 155 | 155 | ||
| 156 | constexpr std::array<s32, 256> norm_lut{ | 156 | constexpr std::array<u8, 256> norm_lut{ |
| 157 | 0, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, | 157 | 0, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, |
| 158 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, | 158 | 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, |
| 159 | 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, | 159 | 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, |
| @@ -164,7 +164,7 @@ constexpr std::array<s32, 256> norm_lut{ | |||
| 164 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | 164 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, |
| 165 | }; | 165 | }; |
| 166 | 166 | ||
| 167 | constexpr std::array<s32, 254> map_lut{ | 167 | constexpr std::array<u8, 254> map_lut{ |
| 168 | 20, 21, 22, 23, 24, 25, 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, | 168 | 20, 21, 22, 23, 24, 25, 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, |
| 169 | 1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 2, 50, 51, 52, 53, 54, | 169 | 1, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 2, 50, 51, 52, 53, 54, |
| 170 | 55, 56, 57, 58, 59, 60, 61, 3, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, | 170 | 55, 56, 57, 58, 59, 60, 61, 3, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, |
| @@ -232,7 +232,7 @@ constexpr std::array<s32, 254> map_lut{ | |||
| 232 | std::max(0, RecenterNonNeg(0xff - 1 - new_prob, 0xff - 1 - old_prob) - 1)); | 232 | std::max(0, RecenterNonNeg(0xff - 1 - new_prob, 0xff - 1 - old_prob) - 1)); |
| 233 | } | 233 | } |
| 234 | 234 | ||
| 235 | return map_lut[index]; | 235 | return static_cast<s32>(map_lut[index]); |
| 236 | } | 236 | } |
| 237 | } // Anonymous namespace | 237 | } // Anonymous namespace |
| 238 | 238 | ||
| @@ -819,7 +819,7 @@ void VpxRangeEncoder::Write(bool bit, s32 probability) { | |||
| 819 | local_range = range - split; | 819 | local_range = range - split; |
| 820 | } | 820 | } |
| 821 | 821 | ||
| 822 | s32 shift = norm_lut[local_range]; | 822 | s32 shift = static_cast<s32>(norm_lut[local_range]); |
| 823 | local_range <<= shift; | 823 | local_range <<= shift; |
| 824 | count += shift; | 824 | count += shift; |
| 825 | 825 | ||