diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-28 13:09:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-28 13:09:28 +0200 |
| commit | 0a1ffc57882c467b6573b23f1d206aa87caf0025 (patch) | |
| tree | 9be8c65fbfad9f722294d77fe6f4ad34bdd19081 | |
| parent | 2fb8aa9b10fcb5f342398a9dcea69fe8ed33db39 (diff) | |
| parent | 0daa2554636ba1d31f3162ffb86991e84eb938a8 (diff) | |
| download | ffmpeg-0a1ffc57882c467b6573b23f1d206aa87caf0025.tar.gz | |
Merge commit '0daa2554636ba1d31f3162ffb86991e84eb938a8'
* commit '0daa2554636ba1d31f3162ffb86991e84eb938a8':
hevc: do not store the transform inter_split flag in the context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/hevc.c | 12 | ||||
| -rw-r--r-- | libavcodec/hevc.h | 3 |
2 files changed, 6 insertions, 9 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index bf2d8b5e7f..f8cf7831d4 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -1113,20 +1113,20 @@ static int hls_transform_tree(HEVCContext *s, int x0, int y0, 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 && log2_trafo_size > s->sps->log2_min_tb_size && trafo_depth < lc->cu.max_trafo_depth && !(lc->cu.intra_split_flag && trafo_depth == 0)) { split_transform_flag = ff_hevc_split_transform_flag_decode(s, log2_trafo_size); } 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 || (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) { diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h index cd38c461e6..d2a732d620 100644 --- a/libavcodec/hevc.h +++ b/libavcodec/hevc.h @@ -685,9 +685,6 @@ typedef struct PredictionUnit { typedef struct TransformTree { uint8_t cbf_luma; - - // Inferred parameters - uint8_t inter_split_flag; } TransformTree; typedef struct TransformUnit { |