Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
ecb21d24
Commit
ecb21d24
authored
Dec 13, 2013
by
Guillaume Martres
Committed by
Michael Niedermayer
Dec 14, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hevc: rename ptl structs and variables
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
c90cdf4b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
11 deletions
+11
-11
hevc.c
libavcodec/hevc.c
+2
-2
hevc.h
libavcodec/hevc.h
+4
-4
hevc_ps.c
libavcodec/hevc_ps.c
+5
-5
No files found.
libavcodec/hevc.c
View file @
ecb21d24
...
@@ -389,8 +389,8 @@ static int hls_slice_header(HEVCContext *s)
...
@@ -389,8 +389,8 @@ static int hls_slice_header(HEVCContext *s)
s
->
max_ra
=
INT_MAX
;
s
->
max_ra
=
INT_MAX
;
}
}
s
->
avctx
->
profile
=
s
->
sps
->
ptl
.
general_
PTL
.
profile_idc
;
s
->
avctx
->
profile
=
s
->
sps
->
ptl
.
general_
ptl
.
profile_idc
;
s
->
avctx
->
level
=
s
->
sps
->
ptl
.
general_
PTL
.
level_idc
;
s
->
avctx
->
level
=
s
->
sps
->
ptl
.
general_
ptl
.
level_idc
;
sh
->
dependent_slice_segment_flag
=
0
;
sh
->
dependent_slice_segment_flag
=
0
;
if
(
!
sh
->
first_slice_in_pic_flag
)
{
if
(
!
sh
->
first_slice_in_pic_flag
)
{
...
...
libavcodec/hevc.h
View file @
ecb21d24
...
@@ -330,7 +330,7 @@ typedef struct VUI {
...
@@ -330,7 +330,7 @@ typedef struct VUI {
int
log2_max_mv_length_vertical
;
int
log2_max_mv_length_vertical
;
}
VUI
;
}
VUI
;
typedef
struct
P
rofileTierLevel
{
typedef
struct
P
TLCommon
{
uint8_t
profile_space
;
uint8_t
profile_space
;
uint8_t
tier_flag
;
uint8_t
tier_flag
;
uint8_t
profile_idc
;
uint8_t
profile_idc
;
...
@@ -340,11 +340,11 @@ typedef struct ProfileTierLevel {
...
@@ -340,11 +340,11 @@ typedef struct ProfileTierLevel {
uint8_t
interlaced_source_flag
;
uint8_t
interlaced_source_flag
;
uint8_t
non_packed_constraint_flag
;
uint8_t
non_packed_constraint_flag
;
uint8_t
frame_only_constraint_flag
;
uint8_t
frame_only_constraint_flag
;
}
P
rofileTierLevel
;
}
P
TLCommon
;
typedef
struct
PTL
{
typedef
struct
PTL
{
P
rofileTierLevel
general_PTL
;
P
TLCommon
general_ptl
;
P
rofileTierLevel
sub_layer_PTL
[
MAX_SUB_LAYERS
];
P
TLCommon
sub_layer_ptl
[
MAX_SUB_LAYERS
];
uint8_t
sub_layer_profile_present_flag
[
MAX_SUB_LAYERS
];
uint8_t
sub_layer_profile_present_flag
[
MAX_SUB_LAYERS
];
uint8_t
sub_layer_level_present_flag
[
MAX_SUB_LAYERS
];
uint8_t
sub_layer_level_present_flag
[
MAX_SUB_LAYERS
];
...
...
libavcodec/hevc_ps.c
View file @
ecb21d24
...
@@ -192,7 +192,7 @@ int ff_hevc_decode_short_term_rps(HEVCContext *s, ShortTermRPS *rps,
...
@@ -192,7 +192,7 @@ int ff_hevc_decode_short_term_rps(HEVCContext *s, ShortTermRPS *rps,
}
}
static
void
decode_profile_tier_level
(
HEVCContext
*
s
,
P
rofileTierLevel
*
ptl
)
static
void
decode_profile_tier_level
(
HEVCContext
*
s
,
P
TLCommon
*
ptl
)
{
{
int
i
;
int
i
;
HEVCLocalContext
*
lc
=
s
->
HEVClc
;
HEVCLocalContext
*
lc
=
s
->
HEVClc
;
...
@@ -225,8 +225,8 @@ static void parse_ptl(HEVCContext *s, PTL *ptl, int max_num_sub_layers)
...
@@ -225,8 +225,8 @@ static void parse_ptl(HEVCContext *s, PTL *ptl, int max_num_sub_layers)
int
i
;
int
i
;
HEVCLocalContext
*
lc
=
s
->
HEVClc
;
HEVCLocalContext
*
lc
=
s
->
HEVClc
;
GetBitContext
*
gb
=
&
lc
->
gb
;
GetBitContext
*
gb
=
&
lc
->
gb
;
decode_profile_tier_level
(
s
,
&
ptl
->
general_
PTL
);
decode_profile_tier_level
(
s
,
&
ptl
->
general_
ptl
);
ptl
->
general_
PTL
.
level_idc
=
get_bits
(
gb
,
8
);
ptl
->
general_
ptl
.
level_idc
=
get_bits
(
gb
,
8
);
for
(
i
=
0
;
i
<
max_num_sub_layers
-
1
;
i
++
)
{
for
(
i
=
0
;
i
<
max_num_sub_layers
-
1
;
i
++
)
{
ptl
->
sub_layer_profile_present_flag
[
i
]
=
get_bits1
(
gb
);
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,9 +237,9 @@ static void parse_ptl(HEVCContext *s, PTL *ptl, int max_num_sub_layers)
skip_bits
(
gb
,
2
);
// reserved_zero_2bits[i]
skip_bits
(
gb
,
2
);
// reserved_zero_2bits[i]
for
(
i
=
0
;
i
<
max_num_sub_layers
-
1
;
i
++
)
{
for
(
i
=
0
;
i
<
max_num_sub_layers
-
1
;
i
++
)
{
if
(
ptl
->
sub_layer_profile_present_flag
[
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
])
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
);
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment