highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '2c6a7f9348378f887066fb1669c46b9485e8ef3e'

Browse Source 
* commit '2c6a7f9348378f887066fb1669c46b9485e8ef3e':
  hevc: do not store rqt_root_cbf in the context

Conflicts:
	libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-17 11:20:32 +01:00
commit f1b20930f2
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/hevc.c
View File

@ -1962,7 +1962,6 @@ static int hls_coding_unit(HEVCContext *s, int x0, int y0, int log2_cb_size)
lc->cu.x = x0; lc->cu.x = x0;
lc->cu.y = y0; lc->cu.y = y0;
lc->cu.rqt_root_cbf = 1;
lc->cu.pred_mode = MODE_INTRA; lc->cu.pred_mode = MODE_INTRA;
lc->cu.part_mode = PART_2Nx2N; lc->cu.part_mode = PART_2Nx2N;
lc->cu.intra_split_flag = 0; lc->cu.intra_split_flag = 0;
@ -2069,11 +2068,13 @@ static int hls_coding_unit(HEVCContext *s, int x0, int y0, int log2_cb_size)
} }
if (!pcm_flag) { if (!pcm_flag) {
int rqt_root_cbf = 1;
if (lc->cu.pred_mode != MODE_INTRA && if (lc->cu.pred_mode != MODE_INTRA &&
!(lc->cu.part_mode == PART_2Nx2N && lc->pu.merge_flag)) { !(lc->cu.part_mode == PART_2Nx2N && lc->pu.merge_flag)) {
lc->cu.rqt_root_cbf = ff_hevc_no_residual_syntax_flag_decode(s); rqt_root_cbf = ff_hevc_no_residual_syntax_flag_decode(s);
} }
if (lc->cu.rqt_root_cbf) { if (rqt_root_cbf) {
const static int cbf[2] = { 0 }; const static int cbf[2] = { 0 };
lc->cu.max_trafo_depth = lc->cu.pred_mode == MODE_INTRA ? lc->cu.max_trafo_depth = lc->cu.pred_mode == MODE_INTRA ?
s->sps->max_transform_hierarchy_depth_intra + lc->cu.intra_split_flag : s->sps->max_transform_hierarchy_depth_intra + lc->cu.intra_split_flag :

2
libavcodec/hevc.h
View File

@ -638,8 +638,6 @@ typedef struct CodingUnit {
enum PredMode pred_mode; ///< PredMode enum PredMode pred_mode; ///< PredMode
enum PartMode part_mode; ///< PartMode enum PartMode part_mode; ///< PartMode
uint8_t rqt_root_cbf;
// Inferred parameters // Inferred parameters
uint8_t intra_split_flag; ///< IntraSplitFlag uint8_t intra_split_flag; ///< IntraSplitFlag
uint8_t max_trafo_depth; ///< MaxTrafoDepth uint8_t max_trafo_depth; ///< MaxTrafoDepth