MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hevc: rename ptl structs and variables

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Guillaume Martres 2013-12-13 20:05:26 +01:00 committed by Michael Niedermayer
parent c90cdf4b64
commit ecb21d2437
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/hevc.c
View File

@ -389,8 +389,8 @@ static int hls_slice_header(HEVCContext *s)
s->max_ra = INT_MAX;
}
s->avctx->profile = s->sps->ptl.general_PTL.profile_idc;
s->avctx->level = s->sps->ptl.general_PTL.level_idc;
s->avctx->profile = s->sps->ptl.general_ptl.profile_idc;
s->avctx->level = s->sps->ptl.general_ptl.level_idc;
sh->dependent_slice_segment_flag = 0;
if (!sh->first_slice_in_pic_flag) {

8
libavcodec/hevc.h
View File

@ -330,7 +330,7 @@ typedef struct VUI {
int log2_max_mv_length_vertical;
} VUI;
typedef struct ProfileTierLevel {
typedef struct PTLCommon {
uint8_t profile_space;
uint8_t tier_flag;
uint8_t profile_idc;
@ -340,11 +340,11 @@ typedef struct ProfileTierLevel {
uint8_t interlaced_source_flag;
uint8_t non_packed_constraint_flag;
uint8_t frame_only_constraint_flag;
} ProfileTierLevel;
} PTLCommon;
typedef struct PTL {
ProfileTierLevel general_PTL;
ProfileTierLevel sub_layer_PTL[MAX_SUB_LAYERS];
PTLCommon general_ptl;
PTLCommon sub_layer_ptl[MAX_SUB_LAYERS];
uint8_t sub_layer_profile_present_flag[MAX_SUB_LAYERS];
uint8_t sub_layer_level_present_flag[MAX_SUB_LAYERS];

10
libavcodec/hevc_ps.c
View File

@ -192,7 +192,7 @@ int ff_hevc_decode_short_term_rps(HEVCContext *s, ShortTermRPS *rps,
}
static void decode_profile_tier_level(HEVCContext *s, ProfileTierLevel *ptl)
static void decode_profile_tier_level(HEVCContext *s, PTLCommon *ptl)
{
int i;
HEVCLocalContext *lc = s->HEVClc;
@ -225,8 +225,8 @@ static void parse_ptl(HEVCContext *s, PTL *ptl, int max_num_sub_layers)
int i;
HEVCLocalContext *lc = s->HEVClc;
GetBitContext *gb = &lc->gb;
decode_profile_tier_level(s, &ptl->general_PTL);
ptl->general_PTL.level_idc = get_bits(gb, 8);
decode_profile_tier_level(s, &ptl->general_ptl);
ptl->general_ptl.level_idc = get_bits(gb, 8);
for (i = 0; i < max_num_sub_layers - 1; i++) {
ptl->sub_layer_profile_present_flag[i] = get_bits1(gb);
@ -237,9 +237,9 @@ static void parse_ptl(HEVCContext *s, PTL *ptl, int max_num_sub_layers)
skip_bits(gb, 2); // reserved_zero_2bits[i]
for (i = 0; i < max_num_sub_layers - 1; i++) {
if (ptl->sub_layer_profile_present_flag[i])
decode_profile_tier_level(s, &ptl->sub_layer_PTL[i]);
decode_profile_tier_level(s, &ptl->sub_layer_ptl[i]);
if (ptl->sub_layer_level_present_flag[i])
ptl->sub_layer_PTL[i].level_idc = get_bits(gb, 8);
ptl->sub_layer_ptl[i].level_idc = get_bits(gb, 8);
}
}