From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id C2F94410E6 for ; Fri, 15 Jul 2022 05:08:19 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C59E868B823; Fri, 15 Jul 2022 08:08:05 +0300 (EEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A80468B632 for ; Fri, 15 Jul 2022 08:07:58 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657861684; x=1689397684; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6QuZ7C1cqsqWY2+u06uYI0FZIW1zLs332jpsA3f3dX4=; b=eqIqrXM3AdrSbABFJPOPO/OF2+drljsgesX19VFFlJuorp3BeKfMq4OY lhl0fFWWw9X9bWw5kOEdUWyUJdXkAdkoJw5S06oQ2y/IP2c/DqgNoBODJ JoM6u4Q5Kz3+dWo7fPd/eiPIXNrtzLZ4ZHeulSzcCbxdmN+7qkuUaBgRL V4od4XgpsKoFm/Ld/VxmnK9/hwZOn6BqmiDeTCSrhSbmfAtljO+Fghb3Z Ch/3uPPjTsxrf45eimauDFzoy8Gelt5rQ3KVB/6cwDCRvi5xPuL4T7txZ 6T0Eo5E6DmCxuvLiZLYvzhevBNuWwYy92HvNg6Pxa0xvhu0tMJ6MiA9vL Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10408"; a="265490996" X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="265490996" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 22:07:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="654183808" Received: from t.sh.intel.com ([10.239.159.159]) by fmsmga008.fm.intel.com with ESMTP; 14 Jul 2022 22:07:54 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Jul 2022 13:06:42 +0800 Message-Id: <20220715050644.879488-2-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220715050644.879488-1-fei.w.wang@intel.com> References: <20220715050644.879488-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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: Fei Wang Signed-off-by: Xu Guangxin --- libavcodec/hevc_refs.c | 16 ++++++++++++++-- libavcodec/hevcdec.c | 8 ++++---- libavcodec/hevcdec.h | 3 +++ 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c index 2b0468d6c4..5282716a61 100644 --- a/libavcodec/hevc_refs.c +++ b/libavcodec/hevc_refs.c @@ -173,6 +173,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_SEQUENCE_COUNTER_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) { @@ -233,7 +243,7 @@ int ff_hevc_output_frame(HEVCContext *s, AVFrame *out, int flush) } if (s->seq_output != s->seq_decode) - s->seq_output = (s->seq_output + 1) & 0xff; + s->seq_output = (s->seq_output + 1) & HEVC_SEQUENCE_COUNTER_MASK; else break; } while (1); @@ -419,7 +429,7 @@ static HEVCFrame *generate_missing_ref(HEVCContext *s, int poc) } frame->poc = poc; - frame->sequence = s->seq_decode; + frame->sequence = HEVC_SEQUENCE_COUNTER_INVALID; frame->flags = 0; if (s->threads_type == FF_THREAD_FRAME) @@ -463,6 +473,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 f222f20706..6544171cf0 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_SEQUENCE_COUNTER_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_SEQUENCE_COUNTER_MASK; s->max_ra = INT_MAX; } @@ -3266,7 +3266,7 @@ static int decode_nal_unit(HEVCContext *s, const H2645NAL *nal) break; case HEVC_NAL_EOS_NUT: case HEVC_NAL_EOB_NUT: - s->seq_decode = (s->seq_decode + 1) & 0xff; + s->seq_decode = (s->seq_decode + 1) & HEVC_SEQUENCE_COUNTER_MASK; s->max_ra = INT_MAX; break; case HEVC_NAL_AUD: @@ -3741,7 +3741,7 @@ static int hevc_update_thread_context(AVCodecContext *dst, s->threads_type = s0->threads_type; if (s0->eos) { - s->seq_decode = (s->seq_decode + 1) & 0xff; + s->seq_decode = (s->seq_decode + 1) & HEVC_SEQUENCE_COUNTER_MASK; s->max_ra = INT_MAX; } diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h index f6acf845ae..542adcf593 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_SEQUENCE_COUNTER_MASK 0xff +#define HEVC_SEQUENCE_COUNTER_INVALID (HEVC_SEQUENCE_COUNTER_MASK + 1) + typedef struct HEVCFrame { AVFrame *frame; AVFrame *frame_grain; -- 2.25.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".