RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cbs_h266: add range extension support 

example clips:
  * 12b444vvc1_E_Sony_2
  * 12b444Ietsrc_A_Kwai_2
  * 10b444P16_D_Sony_2
  * 12b444Iepp_A_Sharp_2
  * 12b444SPetsrc_B_Kwai_2

Co-authored-by: Nuo Mi <nuomi2021@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Frank Plowman 2023-07-05 22:01:13 +08:00 committed by James Almer
parent f00222e81f
commit 4b19690ff4
2 changed files with 96 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavcodec/cbs_h266.h
View File

@ -118,8 +118,16 @@ typedef struct H266GeneralConstraintsInfo {
uint8_t gci_no_lmcs_constraint_flag;
uint8_t gci_no_ladf_constraint_flag;
uint8_t gci_no_virtual_boundaries_constraint_flag;
uint8_t gci_num_reserved_bits;
uint8_t gci_reserved_zero_bit[255];
uint8_t gci_num_additional_bits;
uint8_t gci_reserved_bit[255];
uint8_t gci_all_rap_pictures_constraint_flag;
uint8_t gci_no_extended_precision_processing_constraint_flag;
uint8_t gci_no_ts_residual_coding_rice_constraint_flag;
uint8_t gci_no_rrc_rice_extension_constraint_flag;
uint8_t gci_no_persistent_rice_adaptation_constraint_flag;
uint8_t gci_no_reverse_last_sig_coeff_constraint_flag;
} H266GeneralConstraintsInfo;
typedef struct H266RawProfileTierLevel {
@ -472,6 +480,15 @@ typedef struct H266RawSPS {
uint8_t sps_extension_flag;
uint8_t sps_range_extension_flag;
uint8_t sps_extension_7bits;
uint8_t sps_extended_precision_flag;
uint8_t sps_ts_residual_coding_rice_present_in_sh_flag;
uint8_t sps_rrc_rice_extension_flag;
uint8_t sps_persistent_rice_adaptation_enabled_flag;
uint8_t sps_reverse_last_sig_coeff_enabled_flag;
H266RawExtensionData extension_data;
} H266RawSPS;
@ -757,6 +774,8 @@ typedef struct H266RawSliceHeader {
uint8_t sh_sign_data_hiding_used_flag;
uint8_t sh_ts_residual_coding_disabled_flag;
uint8_t sh_ts_residual_coding_rice_idx_minus1;
uint8_t sh_reverse_last_sig_coeff_flag;
uint16_t sh_slice_header_extension_length;
uint8_t sh_slice_header_extension_data_byte[256];

81
libavcodec/cbs_h266_syntax_template.c
View File

@ -61,7 +61,7 @@ static int FUNC(general_constraints_info) (CodedBitstreamContext *ctx,
RWContext *rw,
H266GeneralConstraintsInfo *current)
{
int err, i;
int err, i, num_additional_bits_used;
flag(gci_present_flag);
if (current->gci_present_flag) {
@ -148,10 +148,27 @@ static int FUNC(general_constraints_info) (CodedBitstreamContext *ctx,
flag(gci_no_lmcs_constraint_flag);
flag(gci_no_ladf_constraint_flag);
flag(gci_no_virtual_boundaries_constraint_flag);
ub(8, gci_num_reserved_bits);
for (i = 0; i < current->gci_num_reserved_bits; i++) {
flags(gci_reserved_zero_bit[i], 1, i);
ub(8, gci_num_additional_bits);
if (current->gci_num_additional_bits > 5) {
flag(gci_all_rap_pictures_constraint_flag);
flag(gci_no_extended_precision_processing_constraint_flag);
flag(gci_no_ts_residual_coding_rice_constraint_flag);
flag(gci_no_rrc_rice_extension_constraint_flag);
flag(gci_no_persistent_rice_adaptation_constraint_flag);
flag(gci_no_reverse_last_sig_coeff_constraint_flag);
num_additional_bits_used = 6;
} else {
infer(gci_all_rap_pictures_constraint_flag, 0);
infer(gci_no_extended_precision_processing_constraint_flag, 0);
infer(gci_no_ts_residual_coding_rice_constraint_flag, 0);
infer(gci_no_rrc_rice_extension_constraint_flag, 0);
infer(gci_no_persistent_rice_adaptation_constraint_flag, 0);
infer(gci_no_reverse_last_sig_coeff_constraint_flag, 0);
num_additional_bits_used = 0;
}
for (i = 0; i < current->gci_num_additional_bits - num_additional_bits_used; i++)
flags(gci_reserved_bit[i], 1, i);
}
while (byte_alignment(rw) != 0)
fixed(1, gci_alignment_zero_bit, 0);
@ -1014,6 +1031,22 @@ static int FUNC(vps) (CodedBitstreamContext *ctx, RWContext *rw,
return 0;
}
static int FUNC(sps_range_extension)(CodedBitstreamContext *ctx, RWContext *rw,
H266RawSPS *current)
{
int err;
flag(sps_extended_precision_flag);
if (current->sps_transform_skip_enabled_flag)
flag(sps_ts_residual_coding_rice_present_in_sh_flag);
else
infer(sps_ts_residual_coding_rice_present_in_sh_flag, 0);
flag(sps_rrc_rice_extension_flag);
flag(sps_persistent_rice_adaptation_enabled_flag);
flag(sps_reverse_last_sig_coeff_enabled_flag);
return 0;
}
static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw,
H266RawSPS *current)
@ -1569,9 +1602,33 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw,
} else {
CHECK(FUNC(vui_parameters_default) (ctx, rw, &current->vui));
}
flag(sps_extension_flag);
if (current->sps_extension_flag)
CHECK(FUNC(extension_data) (ctx, rw, &current->extension_data));
if (current->sps_extension_flag) {
flag(sps_range_extension_flag);
ub(7, sps_extension_7bits);
if (current->sps_range_extension_flag) {
CHECK(FUNC(sps_range_extension)(ctx, rw, current));
} else {
infer(sps_extended_precision_flag, 0);
infer(sps_ts_residual_coding_rice_present_in_sh_flag, 0);
infer(sps_rrc_rice_extension_flag, 0);
infer(sps_persistent_rice_adaptation_enabled_flag, 0);
infer(sps_reverse_last_sig_coeff_enabled_flag, 0);
}
} else {
infer(sps_range_extension_flag, 0);
infer(sps_extension_7bits, 0);
infer(sps_extended_precision_flag, 0);
infer(sps_ts_residual_coding_rice_present_in_sh_flag, 0);
infer(sps_rrc_rice_extension_flag, 0);
infer(sps_persistent_rice_adaptation_enabled_flag, 0);
infer(sps_reverse_last_sig_coeff_enabled_flag, 0);
}
if (current->sps_extension_7bits)
CHECK(FUNC(extension_data)(ctx, rw, &current->extension_data));
CHECK(FUNC(rbsp_trailing_bits) (ctx, rw));
@ -3058,6 +3115,18 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw,
flag(sh_ts_residual_coding_disabled_flag);
else
infer(sh_ts_residual_coding_disabled_flag, 0);
if (!current->sh_ts_residual_coding_disabled_flag &&
sps->sps_ts_residual_coding_rice_present_in_sh_flag)
ub(3, sh_ts_residual_coding_rice_idx_minus1);
else
infer(sh_ts_residual_coding_rice_idx_minus1, 0);
if (sps->sps_reverse_last_sig_coeff_enabled_flag)
flag(sh_reverse_last_sig_coeff_flag);
else
infer(sh_reverse_last_sig_coeff_flag, 0);
if (pps->pps_slice_header_extension_present_flag) {
ue(sh_slice_header_extension_length, 0, 256);
for (i = 0; i < current->sh_slice_header_extension_length; i++)