On Tue, 2022-06-14 at 09:23 +0800, Fei Wang wrote: > From: Xu Guangxin <guangxin...@intel.com> > > suppose > a. You have 3 frames, 0, 1, 4096. > b. The ltMask is 0xfff and use_msb is 0. > c. The 0, 1 are lt refs for 4096. > d. you are decoding frame 4096, and get the 0 frame. > Since 4096 & ltMask is 0 too, even you want get 0, find_ref_idx may give you > 4096. > add_candidate_ref will report an error for this > > Tested-by: Fei Wang <fei.w.w...@intel.com> > Signed-off-by: Xu Guangxin <guangxin...@intel.com> > --- > libavcodec/hevc_refs.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c > index 89053fd1a2..b3d5f96043 100644 > --- a/libavcodec/hevc_refs.c > +++ b/libavcodec/hevc_refs.c > @@ -386,7 +386,7 @@ static HEVCFrame *find_ref_idx(HEVCContext *s, int poc, > uint8_t 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 & mask) == poc) > + if ((ref->poc & mask) == poc && (use_msb || ref->poc != s->poc)) > return ref; > } > }
LGTM -Haihao _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".