From patchwork Tue Jun 14 01:23:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 36213 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp801188pzb; Mon, 13 Jun 2022 18:30:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyQ0Ff1rOJhdt67bjTX2tts8hk2e7lL/JAtbO6X6MzVhlh1taw3nvtUA46Z9HYVIZXbFc/b X-Received: by 2002:a17:906:af71:b0:70b:cc0b:1f14 with SMTP id os17-20020a170906af7100b0070bcc0b1f14mr2123489ejb.669.1655170217577; Mon, 13 Jun 2022 18:30:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655170217; cv=none; d=google.com; s=arc-20160816; b=0E2wbFgJwGgKEESsZqmMzjDYPey9jJaumexLWMVGfkLeI8r/ocu6hzsKFoZFpfdhX6 nU3u0KXviZIh+aeGkx9NIRnDnC+YX+j7esP01G0v8SZjDaxC7oysHmciPmg4QenjjJDC 3GXbUR3NV+jFrCCc/xBWiMw0B167rXNut5/C/oza3GBhs7Oymc+ZmddwFyLec+niDdNt Lpy3bDZS0HN0rd+qhdFTJeVuLJk4KlASM/8/g3FPZss3Ff1nK8UHd3V0lfcDIW/K+Ng+ maWXimUPa0N8CIX6YGB7uHuIgJF2q4FrqVR9x2xaicoF1YZpmtZqncN95rYARIwz8fzz ZtCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=fZe61Ppy4U9dlZKSKiUcezVnLPgzYrfB+EYiO69Gyxg=; b=xMOiOf9b0P5W4WZxX5UjmoucAa3qX2TR4O+JwlhtkVHDLZywFJdaudPmdJw9Gl4615 JRt7iQeHbGWuJqC6+sLZkbcYPjIODLyIhOa/LV8E94qEg+9+t5kqfC26grBWhPuSJUgq mhWjjvs2NJ7pCzSOE9mg3N/wf3Lu/3QKZcG6Lwx3P6vNlwvvqrc7VXnp0Gs+lrP+nDB0 mwEBK6cbIBAGGgXDJq+6kIspSuu5RSAvKTfO1+gi+/JGFKxzOQIDyCpGOXc3SkUG3WvV 7iFtYee0/i8hb8iFECWlqJmhRKeYGxaArQ3OVY2aMby6QxBhApviJLxP6SgVCAY7D9k5 dGag== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=DPAMexyF; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 9-20020a170906024900b006f3b5fbc9easi9109823ejl.904.2022.06.13.18.30.17; Mon, 13 Jun 2022 18:30:17 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=DPAMexyF; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 46D6B68B636; Tue, 14 Jun 2022 04:30:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A08CB68B333 for ; Tue, 14 Jun 2022 04:30:02 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1655170207; x=1686706207; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kp0kfqAH36tcbraDoEOtpSPO3NAypSToQVgeQc0VzjY=; b=DPAMexyF2qxeNAg5IpI9oW1ERdBPciAmQDSThGW/lexkvwuqeaaRX6eS tRmSJjPVpdhd51/zr9ayCb5tWAhAbaRdjQ55qE7c+6/lHCgD/yr9HH640 mqOBENPivTvqMreKxW8L+YH1AiG1BYRmli3OpgsfCcP6oRqjrGlNh6uyo prd4j4sRGCOjfTQQOP5QJrGlIoatq/p97Hlmov3mnXAY1ZVckrOd+S+ko sVvWa5nwBjpRJ/+lHivJa9j5yixkuGU42LOKEBceKZwbFz8UBmRGzOcVC ClbYUR7nXWNG0C5VzCQKOdXWNJSqgML0VXtyqJSEge6SThTFBbt+EoWWt g==; X-IronPort-AV: E=McAfee;i="6400,9594,10377"; a="342432964" X-IronPort-AV: E=Sophos;i="5.91,298,1647327600"; d="scan'208";a="342432964" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2022 18:29:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,298,1647327600"; d="scan'208";a="686378070" Received: from t.sh.intel.com ([10.239.159.147]) by fmsmga002.fm.intel.com with ESMTP; 13 Jun 2022 18:29:51 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Jun 2022 09:23:00 +0800 Message-Id: <20220614012302.2808428-2-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220614012302.2808428-1-fei.w.wang@intel.com> References: <20220614012302.2808428-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/4] lavc/hevcdec: do not let missing ref frames invovled in dpb process X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Xu Guangxin , Fei Wang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: o29/N/HKBUD0 From: Xu Guangxin We will generate a new frame for a missed reference. The frame can only be used for reference. We assign an invalid decode sequence to it, so it will not be involved in any dpb process. Tested-by: Fei Wang Signed-off-by: Xu Guangxin --- libavcodec/hevc_refs.c | 14 +++++++++++++- libavcodec/hevcdec.c | 4 ++-- libavcodec/hevcdec.h | 3 +++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c index 3f8fe1ef18..89053fd1a2 100644 --- a/libavcodec/hevc_refs.c +++ b/libavcodec/hevc_refs.c @@ -172,6 +172,16 @@ int ff_hevc_set_new_ref(HEVCContext *s, AVFrame **frame, int poc) return 0; } +static void unref_missing_refs(HEVCContext *s) +{ + for (int i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) { + HEVCFrame *frame = &s->DPB[i]; + if (frame->sequence == HEVC_DECODE_SEQUENCE_INVALID) { + ff_hevc_unref_frame(s, frame, ~0); + } + } +} + int ff_hevc_output_frame(HEVCContext *s, AVFrame *out, int flush) { if (IS_IRAP(s) && s->no_rasl_output_flag == 1) { @@ -418,7 +428,7 @@ static HEVCFrame *generate_missing_ref(HEVCContext *s, int poc) } frame->poc = poc; - frame->sequence = s->seq_decode; + frame->sequence = HEVC_DECODE_SEQUENCE_INVALID; frame->flags = 0; if (s->threads_type == FF_THREAD_FRAME) @@ -462,6 +472,8 @@ int ff_hevc_frame_rps(HEVCContext *s) return 0; } + unref_missing_refs(s); + /* clear the reference flags on all frames except the current one */ for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) { HEVCFrame *frame = &s->DPB[i]; diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index f782ea6394..99785aa5d1 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -569,7 +569,7 @@ static int hls_slice_header(HEVCContext *s) } if ((IS_IDR(s) || IS_BLA(s)) && sh->first_slice_in_pic_flag) { - s->seq_decode = (s->seq_decode + 1) & 0xff; + s->seq_decode = (s->seq_decode + 1) & HEVC_DECODE_SEQUENCE_MASK; s->max_ra = INT_MAX; if (IS_IDR(s)) ff_hevc_clear_refs(s); @@ -614,7 +614,7 @@ static int hls_slice_header(HEVCContext *s) return pix_fmt; s->avctx->pix_fmt = pix_fmt; - s->seq_decode = (s->seq_decode + 1) & 0xff; + s->seq_decode = (s->seq_decode + 1) & HEVC_DECODE_SEQUENCE_MASK; s->max_ra = INT_MAX; } diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h index de861b88b3..9c8bcefb48 100644 --- a/libavcodec/hevcdec.h +++ b/libavcodec/hevcdec.h @@ -390,6 +390,9 @@ typedef struct DBParams { #define HEVC_FRAME_FLAG_LONG_REF (1 << 2) #define HEVC_FRAME_FLAG_BUMPING (1 << 3) +#define HEVC_DECODE_SEQUENCE_MASK 0xff +#define HEVC_DECODE_SEQUENCE_INVALID (HEVC_DECODE_SEQUENCE_MASK + 1) + typedef struct HEVCFrame { AVFrame *frame; AVFrame *frame_grain;