From patchwork Fri Apr 19 13:47:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "mypopy@gmail.com" X-Patchwork-Id: 48168 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c906:b0:1a9:af23:56c1 with SMTP id gx6csp635290pzb; Fri, 19 Apr 2024 06:48:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUVuUTm1PkD8ucViliKaED3PI1bsJBGlsceDkKtv9ebw70Dg6/fnlrieMD8g2xhKfQ4em4CLOKwEH5xoq1PknCB72chX4xAtVxt1g== X-Google-Smtp-Source: AGHT+IE5qNZankKwcfvlN1UjWVR/RZg026COzetusxJXlueZHQmRT35veG2zKvst3J8n4gLWuPBJ X-Received: by 2002:a05:6512:475:b0:518:d1f2:5d3a with SMTP id x21-20020a056512047500b00518d1f25d3amr1290857lfd.4.1713534485967; Fri, 19 Apr 2024 06:48:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713534485; cv=none; d=google.com; s=arc-20160816; b=VZW/cxTlLDL/1pF2CuAGAw8A58A92n7bimWbqQ2/Dql2pCVaraKOl1UP5Ofv3l0A0r ksxjYPbSngnPzW863svTAJj2HH8lvFJkOKT//NmcRmfAyOSQNiAzHG1MSx08xrGWi5gH 9YWn4zOTPKgFimIGkBqWFF2aylKKLhyWFBDndI6w+/YcFNsKMKYFZwF2RMFePxoc1jxT xoEc0r3X9LY62h8iI29ywRuHGA2OYb3WYj3KYgcyEBC5vZOzzF0Y4nXCQO8PU7XzZl+C N0hYaqy3LUAtqS8vi86IwPttMmaMEN0FHYO1wBm9Ye70vs/za/XOL7IaLsV2RVAaEVC7 Ewqw== 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=vQ07HXoo4afs8f75vTwX+zcElFFHv0FRImxcMH92SWA=; fh=7d7ZqKtSc+29ISlXjIr0lG2/islI9x9KuUKb2cUGiHQ=; b=THiXFJOr5+C6A5iw5FIhF7+8tD+sDFsFKGiIqt1+YAefhooCsCR4UeB8jJ0JMw3JZ1 /KNcWS7TjA93nRGJZSlpb8l3w5pTAZEFeM88yIHD7Dxe4KwfNAOc1v6+ueZ1wFOzD+zU GZhOkQRdFnJVEz+VHshe29dfC/dVqo6tN8YzgeAc1V08oY+U5fMLbaTfGCUb1KyNL9Al y7gNY6v8AQpvN8dYtA+pFLZWLc5Upj22QJWPFNkl9sHwsBh4iVHVDIUvotjkmKF5A6az GwSVODKnMv8Rx5f7K5Ol6ODswciiB/YlGqg8mcDNwcFHJbRi5lj7N4wRbrnCh3TYSJ4s pZDA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=nCXqov6v; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n18-20020a05651203f200b0051895943fbdsi1157063lfq.499.2024.04.19.06.48.05; Fri, 19 Apr 2024 06:48:05 -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=@gmail.com header.s=20230601 header.b=nCXqov6v; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5C7B568D32C; Fri, 19 Apr 2024 16:47:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 70C4868D3A2 for ; Fri, 19 Apr 2024 16:47:32 +0300 (EEST) Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-34a00533d08so1398512f8f.3 for ; Fri, 19 Apr 2024 06:47:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713534451; x=1714139251; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=P10XzD8UAFkWbN7vPVl1bRl7WISsuEM8I9ym4HvwVao=; b=nCXqov6vHOiF2Ch8nae4f6tHiHaFAm6WAbaaf5hztWyY3yXHGunx6UxDeLKhe37HP4 RO56l/t8XQr6UFnqwXk6zPFmCuhyHmepVF5U3PjSadCp6ckv/IQsK/b2J+7V7AsYcWjs v/HlOFGiNuFYCAzojL4zW8VLY/I/6trF6gCumE1TH/Z32mfat/1Ux7leAb7vs9TH3PQH rpx00wRK2aSpRIpUO56hAVqApcAPiubCnDyOga5CIW8Tr6/xMOM92vlbQnobHns+Rgas utOcdNnJfm+mShgM94kSEPs2ceLz+8tIH5YpT/EZ1O0VZY0xBis93cpn7AkmK1vxhxyA STCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713534451; x=1714139251; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P10XzD8UAFkWbN7vPVl1bRl7WISsuEM8I9ym4HvwVao=; b=TUTdXg3yhJb/9YxrW/XLL4kBbnwsZTdgGCi/XW0q7OhBkKyqSTXkDz1pcRuMqmfb6M d8vggC3CCtc5dGFACKVhaOLqTDux6Wp4gRiC9T12BpeRyXrhZBwnuFgQNzL5RSUCWU7I 3+JEHtZ5Pu3uWmDE7q/30mqrBirr0T/qetP9w7OZDsLEkACox0naepFV3Z1jyzaTdPAi cEvOU15KF2/Gvs1j4rD7DSha/HStzvIP/dT0jOJNmwbWhRGwTaFEFUTyRWqqUpVjvsUj 9+tS3sLYJ5iyhazMofFAnbEjWoVq5zS2FUBfUjTLRhGZW5v8uz7LHVmZrKkgUjvOba/Z aukg== X-Gm-Message-State: AOJu0YxEjf8bRIBhDLNaUs2e6CKA8c1QlPy2Ck0JhwpBQkTAJOlEdstp rEmhxTZCa7e/H0mIwROQq3iQOrTIA/qPkZB9Id2+p6FHcoiVniviSsYjTGfywFw= X-Received: by 2002:adf:e68b:0:b0:346:ef6f:562b with SMTP id r11-20020adfe68b000000b00346ef6f562bmr1904172wrm.53.1713534451486; Fri, 19 Apr 2024 06:47:31 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id d1-20020adfef81000000b0034a7a95c8cfsm519373wro.9.2024.04.19.06.47.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 06:47:31 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Apr 2024 21:47:11 +0800 Message-Id: <20240419134711.3824735-4-mypopy@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240419134711.3824735-1-mypopy@gmail.com> References: <20240419134711.3824735-1-mypopy@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] lavc/vvc/refs: Use dpb_max_num_reorder_pics to control output 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: Jun Zhao , elinyhuang , Jun Zhao Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8GewFEPsIANG From: Jun Zhao Use dpb_max_num_reorder_pics to control output instead of dpb_max_dec_pic_buffering, when dpb_max_dec_pic_buffering is much larger than dpb_max_num_reorder_pics, it may cause dpb overflow error. Signed-off-by: Jun Zhao Signed-off-by: elinyhuang --- libavcodec/vvc/refs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vvc/refs.c b/libavcodec/vvc/refs.c index a5ee7338d6..6694bc4c51 100644 --- a/libavcodec/vvc/refs.c +++ b/libavcodec/vvc/refs.c @@ -226,7 +226,7 @@ int ff_vvc_output_frame(VVCContext *s, VVCFrameContext *fc, AVFrame *out, const /* wait for more frames before output */ if (!flush && s->seq_output == s->seq_decode && sps && - nb_output <= sps->r->sps_dpb_params.dpb_max_dec_pic_buffering_minus1[sps->r->sps_max_sublayers_minus1] + 1) + nb_output <= sps->r->sps_dpb_params.dpb_max_num_reorder_pics[sps->r->sps_max_sublayers_minus1]) return 0; if (nb_output) {