On Fri, 2022-07-15 at 13:06 +0800, Fei Wang wrote:
> From: Xu Guangxin <guangxin...@intel.com>
>
> According to C.5.2.2, item 2. When we got an IRAP, and the
> NoOutputOfPriorPicsFlag = 0, we need bump all outputable frames.
>
> Tested-by: Fei Wang <fei.w.w...@intel.com>
> Signed-off-by: Xu Guangxin <guangxin...@intel.com>
> ---
> update:
> 1. clean and replace 0xff with HEVC_SEQUENCE_COUNTER_MASK
>
> libavcodec/hevc_refs.c | 23 +++++++++++++----------
> 1 file changed, 13 insertions(+), 10 deletions(-)
>
> diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c
> index 6a70c817b0..2b0468d6c4 100644
> --- a/libavcodec/hevc_refs.c
> +++ b/libavcodec/hevc_refs.c
> @@ -175,21 +175,24 @@ int ff_hevc_set_new_ref(HEVCContext *s, AVFrame **frame,
> int poc)
>
> int ff_hevc_output_frame(HEVCContext *s, AVFrame *out, int flush)
> {
> + if (IS_IRAP(s) && s->no_rasl_output_flag == 1) {
> + const static int mask = HEVC_FRAME_FLAG_BUMPING |
> HEVC_FRAME_FLAG_OUTPUT;
> + for (int i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
> + HEVCFrame *frame = &s->DPB[i];
> + if ((frame->flags & mask) == HEVC_FRAME_FLAG_OUTPUT &&
> + frame->sequence != s->seq_decode) {
> + if (s->sh.no_output_of_prior_pics_flag == 1)
> + ff_hevc_unref_frame(s, frame, HEVC_FRAME_FLAG_OUTPUT);
> + else
> + frame->flags |= HEVC_FRAME_FLAG_BUMPING;
> + }
> + }
> + }
> do {
> int nb_output = 0;
> int min_poc = INT_MAX;
> int i, min_idx, ret;
>
> - if (s->sh.no_output_of_prior_pics_flag == 1 &&
> s->no_rasl_output_flag
> == 1) {
> - for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
> - HEVCFrame *frame = &s->DPB[i];
> - if (!(frame->flags & HEVC_FRAME_FLAG_BUMPING) && frame->poc
> != s->poc &&
> - frame->sequence == s->seq_output) {
> - ff_hevc_unref_frame(s, frame, HEVC_FRAME_FLAG_OUTPUT);
> - }
> - }
> - }
> -
> for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
> HEVCFrame *frame = &s->DPB[i];
> if ((frame->flags & HEVC_FRAME_FLAG_OUTPUT) &&
Patchset 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".
