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

avcodec/hevc_ps: use get_{ue,se}_golomb() for some PPS Range extension fields

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2023-04-27 16:36:29 -03:00
parent df3fd3accd
commit 41dd50ad0d
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/hevc_ps.c
View File

@@ -1478,33 +1478,33 @@ static int pps_range_extensions(GetBitContext *gb, AVCodecContext *avctx,
HEVCPPS *pps, HEVCSPS *sps) HEVCPPS *pps, HEVCSPS *sps)
{ {
if (pps->transform_skip_enabled_flag) { if (pps->transform_skip_enabled_flag) {
pps->log2_max_transform_skip_block_size = get_ue_golomb_long(gb) + 2; pps->log2_max_transform_skip_block_size = get_ue_golomb_31(gb) + 2;
} }
pps->cross_component_prediction_enabled_flag = get_bits1(gb); pps->cross_component_prediction_enabled_flag = get_bits1(gb);
pps->chroma_qp_offset_list_enabled_flag = get_bits1(gb); pps->chroma_qp_offset_list_enabled_flag = get_bits1(gb);
if (pps->chroma_qp_offset_list_enabled_flag) { if (pps->chroma_qp_offset_list_enabled_flag) {
pps->diff_cu_chroma_qp_offset_depth = get_ue_golomb_long(gb); pps->diff_cu_chroma_qp_offset_depth = get_ue_golomb_31(gb);
pps->chroma_qp_offset_list_len_minus1 = get_ue_golomb_long(gb); pps->chroma_qp_offset_list_len_minus1 = get_ue_golomb_31(gb);
if (pps->chroma_qp_offset_list_len_minus1 > 5) { if (pps->chroma_qp_offset_list_len_minus1 > 5) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"chroma_qp_offset_list_len_minus1 shall be in the range [0, 5].\n"); "chroma_qp_offset_list_len_minus1 shall be in the range [0, 5].\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
for (int i = 0; i <= pps->chroma_qp_offset_list_len_minus1; i++) { for (int i = 0; i <= pps->chroma_qp_offset_list_len_minus1; i++) {
pps->cb_qp_offset_list[i] = get_se_golomb_long(gb); pps->cb_qp_offset_list[i] = get_se_golomb(gb);
if (pps->cb_qp_offset_list[i]) { if (pps->cb_qp_offset_list[i]) {
av_log(avctx, AV_LOG_WARNING, av_log(avctx, AV_LOG_WARNING,
"cb_qp_offset_list not tested yet.\n"); "cb_qp_offset_list not tested yet.\n");
} }
pps->cr_qp_offset_list[i] = get_se_golomb_long(gb); pps->cr_qp_offset_list[i] = get_se_golomb(gb);
if (pps->cr_qp_offset_list[i]) { if (pps->cr_qp_offset_list[i]) {
av_log(avctx, AV_LOG_WARNING, av_log(avctx, AV_LOG_WARNING,
"cb_qp_offset_list not tested yet.\n"); "cb_qp_offset_list not tested yet.\n");
} }
} }
} }
pps->log2_sao_offset_scale_luma = get_ue_golomb_long(gb); pps->log2_sao_offset_scale_luma = get_ue_golomb_31(gb);
pps->log2_sao_offset_scale_chroma = get_ue_golomb_long(gb); pps->log2_sao_offset_scale_chroma = get_ue_golomb_31(gb);
if ( pps->log2_sao_offset_scale_luma > FFMAX(sps->bit_depth - 10, 0) if ( pps->log2_sao_offset_scale_luma > FFMAX(sps->bit_depth - 10, 0)
|| pps->log2_sao_offset_scale_chroma > FFMAX(sps->bit_depth_chroma - 10, 0) || pps->log2_sao_offset_scale_chroma > FFMAX(sps->bit_depth_chroma - 10, 0)