har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '0daa2554636ba1d31f3162ffb86991e84eb938a8'

Browse Source 
* commit '0daa2554636ba1d31f3162ffb86991e84eb938a8':
  hevc: do not store the transform inter_split flag in the context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-28 13:09:00 +02:00
commit 0a1ffc5788
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/hevc.c
View File

@ -1113,20 +1113,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 || s->sps->chroma_format_idc == 3) { if (log2_trafo_size > 2 || s->sps->chroma_format_idc == 3) {

3
libavcodec/hevc.h
View File

@ -685,9 +685,6 @@ typedef struct PredictionUnit {
typedef struct TransformTree { typedef struct TransformTree {
uint8_t cbf_luma; uint8_t cbf_luma;
// Inferred parameters
uint8_t inter_split_flag;
} TransformTree; } TransformTree;
typedef struct TransformUnit { typedef struct TransformUnit {