|
|
@ -2102,7 +2102,6 @@ static int hls_coding_quadtree(HEVCContext *s, int x0, int y0, |
|
|
|
HEVCLocalContext *lc = s->HEVClc; |
|
|
|
HEVCLocalContext *lc = s->HEVClc; |
|
|
|
const int cb_size = 1 << log2_cb_size; |
|
|
|
const int cb_size = 1 << log2_cb_size; |
|
|
|
int ret; |
|
|
|
int ret; |
|
|
|
int qp_block_mask = (1<<(s->sps->log2_ctb_size - s->pps->diff_cu_qp_delta_depth)) - 1; |
|
|
|
|
|
|
|
int split_cu; |
|
|
|
int split_cu; |
|
|
|
|
|
|
|
|
|
|
|
lc->ct_depth = cb_depth; |
|
|
|
lc->ct_depth = cb_depth; |
|
|
@ -2125,6 +2124,7 @@ static int hls_coding_quadtree(HEVCContext *s, int x0, int y0, |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (split_cu) { |
|
|
|
if (split_cu) { |
|
|
|
|
|
|
|
int qp_block_mask = (1<<(s->sps->log2_ctb_size - s->pps->diff_cu_qp_delta_depth)) - 1; |
|
|
|
const int cb_size_split = cb_size >> 1; |
|
|
|
const int cb_size_split = cb_size >> 1; |
|
|
|
const int x1 = x0 + cb_size_split; |
|
|
|
const int x1 = x0 + cb_size_split; |
|
|
|
const int y1 = y0 + cb_size_split; |
|
|
|
const int y1 = y0 + cb_size_split; |
|
|
|