Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Guillaume Martres authored on 2013/12/14 04:05:26... | ... |
@@ -389,8 +389,8 @@ static int hls_slice_header(HEVCContext *s) |
389 | 389 |
s->max_ra = INT_MAX; |
390 | 390 |
} |
391 | 391 |
|
392 |
- s->avctx->profile = s->sps->ptl.general_PTL.profile_idc; |
|
393 |
- s->avctx->level = s->sps->ptl.general_PTL.level_idc; |
|
392 |
+ s->avctx->profile = s->sps->ptl.general_ptl.profile_idc; |
|
393 |
+ s->avctx->level = s->sps->ptl.general_ptl.level_idc; |
|
394 | 394 |
|
395 | 395 |
sh->dependent_slice_segment_flag = 0; |
396 | 396 |
if (!sh->first_slice_in_pic_flag) { |
... | ... |
@@ -330,7 +330,7 @@ typedef struct VUI { |
330 | 330 |
int log2_max_mv_length_vertical; |
331 | 331 |
} VUI; |
332 | 332 |
|
333 |
-typedef struct ProfileTierLevel { |
|
333 |
+typedef struct PTLCommon { |
|
334 | 334 |
uint8_t profile_space; |
335 | 335 |
uint8_t tier_flag; |
336 | 336 |
uint8_t profile_idc; |
... | ... |
@@ -340,11 +340,11 @@ typedef struct ProfileTierLevel { |
340 | 340 |
uint8_t interlaced_source_flag; |
341 | 341 |
uint8_t non_packed_constraint_flag; |
342 | 342 |
uint8_t frame_only_constraint_flag; |
343 |
-} ProfileTierLevel; |
|
343 |
+} PTLCommon; |
|
344 | 344 |
|
345 | 345 |
typedef struct PTL { |
346 |
- ProfileTierLevel general_PTL; |
|
347 |
- ProfileTierLevel sub_layer_PTL[MAX_SUB_LAYERS]; |
|
346 |
+ PTLCommon general_ptl; |
|
347 |
+ PTLCommon sub_layer_ptl[MAX_SUB_LAYERS]; |
|
348 | 348 |
|
349 | 349 |
uint8_t sub_layer_profile_present_flag[MAX_SUB_LAYERS]; |
350 | 350 |
uint8_t sub_layer_level_present_flag[MAX_SUB_LAYERS]; |
... | ... |
@@ -192,7 +192,7 @@ int ff_hevc_decode_short_term_rps(HEVCContext *s, ShortTermRPS *rps, |
192 | 192 |
} |
193 | 193 |
|
194 | 194 |
|
195 |
-static void decode_profile_tier_level(HEVCContext *s, ProfileTierLevel *ptl) |
|
195 |
+static void decode_profile_tier_level(HEVCContext *s, PTLCommon *ptl) |
|
196 | 196 |
{ |
197 | 197 |
int i; |
198 | 198 |
HEVCLocalContext *lc = s->HEVClc; |
... | ... |
@@ -225,8 +225,8 @@ static void parse_ptl(HEVCContext *s, PTL *ptl, int max_num_sub_layers) |
225 | 225 |
int i; |
226 | 226 |
HEVCLocalContext *lc = s->HEVClc; |
227 | 227 |
GetBitContext *gb = &lc->gb; |
228 |
- decode_profile_tier_level(s, &ptl->general_PTL); |
|
229 |
- ptl->general_PTL.level_idc = get_bits(gb, 8); |
|
228 |
+ decode_profile_tier_level(s, &ptl->general_ptl); |
|
229 |
+ ptl->general_ptl.level_idc = get_bits(gb, 8); |
|
230 | 230 |
|
231 | 231 |
for (i = 0; i < max_num_sub_layers - 1; i++) { |
232 | 232 |
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) |
237 | 237 |
skip_bits(gb, 2); // reserved_zero_2bits[i] |
238 | 238 |
for (i = 0; i < max_num_sub_layers - 1; i++) { |
239 | 239 |
if (ptl->sub_layer_profile_present_flag[i]) |
240 |
- decode_profile_tier_level(s, &ptl->sub_layer_PTL[i]); |
|
240 |
+ decode_profile_tier_level(s, &ptl->sub_layer_ptl[i]); |
|
241 | 241 |
if (ptl->sub_layer_level_present_flag[i]) |
242 |
- ptl->sub_layer_PTL[i].level_idc = get_bits(gb, 8); |
|
242 |
+ ptl->sub_layer_ptl[i].level_idc = get_bits(gb, 8); |
|
243 | 243 |
} |
244 | 244 |
} |
245 | 245 |
|