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

avcodec/cavsdec, h264*, hevc_parser: Use get_ue_golomb_31 where possible

Browse Source 
instead of get_ue_golomb(). The difference between the two is that the
latter also has to take into account the case in which the read code is
more than 9 bits (four preceding zeroes + at most five value bits) long,
leading to more code.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-07-14 15:20:09 +02:00
parent 2d5407d390
commit cbb6ba2e86
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/cavsdec.c
View File

@ -676,7 +676,7 @@ static int decode_mb_i(AVSContext *h, int cbp_code)
} }
h->pred_mode_Y[pos] = predpred; h->pred_mode_Y[pos] = predpred;
} }
pred_mode_uv = get_ue_golomb(gb); pred_mode_uv = get_ue_golomb_31(gb);
if (pred_mode_uv > 6) { if (pred_mode_uv > 6) {
av_log(h->avctx, AV_LOG_ERROR, "illegal intra chroma pred mode\n"); av_log(h->avctx, AV_LOG_ERROR, "illegal intra chroma pred mode\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;

4
libavcodec/h264_parse.c
View File

@ -35,7 +35,7 @@ int ff_h264_pred_weight_table(GetBitContext *gb, const SPS *sps,
pwt->use_weight = 0; pwt->use_weight = 0;
pwt->use_weight_chroma = 0; pwt->use_weight_chroma = 0;
pwt->luma_log2_weight_denom = get_ue_golomb(gb); pwt->luma_log2_weight_denom = get_ue_golomb_31(gb);
if (pwt->luma_log2_weight_denom > 7U) { if (pwt->luma_log2_weight_denom > 7U) {
av_log(logctx, AV_LOG_ERROR, "luma_log2_weight_denom %d is out of range\n", pwt->luma_log2_weight_denom); av_log(logctx, AV_LOG_ERROR, "luma_log2_weight_denom %d is out of range\n", pwt->luma_log2_weight_denom);
pwt->luma_log2_weight_denom = 0; pwt->luma_log2_weight_denom = 0;
@ -43,7 +43,7 @@ int ff_h264_pred_weight_table(GetBitContext *gb, const SPS *sps,
luma_def = 1 << pwt->luma_log2_weight_denom; luma_def = 1 << pwt->luma_log2_weight_denom;
if (sps->chroma_format_idc) { if (sps->chroma_format_idc) {
pwt->chroma_log2_weight_denom = get_ue_golomb(gb); pwt->chroma_log2_weight_denom = get_ue_golomb_31(gb);
if (pwt->chroma_log2_weight_denom > 7U) { if (pwt->chroma_log2_weight_denom > 7U) {
av_log(logctx, AV_LOG_ERROR, "chroma_log2_weight_denom %d is out of range\n", pwt->chroma_log2_weight_denom); av_log(logctx, AV_LOG_ERROR, "chroma_log2_weight_denom %d is out of range\n", pwt->chroma_log2_weight_denom);
pwt->chroma_log2_weight_denom = 0; pwt->chroma_log2_weight_denom = 0;

24
libavcodec/h264_ps.c
View File

@ -181,8 +181,8 @@ static inline int decode_vui_parameters(GetBitContext *gb, void *logctx,
/* chroma_location_info_present_flag */ /* chroma_location_info_present_flag */
if (get_bits1(gb)) { if (get_bits1(gb)) {
/* chroma_sample_location_type_top_field */ /* chroma_sample_location_type_top_field */
sps->chroma_location = get_ue_golomb(gb) + 1; sps->chroma_location = get_ue_golomb_31(gb) + 1;
get_ue_golomb(gb); /* chroma_sample_location_type_bottom_field */ get_ue_golomb_31(gb); /* chroma_sample_location_type_bottom_field */
} else } else
sps->chroma_location = AVCHROMA_LOC_LEFT; sps->chroma_location = AVCHROMA_LOC_LEFT;
@ -224,12 +224,12 @@ static inline int decode_vui_parameters(GetBitContext *gb, void *logctx,
sps->bitstream_restriction_flag = get_bits1(gb); sps->bitstream_restriction_flag = get_bits1(gb);
if (sps->bitstream_restriction_flag) { if (sps->bitstream_restriction_flag) {
get_bits1(gb); /* motion_vectors_over_pic_boundaries_flag */ get_bits1(gb); /* motion_vectors_over_pic_boundaries_flag */
get_ue_golomb(gb); /* max_bytes_per_pic_denom */ get_ue_golomb_31(gb); /* max_bytes_per_pic_denom */
get_ue_golomb(gb); /* max_bits_per_mb_denom */ get_ue_golomb_31(gb); /* max_bits_per_mb_denom */
get_ue_golomb(gb); /* log2_max_mv_length_horizontal */ get_ue_golomb_31(gb); /* log2_max_mv_length_horizontal */
get_ue_golomb(gb); /* log2_max_mv_length_vertical */ get_ue_golomb_31(gb); /* log2_max_mv_length_vertical */
sps->num_reorder_frames = get_ue_golomb(gb); sps->num_reorder_frames = get_ue_golomb_31(gb);
get_ue_golomb(gb); /*max_dec_frame_buffering*/ get_ue_golomb_31(gb); /*max_dec_frame_buffering*/
if (get_bits_left(gb) < 0) { if (get_bits_left(gb) < 0) {
sps->num_reorder_frames = 0; sps->num_reorder_frames = 0;
@ -403,8 +403,8 @@ int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx,
goto fail; goto fail;
} }
} }
sps->bit_depth_luma = get_ue_golomb(gb) + 8; sps->bit_depth_luma = get_ue_golomb_31(gb) + 8;
sps->bit_depth_chroma = get_ue_golomb(gb) + 8; sps->bit_depth_chroma = get_ue_golomb_31(gb) + 8;
if (sps->bit_depth_chroma != sps->bit_depth_luma) { if (sps->bit_depth_chroma != sps->bit_depth_luma) {
avpriv_request_sample(avctx, avpriv_request_sample(avctx,
"Different chroma and luma bit depth"); "Different chroma and luma bit depth");
@ -428,7 +428,7 @@ int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx,
sps->bit_depth_chroma = 8; sps->bit_depth_chroma = 8;
} }
log2_max_frame_num_minus4 = get_ue_golomb(gb); log2_max_frame_num_minus4 = get_ue_golomb_31(gb);
if (log2_max_frame_num_minus4 < MIN_LOG2_MAX_FRAME_NUM - 4 || if (log2_max_frame_num_minus4 < MIN_LOG2_MAX_FRAME_NUM - 4 ||
log2_max_frame_num_minus4 > MAX_LOG2_MAX_FRAME_NUM - 4) { log2_max_frame_num_minus4 > MAX_LOG2_MAX_FRAME_NUM - 4) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
@ -441,7 +441,7 @@ int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx,
sps->poc_type = get_ue_golomb_31(gb); sps->poc_type = get_ue_golomb_31(gb);
if (sps->poc_type == 0) { // FIXME #define if (sps->poc_type == 0) { // FIXME #define
unsigned t = get_ue_golomb(gb); unsigned t = get_ue_golomb_31(gb);
if (t>12) { if (t>12) {
av_log(avctx, AV_LOG_ERROR, "log2_max_poc_lsb (%d) is out of range\n", t); av_log(avctx, AV_LOG_ERROR, "log2_max_poc_lsb (%d) is out of range\n", t);
goto fail; goto fail;

2
libavcodec/hevc_parser.c
View File

@ -136,7 +136,7 @@ static int hevc_parse_slice_header(AVCodecParserContext *s, H2645NAL *nal,
for (i = 0; i < ps->pps->num_extra_slice_header_bits; i++) for (i = 0; i < ps->pps->num_extra_slice_header_bits; i++)
skip_bits(gb, 1); // slice_reserved_undetermined_flag[] skip_bits(gb, 1); // slice_reserved_undetermined_flag[]
slice_type = get_ue_golomb(gb); slice_type = get_ue_golomb_31(gb);
if (!(slice_type == HEVC_SLICE_I || slice_type == HEVC_SLICE_P || if (!(slice_type == HEVC_SLICE_I || slice_type == HEVC_SLICE_P ||
slice_type == HEVC_SLICE_B)) { slice_type == HEVC_SLICE_B)) {
av_log(avctx, AV_LOG_ERROR, "Unknown slice type: %d.\n", av_log(avctx, AV_LOG_ERROR, "Unknown slice type: %d.\n",