From patchwork Thu Feb 16 05:46:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 40413 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp244575pzk; Wed, 15 Feb 2023 21:50:09 -0800 (PST) X-Google-Smtp-Source: AK7set/uD4Mp3vFyY1aqUWwRvTNQwjlGKvLBITRiB9cfHB5QVIxtdwS5CF3/3UFNJ52ZQ0O7j3ag X-Received: by 2002:a05:6402:2046:b0:4a0:b554:c26c with SMTP id bc6-20020a056402204600b004a0b554c26cmr5730512edb.21.1676526609485; Wed, 15 Feb 2023 21:50:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676526609; cv=none; d=google.com; s=arc-20160816; b=LOeqOjoQSSiynDYlhFWhM0+D0QOpKdDlKQverPLbEJmT71ikiAmYp4TWNCkR9pr/0W 26m78DHVcyOI05NoI6wQJ4klJrBaYW3AulAztXVk8bjC12jtDd7lVCVh01EnyeQDAVXo 5CxLKhUNrokROIIkvKRXoMdqKDKZw1gEaoIfrARn3w/9/C8g26IxgIOwOFKIevG1C4z6 Xno918Oy5Rj6RiyFApyTVZTstEi+7FSVK9VucPOeO2/7niK6+S0AkmJ8RlEBOW/n3yjJ MlmMpfCLz3Fr0VqyMgvcfTkFz8G3mJR7e8Bs/4P6U3WzPaoZaIKOqTN2dzR+k61Sdp2A 7MZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=ykz2ND30EKoxTHIzzfnZx7q2CtBOA21zBz4wiOjLF1s=; b=HzRVtrnG5qYkL9ho5w1LtcLGyMzkw2AlUisziDVRonBnAW0qwrTbWtUeZIJtDAt/3j jnrQ6BGsPWv+AyPV2C7I+x4TSqgRtoU5K2BayHoMKQv8UGxNjjq9VQO0wIJrjY6nfLVV lz6JyBJbpsn9sLnndiB654g9eBAFBHwOuH8GbK/qELbvo+eWe3J6brq8fgpN2ztE7oBv UbTTbTcuYuRMgB9Nf9GxFIaGdTMgQOCDfhNHjV/zWHjXflxqKfyhom+C6lJYlwj0aFqC lav6/1YUVjL8yxpW75fK88Rc8s1OCn2xPXwChfwaXtgRMcvUIy2XD5qKxNa2BuOMX3nu eRTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=LSh0ngwV; 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 q25-20020aa7da99000000b004acd92379a7si1115521eds.60.2023.02.15.21.50.08; Wed, 15 Feb 2023 21:50:09 -0800 (PST) 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=LSh0ngwV; 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 DF24B68BF29; Thu, 16 Feb 2023 07:49:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0CF4268BF22 for ; Thu, 16 Feb 2023 07:49:16 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676526562; x=1708062562; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=x8ATO9dBZOURiBlDbQJVRcH+T+KLbK0xC6R15sV4wZM=; b=LSh0ngwVyFyOFVYb7u9RsFF2k56F+QTQzTNUBKA88zHILeZbhTQkh32S ykmU402htgvFXA/IncpJvXqULz9h+tS/ycnNzwgDxtZXb5NoRIaTcTfJA 9ufL7kGtEWYz2RB8RraHWs5U2Mz06u3pJwiIOTRmHWvk7+98ak7mg7wW+ 2itq7whN0PUehD6AzcvUTFZqTA7+OuFSN6A18m5oG8fJCJHv5aBIoHwSw tTDRye5aaF9EwpRljijlAg4e7tHajXQBflm6cve0AC+3tp7adFlVwwbqf e3/uXHGrXMqRN9PEcfvslP/TAks0I/H5YuY652CGYVpEtJmWcJbr9a/Q5 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10622"; a="331633187" X-IronPort-AV: E=Sophos;i="5.97,301,1669104000"; d="scan'208";a="331633187" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2023 21:49:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10622"; a="915547506" X-IronPort-AV: E=Sophos;i="5.97,301,1669104000"; d="scan'208";a="915547506" Received: from t.sh.intel.com ([10.239.159.159]) by fmsmga006.fm.intel.com with ESMTP; 15 Feb 2023 21:49:06 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Feb 2023 13:46:33 +0800 Message-Id: <20230216054637.159397-6-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230216054637.159397-1-fei.w.wang@intel.com> References: <20230216054637.159397-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 06/10] lavc/hevc: Update reference list for SCC 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9Vlv8iVeeIKc From: Linjie Fu Screen Content Coding allows non-intra slice in an IRAP frame which can reference the frame itself, and would mark the current decoded picture as "used for long-term reference", no matter TwoVersionsOfCurrDecPicFlag(8.1.3), hence some previous restricts are not suitable any more. Constructe RefPicListTemp and RefPicList according to 8-8/9/10. Disable slice decoding for SCC profile to avoid unexpected error in hevc native decoder and patch welcome. Signed-off-by: Linjie Fu Signed-off-by: Fei Wang --- libavcodec/hevc_refs.c | 21 ++++++++++++++++++++- libavcodec/hevcdec.c | 10 +++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c index 811e8feff8..96153a2459 100644 --- a/libavcodec/hevc_refs.c +++ b/libavcodec/hevc_refs.c @@ -322,7 +322,7 @@ int ff_hevc_slice_rpl(HEVCContext *s) return ret; if (!(s->rps[ST_CURR_BEF].nb_refs + s->rps[ST_CURR_AFT].nb_refs + - s->rps[LT_CURR].nb_refs)) { + s->rps[LT_CURR].nb_refs) && !s->ps.pps->pps_curr_pic_ref_enabled_flag) { av_log(s->avctx, AV_LOG_ERROR, "Zero refs in the frame RPS.\n"); return AVERROR_INVALIDDATA; } @@ -349,6 +349,13 @@ int ff_hevc_slice_rpl(HEVCContext *s) rpl_tmp.nb_refs++; } } + // Construct RefPicList0, RefPicList1 (8-8, 8-10) + if (s->ps.pps->pps_curr_pic_ref_enabled_flag) { + rpl_tmp.list[rpl_tmp.nb_refs] = s->ref->poc; + rpl_tmp.ref[rpl_tmp.nb_refs] = s->ref; + rpl_tmp.isLongTerm[rpl_tmp.nb_refs] = 1; + rpl_tmp.nb_refs++; + } } /* reorder the references if necessary */ @@ -371,6 +378,14 @@ int ff_hevc_slice_rpl(HEVCContext *s) rpl->nb_refs = FFMIN(rpl->nb_refs, sh->nb_refs[list_idx]); } + // 8-9 + if (s->ps.pps->pps_curr_pic_ref_enabled_flag && + !sh->rpl_modification_flag[list_idx] && + rpl_tmp.nb_refs > sh->nb_refs[L0]) { + rpl->list[sh->nb_refs[L0] - 1] = s->ref->poc; + rpl->ref[sh->nb_refs[L0] - 1] = s->ref; + } + if (sh->collocated_list == list_idx && sh->collocated_ref_idx < rpl->nb_refs) s->ref->collocated_ref = rpl->ref[sh->collocated_ref_idx]; @@ -541,5 +556,9 @@ int ff_hevc_frame_nb_refs(const HEVCContext *s) for (i = 0; i < long_rps->nb_refs; i++) ret += !!long_rps->used[i]; } + + if (s->ps.pps->pps_curr_pic_ref_enabled_flag) + ret++; + return ret; } diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 52fa627133..121ceb4e75 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -668,7 +668,8 @@ static int hls_slice_header(HEVCContext *s) sh->slice_type); return AVERROR_INVALIDDATA; } - if (IS_IRAP(s) && sh->slice_type != HEVC_SLICE_I) { + if (IS_IRAP(s) && sh->slice_type != HEVC_SLICE_I && + !s->ps.pps->pps_curr_pic_ref_enabled_flag) { av_log(s->avctx, AV_LOG_ERROR, "Inter slices in an IRAP frame.\n"); return AVERROR_INVALIDDATA; } @@ -3123,6 +3124,13 @@ static int decode_nal_unit(HEVCContext *s, const H2645NAL *nal) if (ret < 0) goto fail; } else { + if (s->avctx->profile == FF_PROFILE_HEVC_SCC) { + av_log(s->avctx, AV_LOG_ERROR, + "SCC profile is not yet implemented in hevc native decoder.\n"); + ret = AVERROR_PATCHWELCOME; + goto fail; + } + if (s->threads_number > 1 && s->sh.num_entry_point_offsets > 0) ctb_addr_ts = hls_slice_data_wpp(s, nal); else