hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-30 12:44:07 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

[mip] Fix CI errors.

Browse source
This commit is contained in:
siivonek 2022-01-21 13:32:41 +02:00
parent d5e2bbd824
commit 0cf89e9516
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/encode_coding_tree.c
View file

@ -882,7 +882,7 @@ static void encode_intra_coding_unit(encoder_state_t * const state,
CABAC_BIN(cabac, mip_flag, "mip_flag");
if (mip_flag) {
// Write MIP transpose flag & mode
CABAC_BIN_EP(cabac, (cur_cu->intra.mip_is_transposed), "mip_transposed");
CABAC_BIN_EP(cabac, mip_transpose, "mip_transposed");
kvz_cabac_encode_trunc_bin(cabac, mip_mode, num_mip_modes);
}
}

12
src/intra.c
View file

@ -772,8 +772,8 @@ void kvz_mip_predict(encoder_state_t const* const state, kvz_intra_references* c
uint16_t ups_ver_factor = height / red_pred_size;
// Upsampling factors must be powers of two
assert(!(ups_hor_factor < 1) || ((ups_hor_factor & (ups_hor_factor - 1)) != 0) && "Horizontal upsampling factor must be power of two.");
assert(!(ups_ver_factor < 1) || ((ups_ver_factor & (ups_ver_factor - 1)) != 0) && "Vertical upsampling factor must be power of two.");
assert(!((ups_hor_factor < 1) || ((ups_hor_factor & (ups_hor_factor - 1))) != 0) && "Horizontal upsampling factor must be power of two.");
assert(!((ups_ver_factor < 1) || ((ups_ver_factor & (ups_ver_factor - 1))) != 0) && "Vertical upsampling factor must be power of two.");
// Initialize prediction parameters END
@ -823,16 +823,16 @@ void kvz_mip_predict(encoder_state_t const* const state, kvz_intra_references* c
const bool need_upsampling = (ups_hor_factor > 1) || (ups_ver_factor > 1);
const bool transpose = mip_transp;
uint8_t* matrix;
const uint8_t* matrix;
switch (size_id) {
case 0:
matrix = &mip_matrix_4x4[mode_idx][0][0];
matrix = &kvz_mip_matrix_4x4[mode_idx][0][0];
break;
case 1:
matrix = &mip_matrix_8x8[mode_idx][0][0];
matrix = &kvz_mip_matrix_8x8[mode_idx][0][0];
break;
case 2:
matrix = &mip_matrix_16x16[mode_idx][0][0];
matrix = &kvz_mip_matrix_16x16[mode_idx][0][0];
break;
default:
assert(false && "Invalid MIP size id.");

6
src/mip_data.h
View file

@ -44,7 +44,7 @@
#define MIP_OFFSET_MATRIX 32
// NOTE: these matrices need to be aligned if used with avx2
const uint8_t mip_matrix_4x4[16][16][4] =
const uint8_t kvz_mip_matrix_4x4[16][16][4] =
{
{
{ 32, 30, 90, 28},
@ -336,7 +336,7 @@ const uint8_t mip_matrix_4x4[16][16][4] =
}
};
const uint8_t mip_matrix_8x8[8][16][8] =
const uint8_t kvz_mip_matrix_8x8[8][16][8] =
{
{
{ 30, 63, 46, 37, 25, 33, 33, 34},
@ -484,7 +484,7 @@ const uint8_t mip_matrix_8x8[8][16][8] =
}
};
const uint8_t mip_matrix_16x16[6][64][7] =
const uint8_t kvz_mip_matrix_16x16[6][64][7] =
{
{
{ 42, 37, 33, 27, 44, 33, 35},