hevc: remove CodingTree
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
bfdf0f078a
commit
f183febcda
libavcodec
@ -2103,7 +2103,7 @@ static int hls_coding_unit(HEVCContext *s, int x0, int y0, int log2_cb_size)
|
||||
lc->qPy_pred = lc->qp_y;
|
||||
}
|
||||
|
||||
set_ct_depth(s, x0, y0, log2_cb_size, lc->ct.depth);
|
||||
set_ct_depth(s, x0, y0, log2_cb_size, lc->ct_depth);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -2117,7 +2117,7 @@ static int hls_coding_quadtree(HEVCContext *s, int x0, int y0,
|
||||
int qp_block_mask = (1<<(s->sps->log2_ctb_size - s->pps->diff_cu_qp_delta_depth)) - 1;
|
||||
int split_cu;
|
||||
|
||||
lc->ct.depth = cb_depth;
|
||||
lc->ct_depth = cb_depth;
|
||||
if (x0 + cb_size <= s->sps->width &&
|
||||
y0 + cb_size <= s->sps->height &&
|
||||
log2_cb_size > s->sps->log2_min_cb_size) {
|
||||
|
@ -631,10 +631,6 @@ typedef struct SliceHeader {
|
||||
int slice_ctb_addr_rs;
|
||||
} SliceHeader;
|
||||
|
||||
typedef struct CodingTree {
|
||||
int depth; ///< ctDepth
|
||||
} CodingTree;
|
||||
|
||||
typedef struct CodingUnit {
|
||||
int x;
|
||||
int y;
|
||||
@ -773,7 +769,7 @@ typedef struct HEVCLocalContext {
|
||||
DECLARE_ALIGNED(32, uint8_t, edge_emu_buffer2)[(MAX_PB_SIZE + 7) * EDGE_EMU_BUFFER_STRIDE * 2];
|
||||
DECLARE_ALIGNED(16, int16_t, tmp [MAX_PB_SIZE * MAX_PB_SIZE]);
|
||||
|
||||
CodingTree ct;
|
||||
int ct_depth;
|
||||
CodingUnit cu;
|
||||
PredictionUnit pu;
|
||||
NeighbourAvailable na;
|
||||
|
@ -835,7 +835,7 @@ int ff_hevc_inter_pred_idc_decode(HEVCContext *s, int nPbW, int nPbH)
|
||||
{
|
||||
if (nPbW + nPbH == 12)
|
||||
return GET_CABAC(elem_offset[INTER_PRED_IDC] + 4);
|
||||
if (GET_CABAC(elem_offset[INTER_PRED_IDC] + s->HEVClc->ct.depth))
|
||||
if (GET_CABAC(elem_offset[INTER_PRED_IDC] + s->HEVClc->ct_depth))
|
||||
return PRED_BI;
|
||||
|
||||
return GET_CABAC(elem_offset[INTER_PRED_IDC] + 4);
|
||||
|
Loading…
Reference in New Issue
Block a user