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

[isp] Fix lfnst constraint check when ISP is used. Remove some obsolete comments.

Browse source
This commit is contained in:
siivonek 2022-09-28 12:38:02 +03:00 committed by Marko Viitanen
parent 3c861e4c02
commit 7005d222d5
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cu.h
View file

@ -172,8 +172,8 @@ typedef struct
uint8_t violates_mts_coeff_constraint : 1; uint8_t violates_mts_coeff_constraint : 1;
uint8_t mts_last_scan_pos : 1; uint8_t mts_last_scan_pos : 1;
uint8_t violates_lfnst_constrained_luma : 1; // Two types, luma and chroma. Luma index is 0. uint8_t violates_lfnst_constrained_luma : 1;
uint8_t violates_lfnst_constrained_chroma : 1; // Two types, luma and chroma. Luma index is 0. uint8_t violates_lfnst_constrained_chroma : 1;
uint8_t lfnst_last_scan_pos : 1; uint8_t lfnst_last_scan_pos : 1;
uint8_t lfnst_idx : 2; uint8_t lfnst_idx : 2;
uint8_t cr_lfnst_idx : 2; uint8_t cr_lfnst_idx : 2;

4
src/encode_coding_tree.c
View file

@ -151,7 +151,9 @@ bool uvg_is_lfnst_allowed(
cu_info_t* split_cu = lcu ? LCU_GET_CU_AT_PX(lcu, local_split_x, local_split_y) : cu_info_t* split_cu = lcu ? LCU_GET_CU_AT_PX(lcu, local_split_x, local_split_y) :
uvg_cu_array_at_const(frame->cu_array, local_split_x, local_split_y); uvg_cu_array_at_const(frame->cu_array, local_split_x, local_split_y);
if (cbf_is_set(split_cu->cbf, depth, COLOR_Y)) { //if (cbf_is_set(split_cu->cbf, depth, COLOR_Y)) {
// ISP_TODO: remove this if clause altogether if it seems it is not needed
if (true) {
non_zero_coeff_non_ts_corner_8x8 |= (luma_flag && split_cu->violates_lfnst_constrained_luma) || (chroma_flag && split_cu->violates_lfnst_constrained_chroma); non_zero_coeff_non_ts_corner_8x8 |= (luma_flag && split_cu->violates_lfnst_constrained_luma) || (chroma_flag && split_cu->violates_lfnst_constrained_chroma);
//last_scan_pos |= split_cu->lfnst_last_scan_pos; //last_scan_pos |= split_cu->lfnst_last_scan_pos;
last_scan_pos |= true; last_scan_pos |= true;