From 2a9bed8fc152943870dc9c18832e3789730ff3ad Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 27 May 2020 10:46:50 +0200 Subject: hevc_refs: reduce code duplication in find_ref_idx() --- libavcodec/hevc_refs.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'libavcodec/hevc_refs.c') diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c index 73aa6d8caf..4f6d985ae6 100644 --- a/libavcodec/hevc_refs.c +++ b/libavcodec/hevc_refs.c @@ -360,24 +360,14 @@ int ff_hevc_slice_rpl(HEVCContext *s) static HEVCFrame *find_ref_idx(HEVCContext *s, int poc, uint8_t use_msb) { + int mask = use_msb ? ~0 : (1 << s->ps.sps->log2_max_poc_lsb) - 1; int i; - if (use_msb) { - for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) { - HEVCFrame *ref = &s->DPB[i]; - if (ref->frame->buf[0] && (ref->sequence == s->seq_decode)) { - if (ref->poc == poc) - return ref; - } - } - } else { - int LtMask = (1 << s->ps.sps->log2_max_poc_lsb) - 1; - for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) { - HEVCFrame *ref = &s->DPB[i]; - if (ref->frame->buf[0] && ref->sequence == s->seq_decode) { - if ((ref->poc & LtMask) == poc) - return ref; - } + for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) { + HEVCFrame *ref = &s->DPB[i]; + if (ref->frame->buf[0] && ref->sequence == s->seq_decode) { + if ((ref->poc & mask) == poc) + return ref; } } -- cgit v1.2.3