From patchwork Tue Jun 7 07:08:27 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: 36081 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp6703189pzj; Tue, 7 Jun 2022 00:15:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyq4hq22N3nI303ggzfWSYbLnEg8N52UnDo42cMB7H5K2m/FQbUfGQHJiqTkptiOO6XwALA X-Received: by 2002:a05:6402:d0a:b0:425:d455:452 with SMTP id eb10-20020a0564020d0a00b00425d4550452mr31341852edb.259.1654586136196; Tue, 07 Jun 2022 00:15:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654586136; cv=none; d=google.com; s=arc-20160816; b=G/RdYY1hSbFPbVZHT+PITEk7ibn52HRrFTzdg+Tzlv2XYsWHGMTt0sgHferWotmP43 iYoPE5z0KNNXWt/xV0v5ILPCGhsw2oPvuEz9J8I3L/7zS2/zfnnckBc4q5m+yE5bYK/1 nbmGeQekXLvMcYG794gPpmiQ+89JipTTLb5WQNPbDkyi0g589B8/7gkHo0DNm+5QRIku ua3GJ5tf5tmBvbOZSRLZJA+77XncFAPtTG9ezjnwJ6Ry6e4vVNsWst7cKtgZxiZjOLLt ACESS18j/R0bPture85bLqvRhqDxz0+/T5CyG/FObZ4d41XlfirmIVKKNTBJJ8aIyKGp W6TA== 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=SN0RZNXtJLitCYV+8cWnPsK29u68g0dMN60c5JoVrGY=; b=cC9Kk6HMS6EXXWOlsqEB1V20gDCnumjsqyWloM+/UPgCO5CqutyLGco55visvv/cs2 UzHnxtYIl462wU41Y4G/5uANtQM7Ax/3eAnikhiFK2pgRTvJ52B6T28lAy6WUT46+Eme 2n3hLN0Fd5u1K5yU57II562gUMyAuQEtZHI9Ra2Km0vwIgT8vSygiUjrZ4HU81W2tq0l O+JdsfX4aCOmj5UyXl8Lqvru6LIf+jGPj2hUGS38dy3WIfoM/EnZUUmDOO4H35yKqtcu NWNf4x7awy/CPLGUy+3QbY2wCRRugLOYur4LjpK3sLzgi3B+JlDvBTlYtT7ltas/cYj8 +Apg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Nh6cB3Ym; 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 js22-20020a17090797d600b00708884b555asi10180817ejc.392.2022.06.07.00.15.35; Tue, 07 Jun 2022 00:15:36 -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=Nh6cB3Ym; 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 7B5A068B5C5; Tue, 7 Jun 2022 10:15:31 +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 D372768B1CE for ; Tue, 7 Jun 2022 10:15:22 +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:mime-version: content-transfer-encoding; bh=i1hTfsAv6M+/09PVYvg6p13r3YyGzyNyi8eCI1KNLmA=; b=Nh6cB3YmChv6AkZchgcalTVJPhe3RZ0/3SM6dibXfs3CkFAgtF8y9ghX FbL9kQWXHim3q+V8ElZI7iO49B0W1PKnIIJqRCZIG1OT3DWlAcjrLoh3b XdW/hBii0I+Ay4/qfDyiEX9zwgHedcmROSCZoTXZwYWsJmKX+iz7yI9Rf 8C+invDMGAoM+FRaNCbk9hsRAwB5WOnJ0azKfCE9h4QLsDYzHN8HQjrh3 8lMR7wjJ3TwD6hr/2uTRt6mkOoONOQNuAMCuNCKXrL5q944m7BtFJ4E21 C9z0lGnQE7HBwmInrnHRTicIIaYZ3I0OTjIaJw2y8FrTDLJoqrc7Q3LdX Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10370"; a="337975023" X-IronPort-AV: E=Sophos;i="5.91,283,1647327600"; d="scan'208";a="337975023" 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:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,283,1647327600"; d="scan'208";a="635988869" Received: from t.sh.intel.com ([10.239.159.147]) by fmsmga008.fm.intel.com with ESMTP; 07 Jun 2022 00:15:18 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Jun 2022 15:08:27 +0800 Message-Id: <20220607070830.2654218-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1 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: vBz/dvhsIuqn 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 --- 1. Tested the patchset with ~1000 different kinds of clips and get a positive result, without any regression. 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) && 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; From patchwork Tue Jun 7 07:08:29 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: 36083 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp6703315pzj; Tue, 7 Jun 2022 00:15:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyh7e+rVrn66gmhvb3BITCfntHaRyaH+tCk+I1cC05zjKxocLpDb8RgWjTIkm2uhyoe9h29 X-Received: by 2002:a17:906:2316:b0:711:e7f2:a33 with SMTP id l22-20020a170906231600b00711e7f20a33mr72565eja.726.1654586155955; Tue, 07 Jun 2022 00:15:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654586155; cv=none; d=google.com; s=arc-20160816; b=iAYzKYgCQJXwFlBV+EnlGNKtMyACvotqYd2wH8MfbszjsFmbPu/xFQzLlFRhX9QaCM aukWh5oprYJr3+zMaZ/50TenEXOz0q2OJP/wIK0zWRan9Rcdo3gSRz8TUjgtwemmq7zn ga+C1rUw1qqZFchFCxaDXa/tDrzleKo/TPPY0MkaEheKKhQPWcvp4SoVax9qwLbXxo4y ExSorz2vNCev6koWuV11dODV5S8WXgzajyBLUWSAYX/MyqLzqIMckZR3jSUYLb96gYm8 8ymqk2wJiGlSBQnMih1qoK+8ikxWtI6s0oDvr3/Nu7qm3HXOyBo/51eQUFhAoMldsS7u lhoA== 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=EOZ8Uv3i/B09xoyYPjZazaQ3hyFWeyj+gbVvYXmPVEo=; b=m2LIRWdKItBHjWP6YfuKh71OR5iVGrXOB/H9D1dbNVKie+WY+4CL9ZZdzi5IKXKcSP 7t0MsbC9TRj11iGRDRvXOGkv7Zgbgmzk+SqymroVpVjJ4C+XtAKAJVJ2PxM6bFBWHo3i SngWQLXH/h067ss6DlmFYOkQce9j+qSZ51nrLgEuoHdIVQJnjb51g3kJwOwi88F9CwRQ 4X2go03wRabfzj3TGh6Fc2quz7PggjZm0Cj9vdGeMVY2TrtglJnfBFYNCzotA3NjTrgh WVSRxzIYzSQCzX0oKuV/cU7eOHxpBF1js25qCpVRwN7kJtXYi6eEj4B/lPlVoUkls4pj zpcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=eSo7KuHU; 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 z70-20020a509e4c000000b0042dd79e606fsi12585395ede.478.2022.06.07.00.15.55; Tue, 07 Jun 2022 00:15:55 -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=eSo7KuHU; 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 4B33068B5AE; Tue, 7 Jun 2022 10:15:37 +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 2354A68B5AE for ; Tue, 7 Jun 2022 10:15:29 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1654586135; x=1686122135; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=HngGoGa5MSvythMXPwrNqCaAFNc/UpEMGVnVsgVih20=; b=eSo7KuHUCh/7YBs2ttM/6866lWjmYFaKwAuHC3MQxw+Bzf3n8EDe+znR Nx4Nh1asN5A2u1STXxkCMG+7Gyz/GAQnEZfhlosDzet8GDvQmIcNYkbGD i+82fs2KxI9jJnAkojJprKLSvtF2t3/4QhP4zpLYEFHxfrIlDTWbFnbPm psYgCWvriNh593l00cyclChpDp8GWvFr9f+idSgxB5X99NdKUFc67aJoz JYi9ykW0UcMMuJAzzkowk0KRFZ2Hlc26QLSEncBxV6GiDjFwJJ8LvSJQT EFLBvk4krXTv+iWQenJp0JCCb259Y+2llj/eB7UemrrsYMbwFhz7oqcrz A==; X-IronPort-AV: E=McAfee;i="6400,9594,10370"; a="337975037" X-IronPort-AV: E=Sophos;i="5.91,283,1647327600"; d="scan'208";a="337975037" 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:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,283,1647327600"; d="scan'208";a="635988933" Received: from t.sh.intel.com ([10.239.159.147]) by fmsmga008.fm.intel.com with ESMTP; 07 Jun 2022 00:15:20 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Jun 2022 15:08:29 +0800 Message-Id: <20220607070830.2654218-3-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 3/4] lavc/hevc_refs: exclude current frame from long term refs 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: UBqLWFdC4rcn From: Xu Guangxin suppose a. You have 3 frames, 0, 1, 4096. b. The ltMask is 0xfff and use_msb is 0. c. The 0, 1 are lt refs for 4096. d. you are decoding frame 4096, and get the 0 frame. Since 4096 & ltMask is 0 too, even you want get 0, find_ref_idx may give you 4096. add_candidate_ref will report an error for this Tested-by: Fei Wang Signed-off-by: Xu Guangxin --- libavcodec/hevc_refs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c index 3ea2fb6c0b..7b106e31d7 100644 --- a/libavcodec/hevc_refs.c +++ b/libavcodec/hevc_refs.c @@ -387,7 +387,7 @@ static HEVCFrame *find_ref_idx(HEVCContext *s, int poc, uint8_t use_msb) for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) { HEVCFrame *ref = &s->DPB[i]; if (ref->frame->buf[0] && ref->sequence == s->seq_decode) { - if ((ref->poc & mask) == poc) + if ((ref->poc & mask) == poc && (use_msb || ref->poc != s->poc)) return ref; } } From patchwork Tue Jun 7 07:08:30 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: 36084 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp6703367pzj; Tue, 7 Jun 2022 00:16:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJvC+ZWO4qK/14AFOG09Qu9knc19sK7Yz052fUKFeBaKtpRGm13AuOuAIShon5uCXGu0NC X-Received: by 2002:a05:6402:f:b0:42e:561:a1c0 with SMTP id d15-20020a056402000f00b0042e0561a1c0mr31971025edu.309.1654586167410; Tue, 07 Jun 2022 00:16:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654586167; cv=none; d=google.com; s=arc-20160816; b=Y1Q6uxel2sM+oFzJiuRMjDhttuUPlQol4IHENCSu0E+fWdutAPvvPvOWNy8B7KCc4T BRHNb3AyYtvuErUCWO2/fpGsdsU455j/qffRCy8OCbc9CU5J6n5wvlEwhZO5Dy8zOvU7 xdZg+4mKTIY87VbA1dg02XsO+Mr/HkviRzEj2njdjNrMcpljqOdPckH70qg7jjngS5KW laXBkLKVRAovaadTVIAT8hSZCoIHsc+zWQ405tMiL2gwLWAY7jA+1LcU81bGQqyo30ek ZSVvYbcvfQndYGMlRBY0RzG+nJ+s4DKx5gstSL1f3n9l0HBla/UI0MqeoZYFFQw/OtwR wAgA== 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=bp4Ct9aqTs/zdLEot0OIroNrETDduwmwo1Ml8UDOUGE=; b=RrTbiGKXfEG8U1m/9uC5VTR5+6v9dSNAdWH4hhmEaD9O6T9ovhiTtJG3wap1CmBB9N 9dswI//ZIm1ijb5tr4QTG8BZPmMzlSJOVOMlfQnvToTG0j9zdWEbUc0DpC16+Yp+g+K0 8qu/vq+xFm8HIdJwNkQMFCh1Kcc3LqT/8uUlB4tk+iVdX/LriMNe1lrWxTkx3D9YdB84 XWcq7jerk3CDIhhOvWwQuWV+ivm408pyCIOe4nPdsKiMvtbMOMbzIm5OxprmwoMQj6fK aU4B772mMSIwqavEkIewzxfR7Ozl+c76iHx6Jxi5x1lzdVR439F8J2dzBZy6TfQ769Lh v0hQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=bApO5Ak8; 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 hg3-20020a1709072cc300b006ff05f85ac7si14979700ejc.381.2022.06.07.00.16.07; Tue, 07 Jun 2022 00:16:07 -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=bApO5Ak8; 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 3EE9068B61A; Tue, 7 Jun 2022 10:15:38 +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 A582368B5BA for ; Tue, 7 Jun 2022 10:15:30 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1654586135; x=1686122135; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zrfoRLnOLbzuKy/UCGBhe1ch8MZKZ3opJz0TucHgacQ=; b=bApO5Ak8xtfprbfkWXByJcnOYAZ2N8hAADq+sFBMJ/4Iof/DxipOfPaq qw0axfj13iUmcGIRTsJsqfgigy5+K1yJvWOQh2OpKQN+7qbfB1SNfD9J5 Uc1rhUo+Gv+mhWAe59Z0ImEYQhc5dPw6jmiUedSQqLvDvL3r+45kT/mK1 6nedg1xiBYJUebgRDrtBu9WOCSVogLHIIpv5zTFkNvM66yjoyinUClxel 8EoAznjkuvt8KJlV4NpZQzFILHXmTVZ1WloCsqSrL8ULs4voCXYmeiSYt +YNaZw5mxiJ0CJ9ECtM1uRfue2hpiu36Xt9RvZd1McLAgymJaQcxKtKzv g==; X-IronPort-AV: E=McAfee;i="6400,9594,10370"; a="337975057" X-IronPort-AV: E=Sophos;i="5.91,283,1647327600"; d="scan'208";a="337975057" 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:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,283,1647327600"; d="scan'208";a="635988953" Received: from t.sh.intel.com ([10.239.159.147]) by fmsmga008.fm.intel.com with ESMTP; 07 Jun 2022 00:15:21 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Jun 2022 15:08:30 +0800 Message-Id: <20220607070830.2654218-4-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 4/4] lavc/hevcdec: respect the value of no_output_of_prior_pics_flag 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: rEfNMUOGd60q From: Xu Guangxin Even resolution or number of picture stores changes, we still need follow no_output_of_prior_pics_flag in next IDR. Tested-by: Fei Wang Signed-off-by: Xu Guangxin --- libavcodec/hevcdec.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 99785aa5d1..b0317339a2 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -594,15 +594,8 @@ static int hls_slice_header(HEVCContext *s) if (s->ps.sps != (HEVCSPS*)s->ps.sps_list[s->ps.pps->sps_id]->data) { const HEVCSPS *sps = (HEVCSPS*)s->ps.sps_list[s->ps.pps->sps_id]->data; - const HEVCSPS *last_sps = s->ps.sps; enum AVPixelFormat pix_fmt; - if (last_sps && IS_IRAP(s) && s->nal_unit_type != HEVC_NAL_CRA_NUT) { - if (sps->width != last_sps->width || sps->height != last_sps->height || - sps->temporal_layer[sps->max_sub_layers - 1].max_dec_pic_buffering != - last_sps->temporal_layer[last_sps->max_sub_layers - 1].max_dec_pic_buffering) - sh->no_output_of_prior_pics_flag = 0; - } ff_hevc_clear_refs(s); ret = set_sps(s, sps, sps->pix_fmt);