Commit 9bab28b6 authored by Luc Trudeau's avatar Luc Trudeau
Browse files

[CFL] Reduce arrays used in inspection

Merge cfl_alpha_sign_u and cfl_alpha_sign_v into cfl_alpha_sign,
where:
    cfl_alpha_sign = (cfl_alpha_sign_v << 1) + cfl_alpha_sign_u;

Change-Id: I8c491e37d23f6ef85a33a8b2f8770b7b606d8e0a
parent f436b12e
...@@ -103,12 +103,11 @@ int ifd_inspect(insp_frame_data *fd, void *decoder) { ...@@ -103,12 +103,11 @@ int ifd_inspect(insp_frame_data *fd, void *decoder) {
#if CONFIG_CFL #if CONFIG_CFL
if (mbmi->uv_mode == DC_PRED) { if (mbmi->uv_mode == DC_PRED) {
mi->cfl_alpha_idx = mbmi->cfl_alpha_idx; mi->cfl_alpha_idx = mbmi->cfl_alpha_idx;
mi->cfl_alpha_sign_u = mbmi->cfl_alpha_signs[CFL_PRED_U]; mi->cfl_alpha_sign = (mbmi->cfl_alpha_signs[CFL_PRED_V] << CFL_PRED_V) +
mi->cfl_alpha_sign_v = mbmi->cfl_alpha_signs[CFL_PRED_V]; mbmi->cfl_alpha_signs[CFL_PRED_U];
} else { } else {
mi->cfl_alpha_idx = 0; mi->cfl_alpha_idx = 0;
mi->cfl_alpha_sign_u = 0; mi->cfl_alpha_sign = 0;
mi->cfl_alpha_sign_v = 0;
} }
#endif #endif
} }
......
...@@ -51,8 +51,7 @@ struct insp_mi_data { ...@@ -51,8 +51,7 @@ struct insp_mi_data {
#endif #endif
#if CONFIG_CFL #if CONFIG_CFL
int8_t cfl_alpha_idx; int8_t cfl_alpha_idx;
int8_t cfl_alpha_sign_u; int8_t cfl_alpha_sign;
int8_t cfl_alpha_sign_v;
#endif #endif
}; };
......
...@@ -501,10 +501,8 @@ void inspect(void *pbi, void *data) { ...@@ -501,10 +501,8 @@ void inspect(void *pbi, void *data) {
if (layers & CFL_LAYER) { if (layers & CFL_LAYER) {
buf += put_block_info(buf, NULL, "cfl_alpha_idx", buf += put_block_info(buf, NULL, "cfl_alpha_idx",
offsetof(insp_mi_data, cfl_alpha_idx)); offsetof(insp_mi_data, cfl_alpha_idx));
buf += put_block_info(buf, NULL, "cfl_alpha_sign_u", buf += put_block_info(buf, NULL, "cfl_alpha_sign",
offsetof(insp_mi_data, cfl_alpha_sign_u)); offsetof(insp_mi_data, cfl_alpha_sign));
buf += put_block_info(buf, NULL, "cfl_alpha_sign_v",
offsetof(insp_mi_data, cfl_alpha_sign_v));
} }
#endif #endif
if (layers & MOTION_VECTORS_LAYER) { if (layers & MOTION_VECTORS_LAYER) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment