From patchwork Tue Jun 14 01:22:59 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: 36212 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp801125pzb; Mon, 13 Jun 2022 18:30:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxjmnEwyk8TrdHDQYv1EFB1a8K2kLLnRFbejW26F34JVFsGU7vqn0En9wOltOsczUEFNmJv X-Received: by 2002:a05:6402:c08:b0:42d:d005:13c1 with SMTP id co8-20020a0564020c0800b0042dd00513c1mr2934154edb.187.1655170208422; Mon, 13 Jun 2022 18:30:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655170208; cv=none; d=google.com; s=arc-20160816; b=DGF0iDVizXg5Mq24QwodoNWl0Wzrv9Aqi3MUrVpN/kN8CMlI5UFjHUvOzGn44BGC00 CEHvip5w7Gl0J1yp993QYpawT+/fN8zAT25lchvDrn9fLjQRXde1L3OAJ72r9Jn6jrl6 s2Og7gGKSy8mtphFhBMKz0yFQGQ77y2JXHbyJF5bGzsNVRE+jSYxoJNTNGIjI1I9RXIR 7/EEReq1G8Rg3/qE4H2bft7GSKyjDgsUSgbc/a2wjAhG/yeVwYrGMpH4/hS82U2TorIz Q9jkpf6Kf6eYKAHIFWUl0sXRDT0DsBjb0G8IVA5ITZrTi4VOlZWbKV8kNbTMy661w/2B 6vBQ== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=Yy+E2lqTNX1xJZTnxGqeCIKXYchh8GwE4hMp6j4KHzo=; b=e9z1dvVQbSdXkY3gyM+2WuA+QBE9JDsfdXAbUgF+j80MzexITqcbUY+WbmZU74Nyv4 us7kOy1hToYqp61xQFqeaEZc0b7x1drHkGeywJQKmVRj+T0oykg+9khzQ5bTRmSqKFa0 FFs1ZyqeTQhfn/IZpfyzKcFAC89SxXeulLIhj/36a7OOr29++Q5bhEg4Lec1tMkstUD3 sucGz67QMRariLJOl5OoepAGc2C390RKdcGsJUGEqjoUS6H08dCvTzJ9zk2UX3c0pSFX y/W2QwSWD5uW/GY39RHnlhep7YAfPZu1+iZSKKyTteRt+FJoJeZEDIdBiKLjaXANVmnG 4URQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=LNaUPKaV; 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 gn23-20020a1709070d1700b006f379d6f423si11137910ejc.582.2022.06.13.18.30.06; Mon, 13 Jun 2022 18:30:08 -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=LNaUPKaV; 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 33C1F68B62B; Tue, 14 Jun 2022 04:30:03 +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 8BFB668B41C for ; Tue, 14 Jun 2022 04:29:56 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1655170201; x=1686706201; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=06lzTtdsFH5PcJcBKVEex75VUU62tdIpDCcqCKrfJp8=; b=LNaUPKaVr5nZximc1ikMilfs1bB88uv8fhqQoypDhfJvvzYsClWef6Ej rVVHPFM6Lj/XRLuu4QXUsYJ7hFhWWA7D5wsBN5kjN4CgCQN5dRxzeSNNu pofAV+zol52xE/DznJCBt+brvxgqYKldlV06zvmYXa3QMXyubHFP0UN5v 8Itt+vMM8RRTFBt7xCCw9/CgVps4M542RbbxzxDESn+e7g2ycW869bls7 HEyy8ImdqGsyZZGA56BGLfWr3q75FUeP3Wxn+dgzuSMYCT2v1zndCqaz5 bFNSOjpXC72//cWxQxZVq0a3T5d4BMUSj3gBQaVqj1PDcryWCiooIQ5KT A==; X-IronPort-AV: E=McAfee;i="6400,9594,10377"; a="342432952" X-IronPort-AV: E=Sophos;i="5.91,298,1647327600"; d="scan'208";a="342432952" 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:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,298,1647327600"; d="scan'208";a="686378049" Received: from t.sh.intel.com ([10.239.159.147]) by fmsmga002.fm.intel.com with ESMTP; 13 Jun 2022 18:29:50 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Jun 2022 09:22:59 +0800 Message-Id: <20220614012302.2808428-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/4] lavc/hevc_refs: fix dpb logical for IRAP 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: 26CmI7QoUPW9 From: Xu Guangxin 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 Signed-off-by: Xu Guangxin --- Update: 1. fixed segment fault for some special clip in 2nd patch. 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 fe18ca2b1d..3f8fe1ef18 100644 --- a/libavcodec/hevc_refs.c +++ b/libavcodec/hevc_refs.c @@ -174,21 +174,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) &&