Commit 0daa2554 authored by Anton Khirnov's avatar Anton Khirnov

hevc: do not store the transform inter_split flag in the context

It does not need to be preserved.
parent 53a11135
...@@ -1361,20 +1361,20 @@ static int hls_transform_tree(HEVCContext *s, int x0, int y0, ...@@ -1361,20 +1361,20 @@ static int hls_transform_tree(HEVCContext *s, int x0, int y0,
lc->tt.cbf_luma = 1; lc->tt.cbf_luma = 1;
lc->tt.inter_split_flag = s->sps->max_transform_hierarchy_depth_inter == 0 &&
lc->cu.pred_mode == MODE_INTER &&
lc->cu.part_mode != PART_2Nx2N &&
trafo_depth == 0;
if (log2_trafo_size <= s->sps->log2_max_trafo_size && if (log2_trafo_size <= s->sps->log2_max_trafo_size &&
log2_trafo_size > s->sps->log2_min_tb_size && log2_trafo_size > s->sps->log2_min_tb_size &&
trafo_depth < lc->cu.max_trafo_depth && trafo_depth < lc->cu.max_trafo_depth &&
!(lc->cu.intra_split_flag && trafo_depth == 0)) { !(lc->cu.intra_split_flag && trafo_depth == 0)) {
split_transform_flag = ff_hevc_split_transform_flag_decode(s, log2_trafo_size); split_transform_flag = ff_hevc_split_transform_flag_decode(s, log2_trafo_size);
} else { } else {
int inter_split = s->sps->max_transform_hierarchy_depth_inter == 0 &&
lc->cu.pred_mode == MODE_INTER &&
lc->cu.part_mode != PART_2Nx2N &&
trafo_depth == 0;
split_transform_flag = log2_trafo_size > s->sps->log2_max_trafo_size || split_transform_flag = log2_trafo_size > s->sps->log2_max_trafo_size ||
(lc->cu.intra_split_flag && trafo_depth == 0) || (lc->cu.intra_split_flag && trafo_depth == 0) ||
lc->tt.inter_split_flag; inter_split;
} }
if (log2_trafo_size > 2) { if (log2_trafo_size > 2) {
......
...@@ -650,9 +650,6 @@ typedef struct TransformTree { ...@@ -650,9 +650,6 @@ typedef struct TransformTree {
uint8_t cbf_cb[MAX_TRANSFORM_DEPTH][MAX_CU_SIZE * MAX_CU_SIZE]; uint8_t cbf_cb[MAX_TRANSFORM_DEPTH][MAX_CU_SIZE * MAX_CU_SIZE];
uint8_t cbf_cr[MAX_TRANSFORM_DEPTH][MAX_CU_SIZE * MAX_CU_SIZE]; uint8_t cbf_cr[MAX_TRANSFORM_DEPTH][MAX_CU_SIZE * MAX_CU_SIZE];
uint8_t cbf_luma; uint8_t cbf_luma;
// Inferred parameters
uint8_t inter_split_flag;
} TransformTree; } TransformTree;
typedef struct TransformUnit { typedef struct TransformUnit {
......
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