From patchwork Tue Jun 7 07:08:28 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: 36082 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp6703271pzj; Tue, 7 Jun 2022 00:15:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwSxB5uCgEt0DoNgatmoUbo6HkZ9zdKUV1Frhno4F9qdY2t1NlWNt/CJolTPOCxCt76epYJ X-Received: by 2002:aa7:c846:0:b0:431:6c7b:26af with SMTP id g6-20020aa7c846000000b004316c7b26afmr7781816edt.123.1654586145987; Tue, 07 Jun 2022 00:15:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654586145; cv=none; d=google.com; s=arc-20160816; b=tvHkLyq2cMcp/DHWtaGcjWyGWw0HFMSMts/rch6QvaRvMuViKXv0IjyJraJk9ZsP5u S0edCk7FEHqNszWB1s42xkRjpEB9A8mo9e8XPNbtgkXNMAw3y3sM6jTAZWXVsOw8Mys6 lq48elK+lpqbG9CYTi77CFH8aWgyOHVaVy6p1X/q++JNUIzU06Av4ue4lXuZKd3um4nr +fsHHDtj4k6uJq6BgmqnpR2r405nP0qqVeDpxRcdVWvKWoE+yflpBh6nb3ZnEEsqdaHM VL/3Y+N7T/KosEGkygwvzGE33ctpTCUfBy8UP2xAx+ayzEiBO5/ZyrfE5H6v8YsysCvD SV6A== 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=OduykDmwNne9+FSU6l2OaBwzTFpeNpcbn53zbfiP9K4=; b=yAlSFMF2QRhLkFn9jRU50E2k8dsQ+5I1PUTSlrAAIahpYBkBKdSx6dhpRb/7ltOGmE 4dXYlsI9W5H05t1pyr/HIJg2sfym2xTCmP9lmYHz+yxrQ4C9UIo9MxFuRu81iQDBcGWD qsCHria0GoHYEBKiOSxpf2unGXiGljLAKOqiJQgI4eU0FtWW/Mj0N7G38BDV257m1gIz CtqkyEhbgqNxOp81oyscsLCorDY7oP66NEGEH3BSkTudJMk7ku10k1qB4CaOjV/zl3WE r0Q9ST5zXNPCySm/H7PBZ8zn7284CCknJQcbgEtzL50t+uolMr2vWN6MxVUhVp54uSb9 LkHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=BqNA2nzw; 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 sd18-20020a1709076e1200b006fee96599b6si18018023ejc.629.2022.06.07.00.15.45; Tue, 07 Jun 2022 00:15:45 -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=BqNA2nzw; 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 5D8EE68B5E4; Tue, 7 Jun 2022 10:15:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7DFA168B59E for ; Tue, 7 Jun 2022 10:15:24 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1654586129; x=1686122129; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zHiKRnLyo72eg9bE4NzGgWeRON3yHbW6uhAGv4zIEZo=; b=BqNA2nzwDIpuN8+vbR2ewL90XSldT6kNgi+KDzuWWKnb+n3Rl5zj6wkN xyIURMD7hvz9cuC3mP9xd87AHXCR5pPTKUxYJySqk5inoVP848+0ehNgC wvwCXiwIId8MbQJIq9w6+QGHEWb8Ed8ylT+KfNlmVfYBflK50BaxwS7bC RyDie4cM7gufOSKmrK81sVl98fOgFllVSlEQ+jnpzTQvIVw/+dL1JKjIM yorLFm5pdfwo87GBYhITchT//AmGvC273x0IlgsTvbN9rLIb/mbY9CgHs aOuz+YHoSpIprhtPU2adSAy8aBt3p+RsR7gCovUcPHPMRjtiwE9kED/jh w==; X-IronPort-AV: E=McAfee;i="6400,9594,10370"; a="337975028" X-IronPort-AV: E=Sophos;i="5.91,283,1647327600"; d="scan'208";a="337975028" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jun 2022 00:15:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,283,1647327600"; d="scan'208";a="635988901" Received: from t.sh.intel.com ([10.239.159.147]) by fmsmga008.fm.intel.com with ESMTP; 07 Jun 2022 00:15:19 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Jun 2022 15:08:28 +0800 Message-Id: <20220607070830.2654218-2-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220607070830.2654218-1-fei.w.wang@intel.com> References: <20220607070830.2654218-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1 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: Q3DXCCS54AY5 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 | 13 ++++++++++++- libavcodec/hevcdec.c | 4 ++-- libavcodec/hevcdec.h | 3 +++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c index 3f8fe1ef18..3ea2fb6c0b 100644 --- a/libavcodec/hevc_refs.c +++ b/libavcodec/hevc_refs.c @@ -172,8 +172,19 @@ 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) { + unref_missing_refs(s); 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++) { @@ -418,7 +429,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) 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;