aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Gisquet <christophe.gisquet@gmail.com>2014-09-23 21:36:41 +0000
committerMichael Niedermayer <michaelni@gmx.at>2014-09-27 11:50:41 +0200
commitf183febcdafb9f59d24afa752461a4d62e3bcf93 (patch)
tree7ae8a59f40e84379b21a83c02ca05e6402fe2aaa
parentbfdf0f078a7463e1f304ef6fea3b25518cc45c3b (diff)
downloadffmpeg-f183febcdafb9f59d24afa752461a4d62e3bcf93.tar.gz
hevc: remove CodingTree
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/hevc.c4
-rw-r--r--libavcodec/hevc.h6
-rw-r--r--libavcodec/hevc_cabac.c2
3 files changed, 4 insertions, 8 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 15285a850f..467c36a7b5 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -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) {
diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h
index 90e47a14b0..87a59fb8e1 100644
--- a/libavcodec/hevc.h
+++ b/libavcodec/hevc.h
@@ -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;
diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c
index 2b3d8c09a3..e2e5fac0ad 100644
--- a/libavcodec/hevc_cabac.c
+++ b/libavcodec/hevc_cabac.c
@@ -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);