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 Projects Releases Wiki Activity

[isp] Add height to get_tr_type function.

Browse source
This commit is contained in:
siivonek 2022-08-11 14:41:21 +03:00 committed by Marko Viitanen
parent 8b7d573ae7
commit 09b905c6c4
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/strategies/avx2/dct-avx2.c
View file

@ -1579,6 +1579,7 @@ static tr_func* idct_table[5] = {
extern void uvg_get_tr_type( extern void uvg_get_tr_type(
int8_t width, int8_t width,
int8_t height,
color_t color, color_t color,
const cu_info_t* tu, const cu_info_t* tu,
tr_type_t* hor_out, tr_type_t* hor_out,
@ -1599,7 +1600,7 @@ static void mts_dct_avx2(
tr_type_t type_ver; tr_type_t type_ver;
// ISP_TODO: height passed but not used // ISP_TODO: height passed but not used
uvg_get_tr_type(width, color, tu, &type_hor, &type_ver, mts_idx); uvg_get_tr_type(width, height, color, tu, &type_hor, &type_ver, mts_idx);
if (type_hor == DCT2 && type_ver == DCT2 && !tu->lfnst_idx && width == height) if (type_hor == DCT2 && type_ver == DCT2 && !tu->lfnst_idx && width == height)
{ {
@ -1630,7 +1631,7 @@ static void mts_idct_avx2(
tr_type_t type_hor; tr_type_t type_hor;
tr_type_t type_ver; tr_type_t type_ver;
uvg_get_tr_type(width, color, tu, &type_hor, &type_ver, mts_idx); uvg_get_tr_type(width, height, color, tu, &type_hor, &type_ver, mts_idx);
if (type_hor == DCT2 && type_ver == DCT2 && width == height) if (type_hor == DCT2 && type_ver == DCT2 && width == height)
{ {

8
src/strategies/generic/dct-generic.c
View file

@ -2442,6 +2442,7 @@ static const tr_type_t mts_subset_intra[4][2] = { { DST7, DST7 }, { DCT8, DST7 }
void uvg_get_tr_type( void uvg_get_tr_type(
int8_t width, int8_t width,
int8_t height,
color_t color, color_t color,
const cu_info_t* tu, const cu_info_t* tu,
tr_type_t* hor_out, tr_type_t* hor_out,
@ -2456,7 +2457,6 @@ void uvg_get_tr_type(
return; return;
} }
const int height = width;
const bool explicit_mts = mts_idx == UVG_MTS_BOTH || (tu->type == CU_INTRA ? mts_idx == UVG_MTS_INTRA : (mts_idx == UVG_MTS_INTER && tu->type == CU_INTER)); const bool explicit_mts = mts_idx == UVG_MTS_BOTH || (tu->type == CU_INTRA ? mts_idx == UVG_MTS_INTRA : (mts_idx == UVG_MTS_INTER && tu->type == CU_INTER));
const bool implicit_mts = tu->type == CU_INTRA && (mts_idx == UVG_MTS_IMPLICIT || mts_idx == UVG_MTS_INTER); const bool implicit_mts = tu->type == CU_INTRA && (mts_idx == UVG_MTS_IMPLICIT || mts_idx == UVG_MTS_INTER);
@ -2501,8 +2501,7 @@ static void mts_dct_generic(
tr_type_t type_hor; tr_type_t type_hor;
tr_type_t type_ver; tr_type_t type_ver;
// ISP_TODO: height uvg_get_tr_type(width, height, color, tu, &type_hor, &type_ver, mts_idx);
uvg_get_tr_type(width, color, tu, &type_hor, &type_ver, mts_idx);
if (type_hor == DCT2 && type_ver == DCT2 && !tu->lfnst_idx && !tu->cr_lfnst_idx && width == height) if (type_hor == DCT2 && type_ver == DCT2 && !tu->lfnst_idx && !tu->cr_lfnst_idx && width == height)
{ {
@ -2555,8 +2554,7 @@ static void mts_idct_generic(
tr_type_t type_hor; tr_type_t type_hor;
tr_type_t type_ver; tr_type_t type_ver;
// ISP_TODO: height uvg_get_tr_type(width, height, color, tu, &type_hor, &type_ver, mts_idx);
uvg_get_tr_type(width, color, tu, &type_hor, &type_ver, mts_idx);
if (type_hor == DCT2 && type_ver == DCT2 && !tu->lfnst_idx && !tu->cr_lfnst_idx && width == height) if (type_hor == DCT2 && type_ver == DCT2 && !tu->lfnst_idx && !tu->cr_lfnst_idx && width == height)
{ {