From patchwork Fri Apr 19 13:47:08 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: 48165 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c906:b0:1a9:af23:56c1 with SMTP id gx6csp634993pzb; Fri, 19 Apr 2024 06:47:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUqmQcf3vx9a55Vzhmuc+RHw79Bu844xPTmCR6bxTw/e6OThpdlkUQRG3dj+/RVYzAtr6IV+Kd48IJKNxShGxwQI859IGpj8p94kg== X-Google-Smtp-Source: AGHT+IGoaZKAdfoo1aPrcbxECLil13/BOS+pNdhdQ1q3jhdDZNBwxN5cRbHnNZp35pmsaa04RPFb X-Received: by 2002:a05:6512:310a:b0:516:cd21:e7f1 with SMTP id n10-20020a056512310a00b00516cd21e7f1mr1401642lfb.6.1713534454594; Fri, 19 Apr 2024 06:47:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713534454; cv=none; d=google.com; s=arc-20160816; b=DRu8DlhxaGb4ks/Nb9JoSsHBdPt6nr6nWkwliRSM+q6mMnPkyK1Nj09WkMPuAKgAbS kuQg18srjMylw6InhNKoAMT5O0Ygpk4ZZbKYN3tuhmN5/mlbIOr71WMXvL5gOqlp1Mlz uzBJc3rlv+3ZFe6zSLineWFh5hcmpeLgwAoosPMsLiSPUtwfoolVfKeNuHt7HcpFaVeL ax1YKKOuDMQhA/zRM2hWV2uc7yNAJjzLmd2pUkGCfn1XeOyKNCB9lyBdbdIOI3xLBm1U /G0FWANeovPcEWyLbAbofnGXRzWB1E2DrhlOvSEiXcYUuV9jCRTxsneAyE5hMwfRpPvo +OpA== 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=w1jxvCAWuJUTu3X1J0qJ7oTZoKc+n2RDJNN7VadyTkw=; fh=paNsSD/gLXCX8XaG2wP2EhSbyn4+hY3DzFJxc2Arm+k=; b=B2oeRhDkPaYTXQAs3+vpDXKr+kmJdvx3YcjnY/ubDsmeKadetK93OnIcp4LaTbcPLT beIksrfHFjyACsn30V+4h+Cg0yhGpq3xXVhFkqPzpu9Zy2lkmlWXBBkWl8wOXnPfJvoY 0CttdNJBv2i6BXAO8OFbzv3aNPL5ODEUouYkVmA4Db3Qi5kZyIM2BXqTR7rBwCMe2wsJ 6g7E+LXUEKuTtHk7l71PG8MzvNke07i7fvUU4+VbLELTcVCnzyC+CgdKMm/+AIX30N40 pz1y6Ndf3NAC3t5OZ4nkeX+9TSyDPEVFOajoQRmG5T+UKMQcvLVj+92EO2kUXZr7o3x1 ZjVQ==; 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=Og54nQAw; 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 wk11-20020a170907054b00b00a5269e3d1c4si2181283ejb.718.2024.04.19.06.47.34; Fri, 19 Apr 2024 06:47:34 -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=Og54nQAw; 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 E4AC568D37F; Fri, 19 Apr 2024 16:47:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C70F268D01E for ; Fri, 19 Apr 2024 16:47:23 +0300 (EEST) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-419c8c314d3so2103385e9.0 for ; Fri, 19 Apr 2024 06:47:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713534443; x=1714139243; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Z59kFoSlT0XAudQKjm/KAaQppS5K/2qAEaEPnzfYElk=; b=Og54nQAw3BaQ+xSYFg+JKP5nYvTvXxQHyuwH4pmBmcsvpGcrN35wh/WdLnWBG+RdsN wZzkCRBQ6X2WD9+hUc1Aab2Lfr8k7cY0L+r9E2sMxN8AumiL9QsDTPTVNbQwe/nFxFoM iIHNQkIax9xNEt2JR/eSf9GlqHO7TVzT11qDtN7Ox+mQ9rUNFRCE7NczL3l5JtSWrkgP Sg0WjAwEm9DjjsQBHGhG79DgFUvjGhDKVR8H9UYrHBKIRrdwLRg8fwBNvrMV8AKbwol8 WLsQHwZwm4kCgMn8soejryiapqxgOK6+/nBn0b8uNdaaXP4/xvujmpVkv+lN9p+ehdNt SAZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713534443; x=1714139243; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Z59kFoSlT0XAudQKjm/KAaQppS5K/2qAEaEPnzfYElk=; b=SPuLhw0WbNpvuUWjtiQEYlhtPMu9pgJu298tDgNSMLy8Qz65yGUBCXBVcRZvZlfuPL sKKP8FD9pf99VbAWa4pEylwVR0r4ayONvWABgUFj3wIUzsq1cUK0epJ10928t+om+vW6 hYsh3MmXEzy637d80QM/ca1dMKxqR2tdAyo9a82iz0FtA2CiJ6dVW/rM73AspJstE1if IFvQ4aky61xZ/iUuGo7GeWpmgj/Gg+fsKzTqOsbOVAiEWXyizw64Nu011aobXXfCYEPt WP7mLKweUNaFIIlMX8zfehCm69Q+W/gRf00lbXJTalI2fob8msJj4qYSzJGeJdcmySI7 cHfA== X-Gm-Message-State: AOJu0YyUxTwx/8m6a+W/mj78nbDGoZkcdcULchDVr2RThStn7skigfkC ofTUBb57RrPC3TkZ0n8rRCbsvLn/rDc0htdiUqS/mGOdty8DuhggbC/65Q== X-Received: by 2002:adf:f345:0:b0:34a:67f1:3fcf with SMTP id e5-20020adff345000000b0034a67f13fcfmr1003286wrp.0.1713534442450; Fri, 19 Apr 2024 06:47:22 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 06:47:21 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Apr 2024 21:47:08 +0800 Message-Id: <20240419134711.3824735-1-mypopy@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] lavc/vvc_parser: Remove max_b_frames setting 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 , Jun Zhao Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: JLyDdntHN0rZ From: Jun Zhao We don't used the max_b_frames field in decoder normally Signed-off-by: Jun Zhao --- libavcodec/vvc_parser.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/vvc_parser.c b/libavcodec/vvc_parser.c index e3501fa139..a0e10e1a7c 100644 --- a/libavcodec/vvc_parser.c +++ b/libavcodec/vvc_parser.c @@ -187,7 +187,6 @@ static void set_parser_ctx(AVCodecParserContext *s, AVCodecContext *avctx, avctx->has_b_frames = (sps->sps_max_sublayers_minus1 + 1) > 2 ? 2 : sps->sps_max_sublayers_minus1; - avctx->max_b_frames = sps->sps_max_sublayers_minus1; if (sps->sps_ptl_dpb_hrd_params_present_flag && sps->sps_timing_hrd_params_present_flag) { From patchwork Fri Apr 19 13:47:09 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: 48166 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c906:b0:1a9:af23:56c1 with SMTP id gx6csp635113pzb; Fri, 19 Apr 2024 06:47:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXMH5mDMNCN69RTlfBN0OaeQZcHXoVcd63US0/IvUbK99YSXHYE0GTH80ORCJFxbPmdZ8/E2fDZ/rhq6OErsu6vj9MpUyh/RO/XPw== X-Google-Smtp-Source: AGHT+IE2tcuvXTFdBuFCioiuPlOVCZVNQFeYgN+Abv7NeFQmn3Vgoi/RtJsUODs6QugGu7nSn1Ux X-Received: by 2002:a17:906:dc4a:b0:a55:635d:ddfb with SMTP id yz10-20020a170906dc4a00b00a55635dddfbmr1716681ejb.3.1713534466355; Fri, 19 Apr 2024 06:47:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713534466; cv=none; d=google.com; s=arc-20160816; b=bvYHoP05AiWmvuYGGjDFgl1QlWoHJCicNGt/3hW2Yz1Rnx2mh2k24ArC5QIFFEjeGQ 1vwOzd6d58cOuDCsww7+d5dZ35ejQQF1eTU25jI1Mx0A8lw8JSyatXjj0XVpWvIJqJhf oxupPf5wvJHEmfDzwW38gOOBSHViqFWRXrGDwaBPw36gXquJHpXz773Uw5DjbWH1MkIT uPB7cfGEhaKSMIIAoCts3RfpQ36DCuZH9ZwpHBmjJMpMeQxAa6OZS4sWFhzzVpzbR3Nz iwTj4fZMW9TCAkbdRntF20OjkXfnhS6+mU5ukcTvRPRSuKA1EHaPLZAVRv0lRZcUPr5R C8JA== 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=oE0DPm1JQpb3uk3lWBNWt5nAB+gOzvmHdKHjUNzd27Y=; fh=paNsSD/gLXCX8XaG2wP2EhSbyn4+hY3DzFJxc2Arm+k=; b=dz/GTozQerP/VG6Lk0hJT24FYTfP8KeDgMoPcN8bsNYUvka9Fqxq88kBv33LRufnCf 5HRlENnQ8qqftLCk+RpiZwUivQUsgOY7gyVuG5TdavB3N9KlV+tRpvfRQyH3alcZ/UrI S/K7wDncynhAsoGPlB27k4NUe0H6cBVvv8Uhw63W+46j2JUcDvMAcQcqI0HZXoziH7l+ mfmPiX1SEveveQ0aB+hNvgp9BcrXl+3JlS6Mro+WMUa3ob6Tqx48uKiEv+OaXYhD29z2 2mOe5l7bYcwr6XYCVJ8EQT8mjo6d70ZUJNxyyVmPyzIJebj+d5z3GT3pD/33OuzmZzp+ uJKg==; 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=dGi3jWgJ; 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 r24-20020a170906281800b00a51d6079479si2097046ejc.452.2024.04.19.06.47.45; Fri, 19 Apr 2024 06:47:46 -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=dGi3jWgJ; 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 0558668D388; Fri, 19 Apr 2024 16:47:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9A5A668CEE6 for ; Fri, 19 Apr 2024 16:47:27 +0300 (EEST) Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-41551500a7eso14265725e9.2 for ; Fri, 19 Apr 2024 06:47:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713534446; x=1714139246; 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=31tQtMkyV5ipHl/gp6r/ljVTDAXIs4RfXvJ44NTajTg=; b=dGi3jWgJbICfKktIaduFKRvDY7gG1rSMTr7ekifTugpc1+gi66wbtMMXxASyxtgIUK Sg+GlUdV4uctgqHzpSOyE8cMZK8jcfCxSXQ0G7Egj5S05ugDf7UyONkkM4/QeehUXBDd LHKskH0REOZ9cgk8yU3JkrgY3fW28q+Deoq6DTn5w9e//pZSmsFcu+eS5xb/KW++Lp2M xPYpBJ4q/QlVASQ7iY9MkzDb8/Wut0UtcHB1GEx/RZq7TSKtZrnN+kipZOxTPUHaHXoD yAEQjKY3aeGe39F1BwAlIGPNkmYe+3deANnmQf6p+7cAbay7KPDSnJd+Fpdyi85rEr2b RrDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713534446; x=1714139246; 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=31tQtMkyV5ipHl/gp6r/ljVTDAXIs4RfXvJ44NTajTg=; b=qVZ7E7dpPri4XGVbGVeBCT1d+CEMohdic/DMHukwwo7dZjffIACBkN/ccxeGNeB/bZ eNUoJzfgdTNuZ3fif8NIERjPUZGAvppOnp/friyA3JdPNsacoe0Xw/j0Wdxt4k5Skn/I 1a6aujzdPGN6oFHbjuHcm+fxxz4ZE3hr+k2vcCSHzciulHN3FFUTxRqN6qXPIzgLqtWv 8veWrN03rzuYtQUR9A814Rai3Hf7Y+OVIsLPMiHyHLuO0glYEONOh+LOq9LOUoHIV7Co F1eNArZIxazea3NcO0XHYSIlD9enqt1NqHtzaLbOzvZ78b3Zb6rNcbhjkCSszBK2zSgG BGuw== X-Gm-Message-State: AOJu0YyCdqYDmZK1iv5xoQQ+MfslKn0m8LDJM6CttXMorLcLQAo8uNCc PQMDFemwlwqzmnKVDDVLcQvmL6f6wPQ+Tza5xCze10gdOvFHN9N+WuCvcmGZ X-Received: by 2002:adf:ec4d:0:b0:34a:2852:f119 with SMTP id w13-20020adfec4d000000b0034a2852f119mr1410145wrn.36.1713534446453; Fri, 19 Apr 2024 06:47:26 -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.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 06:47:26 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Apr 2024 21:47:09 +0800 Message-Id: <20240419134711.3824735-2-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 2/4] lavc/libxevd: Fixed the has_b_frames setting 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 , Jun Zhao Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: dQ/69YF7xSID From: Jun Zhao has_b_frames used in decoder for size of the frame reordering buffer, and we don't used the max_b_frames in decoder. Signed-off-by: Jun Zhao --- libavcodec/libxevd.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/libxevd.c b/libavcodec/libxevd.c index c6c7327e65..479d9be046 100644 --- a/libavcodec/libxevd.c +++ b/libavcodec/libxevd.c @@ -170,14 +170,12 @@ static int export_stream_params(const XevdContext *xectx, AVCodecContext *avctx) } // the function returns sps->num_reorder_pics - ret = xevd_config(xectx->id, XEVD_CFG_GET_MAX_CODING_DELAY, &avctx->max_b_frames, &size); + ret = xevd_config(xectx->id, XEVD_CFG_GET_MAX_CODING_DELAY, &avctx->has_b_frames, &size); if (XEVD_FAILED(ret)) { av_log(avctx, AV_LOG_ERROR, "Failed to get max_coding_delay\n"); return AVERROR_EXTERNAL; } - avctx->has_b_frames = (avctx->max_b_frames) ? 1 : 0; - return 0; } From patchwork Fri Apr 19 13:47:10 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: 48167 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c906:b0:1a9:af23:56c1 with SMTP id gx6csp635202pzb; Fri, 19 Apr 2024 06:47:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXAvT9KzGinbed4cPp/R/U0YOkS7ViElqW29ssBfoQ0uuUteQIM98bH2Ndii3gfRp9NE02D+QDhJUH+zyouSXN+ZkPFPDUy2fhRIg== X-Google-Smtp-Source: AGHT+IHlBuJ2m0HA5AP5zYZAGw7PVufoLDh2YI2IqGDRm/hkBjgXru2/iAOhJ710T0AdlnmqVTfJ X-Received: by 2002:a05:651c:20e:b0:2d8:3d83:1151 with SMTP id y14-20020a05651c020e00b002d83d831151mr1353669ljn.1.1713534475450; Fri, 19 Apr 2024 06:47:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713534475; cv=none; d=google.com; s=arc-20160816; b=HcYe0ztZraeoz+BbUiT5Jzv+wA5wiMw3n3fxbyHY8+/KCqqQqnFmWI/eq/OAtpEhNd m6Ui5go7T7RY4GUyZx0UXo/DDgCJ2vVGDzHZRmyOrDQWA7lkNkzEe4BzydG8r9wI8evi FYSVm8jqdHAGJ5z8zqEarkbHYRb11RspOrkU7gqkKTzQMDxp5AxZdl0Jmg6hV07VQESs VneYd2FEIpjbCY8KbrHbavu2ZKytZXBPK91poNTnyxpagWsK5xrf6tlUfQQrbG9KytfV krsPaN9mgIw7xWzwxpMf73OuBW2hDSrU70BUUNs3tfBOwLMsSiaHlqZPw+YUmUg+jDyf C9+g== 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=us9id3Kl0GpykRzxaMlw+lZSJMYYZvp6dtHExozlTgc=; fh=paNsSD/gLXCX8XaG2wP2EhSbyn4+hY3DzFJxc2Arm+k=; b=xKv3UuwSiVVi2v/8FaFulaMo8NCBVv/LUdxOM/t+w19wJY0fIxj5Vy7C2kYPNRzAxo bWMl/Cp82M8CH15yLCBb5n2La4T13azlzdsNw0HXLt/kTYj46A+dK17h/PFSptzaOoFR xKGeg57w3P/E8dbVq18ZImROATPlnBz5sSJ7Qs383oKv3FfJuaZxk7W1RK/bz3Ao/MF9 4szliKJNPQHzLN43O6NrtugPgZ5Ug/XKLmSU8cN2SmTtpTWqAxz2cIHOSzP0ULkFQRN+ qRffco+tGA1zLyCGqLdD0n7R0nGbqI9y5crTUdzY29hR0yEUtul6Kol/0Rb679o+e+WT RywQ==; 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=YKrDxcLp; 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 h8-20020a05651c124800b002da75aa46a4si1120289ljh.408.2024.04.19.06.47.55; Fri, 19 Apr 2024 06:47: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=@gmail.com header.s=20230601 header.b=YKrDxcLp; 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 0B1C768D39A; Fri, 19 Apr 2024 16:47:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8BF6D68CEE6 for ; Fri, 19 Apr 2024 16:47:30 +0300 (EEST) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-4167fce0a41so18082265e9.0 for ; Fri, 19 Apr 2024 06:47:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713534449; x=1714139249; 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=5XgdHc0BnI5WtI4hIrTkaJNCtWq9z1pcMSWzbIvo2MY=; b=YKrDxcLpDrykzfjSBa68an/zrDyW7SCJ+sNwAyObqF0XH6AJciJ8SUqhvAmnhGAbSN UQE70CQaWGUVc+GxiQ9eBhLv64awCnGAM81+TDOIa6Iv/L0I4HDLqY/4TzQttq7ihM1f aqHDV+RKLIz3MEDZ+Nd4jmuetAedz43GgLDtOjQi+LNiw2QZECAR2XA4cPvOw3n4gW7A JWoO1G7vvBuCg75Y+i9FbxzjUMZlP1ekwVK/nw6JG4K3uHJkAS2XgQJM+WhVobfFErDM pJcwmeGNjQuNJNQP4/WVQaa++VOxhGw9x9sorfvmMRiwuzduDcFX+LAqyyu8UIkUEQiS GzPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713534449; x=1714139249; 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=5XgdHc0BnI5WtI4hIrTkaJNCtWq9z1pcMSWzbIvo2MY=; b=NO+l95e/JwV2cc4uVhCNopR0k3X7qp8BIo9xfZ5Bbxj7yTcCUMKwKCKrJy3GbIphTD 7KPTkKJOgjctDzXhLI7BBbgDf3i+IoPIyRKhB+ExkBYkOjbPkTlbIszKPfIPtxUJzkiR P0BWyz1ep7UA7+AME/f3ZXZvI0PgUXM/c5a0My357nMuE4hiMZ2XH6iEsnPjq+2BYCYA ho5VF/dp6wiLjf0ehdICzNoFh8EqK1hWJJJAnySfbDMbEXCVf6gy8Fq3wwA1CURh69xC z7my9bLH09nQCmOz/W/lOHFcUUKDCwyGiM8A6EYYu76GZUItoYA7XzOLhhM7BUecTYKR 4xRA== X-Gm-Message-State: AOJu0YyShVY5XZplBw9sn64d0SZ/810RjLLomr5htoGoAGbs/FOFJgkt z7mU6EgItCwupQ1tH2Rf/ormCIKgYQgkWS04KTbFhhZ+sIgWm36cslZw4bB4 X-Received: by 2002:a5d:6e86:0:b0:348:870:bbe4 with SMTP id k6-20020a5d6e86000000b003480870bbe4mr4489948wrz.7.1713534449464; Fri, 19 Apr 2024 06:47:29 -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.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Apr 2024 06:47:29 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Apr 2024 21:47:10 +0800 Message-Id: <20240419134711.3824735-3-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 3/4] lavc/vvc_parser: Fixed the has_b_frames setting 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 , Jun Zhao Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: fWwDSOTOE9Xj From: Jun Zhao has_b_frames used in decoder for size of the frame reordering buffer, setting this field from dpb_max_num_reorder_pics. Signed-off-by: Jun Zhao --- libavcodec/vvc_parser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/vvc_parser.c b/libavcodec/vvc_parser.c index a0e10e1a7c..5373875aae 100644 --- a/libavcodec/vvc_parser.c +++ b/libavcodec/vvc_parser.c @@ -185,8 +185,8 @@ static void set_parser_ctx(AVCodecParserContext *s, AVCodecContext *avctx, avctx->color_range = sps->vui.vui_full_range_flag ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG; - avctx->has_b_frames = (sps->sps_max_sublayers_minus1 + 1) > 2 ? 2 : - sps->sps_max_sublayers_minus1; + avctx->has_b_frames = + sps->sps_dpb_params.dpb_max_num_reorder_pics[sps->sps_max_sublayers_minus1]; if (sps->sps_ptl_dpb_hrd_params_present_flag && sps->sps_timing_hrd_params_present_flag) { 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) {