virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

hevc: remove CodingTree

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Christophe Gisquet 2014-09-23 21:36:41 +00:00 committed by Michael Niedermayer
parent bfdf0f078a
commit f183febcda
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/hevc.c
View File

@ -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; 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; 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 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;
if (x0 + cb_size <= s->sps->width && if (x0 + cb_size <= s->sps->width &&
y0 + cb_size <= s->sps->height && y0 + cb_size <= s->sps->height &&
log2_cb_size > s->sps->log2_min_cb_size) { log2_cb_size > s->sps->log2_min_cb_size) {

6
libavcodec/hevc.h
View File

@ -631,10 +631,6 @@ typedef struct SliceHeader {
int slice_ctb_addr_rs; int slice_ctb_addr_rs;
} SliceHeader; } SliceHeader;
typedef struct CodingTree {
int depth; ///< ctDepth
} CodingTree;
typedef struct CodingUnit { typedef struct CodingUnit {
int x; int x;
int y; 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(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]); DECLARE_ALIGNED(16, int16_t, tmp [MAX_PB_SIZE * MAX_PB_SIZE]);
CodingTree ct; int ct_depth;
CodingUnit cu; CodingUnit cu;
PredictionUnit pu; PredictionUnit pu;
NeighbourAvailable na; NeighbourAvailable na;

2
libavcodec/hevc_cabac.c
View File

@ -835,7 +835,7 @@ int ff_hevc_inter_pred_idc_decode(HEVCContext *s, int nPbW, int nPbH)
{ {
if (nPbW + nPbH == 12) if (nPbW + nPbH == 12)
return GET_CABAC(elem_offset[INTER_PRED_IDC] + 4); 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 PRED_BI;
return GET_CABAC(elem_offset[INTER_PRED_IDC] + 4); return GET_CABAC(elem_offset[INTER_PRED_IDC] + 4);