From patchwork Thu Jul 9 16:17:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fu, Linjie" X-Patchwork-Id: 20921 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 4E170448445 for ; Thu, 9 Jul 2020 19:25:09 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 398C168B58A; Thu, 9 Jul 2020 19:25:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CBA6B68B464 for ; Thu, 9 Jul 2020 19:25:01 +0300 (EEST) IronPort-SDR: oh/En18djknrkWbg6ubjYkCyBqsFWxHDOAoJGVgLSVLKMKF4CcrlKyCtl1xgPiy+g9WLRtLN1E PE6SA6Q8ZMRQ== X-IronPort-AV: E=McAfee;i="6000,8403,9677"; a="145529153" X-IronPort-AV: E=Sophos;i="5.75,331,1589266800"; d="scan'208";a="145529153" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jul 2020 09:25:01 -0700 IronPort-SDR: tkriKCTBrBdQ9vNp8kkpkw/IAOEPJ32DiX/BHde+XPKV+PvoJdR4KaqDkEEYtXcELb2PhkKr8A G73diUrrMcWg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,331,1589266800"; d="scan'208";a="483859450" Received: from icl-dev.sh.intel.com ([10.239.158.73]) by fmsmga006.fm.intel.com with ESMTP; 09 Jul 2020 09:24:59 -0700 From: Linjie Fu To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jul 2020 00:17:40 +0800 Message-Id: <1594311460-10498-8-git-send-email-linjie.fu@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1594311460-10498-1-git-send-email-linjie.fu@intel.com> References: <1594311460-10498-1-git-send-email-linjie.fu@intel.com> Subject: [FFmpeg-devel] [PATCH 7/7] lavc/hevc: update reference list for SCC X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Linjie Fu , Linjie Fu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Screen Content Coding allows P slice in an IDR frame, and would add frames themselves to the short term rps in RefList0 (8-10 in spec), hence some previous restricts are not suitable any more. [Request for comments]. Signed-off-by: Linjie Fu --- libavcodec/hevc_refs.c | 21 +++++++++++++++++++-- libavcodec/hevcdec.c | 5 +++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c index 4f6d985..13a7bf6 100644 --- a/libavcodec/hevc_refs.c +++ b/libavcodec/hevc_refs.c @@ -301,7 +301,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; } @@ -328,6 +328,12 @@ int ff_hevc_slice_rpl(HEVCContext *s) rpl_tmp.nb_refs++; } } + + if (s->ps.pps->pps_curr_pic_ref_enabled_flag) { + rpl_tmp.ref[rpl_tmp.nb_refs] = s->ref; + rpl_tmp.isLongTerm[rpl_tmp.nb_refs] = 0; + rpl_tmp.nb_refs++; + } } /* reorder the references if necessary */ @@ -423,7 +429,8 @@ static int add_candidate_ref(HEVCContext *s, RefPicList *list, { HEVCFrame *ref = find_ref_idx(s, poc, use_msb); - if (ref == s->ref || list->nb_refs >= HEVC_MAX_REFS) + if ((ref == s->ref && !s->ps.pps->pps_curr_pic_ref_enabled_flag) || + list->nb_refs >= HEVC_MAX_REFS) return AVERROR_INVALIDDATA; if (!ref) { @@ -482,6 +489,12 @@ int ff_hevc_frame_rps(HEVCContext *s) goto fail; } + if (s->ps.pps->pps_curr_pic_ref_enabled_flag) { + ret = add_candidate_ref(s, &rps[ST_FOLL], s->poc, HEVC_FRAME_FLAG_SHORT_REF, 1); + if (ret < 0) + goto fail; + } + /* add the long refs */ for (i = 0; i < long_rps->nb_refs; i++) { int poc = long_rps->poc[i]; @@ -518,5 +531,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 fc8a77d..d7a10c4 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -617,7 +617,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.sps->ptl.general_ptl.profile_idc != FF_PROFILE_HEVC_SCC) { av_log(s->avctx, AV_LOG_ERROR, "Inter slices in an IRAP frame.\n"); return AVERROR_INVALIDDATA; } @@ -729,7 +730,7 @@ static int hls_slice_header(HEVCContext *s) sh->rpl_modification_flag[0] = 0; sh->rpl_modification_flag[1] = 0; nb_refs = ff_hevc_frame_nb_refs(s); - if (!nb_refs) { + if (!nb_refs && !s->ps.pps->pps_curr_pic_ref_enabled_flag) { av_log(s->avctx, AV_LOG_ERROR, "Zero refs for a frame with P or B slices.\n"); return AVERROR_INVALIDDATA; }