From patchwork Fri Aug 25 10:01:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Sabatini X-Patchwork-Id: 43314 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:f07:b0:149:dfde:5c0a with SMTP id fl7csp320148pzb; Fri, 25 Aug 2023 03:01:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGY2Q6zpGK0A4IjWrtiI4SG06GV5YdpZsIrPoJi/GsqQryNE2rwCNYXeZkPpU/fb6eiMrJD X-Received: by 2002:a17:906:30da:b0:9a1:2a25:197e with SMTP id b26-20020a17090630da00b009a12a25197emr13765888ejb.50.1692957713679; Fri, 25 Aug 2023 03:01:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692957713; cv=none; d=google.com; s=arc-20160816; b=B6ouarl6169U5Nbn7yQAVOvrSaLrvgu+myNDBwXHPMp+QTRJGu76hVzw5aplkfwHMu azEZvhHJ070NPHkqsKySkeJLI3YidT5Nvq7KSpjMKxveFBEUMuKmkoIR3cEG0jThiAVO RBL4PtqNnXLUvkF+p6xBtD10ntpdwej+M2DW6JxoHtsDiVHG35kz9OuDhbrOyscU5b3D X9fmsfgOzqYWSAOVg+CwU7HtbInK89FWHDOla0UXmGiL4w1YYtKyJMraR4Wu0BoUsK5Y Jc1tV8yoMY3dMo4FVZMijAyQeF0QQD4FufyROO7wdfeYLOYKDz9f6uuq5bdMEAkzH+m4 TcXA== 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=w0/i17DGspuzEXUzM7gdaF5xUlqjyFSlqXmr7iDD8r8=; fh=QdWxt2OToL83TTnLQn0lGhLakV7i1QyAJdC8te7qN0E=; b=JTOahZcoKvJLbcOwD8QOOSzUNXz+xP5309BQsi9WmTKGIbG0iOXX3yWswTqj7CyzCy 6I6b1MjOilDjgMQz+cIHnMLyocsOkpL3qcWV+ON4ZEuC5TMqVVic8S19mf/W9kbBrlJa Vze3rBQGMRf8/lEdLt9iOxPAYop+tT0+bvZJvb3eQba1a/35Jxtv//rABdkgqGo1P0cA JoooHoj9q1oFXYe39HPW/d/a6LvLFXU2Ob/EqoTRSdH9UcUS771dKx3yre4i1oJ92Y2g 82ntdZWxIvL31PcT5/4LSwJOSMz+Fui8iyyu1usrNkkDuDqcPxbziX1LkeuJfkdulP93 LBfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=GZrotESa; 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 qx22-20020a170906fcd600b0099bcfd32960si758484ejb.161.2023.08.25.03.01.33; Fri, 25 Aug 2023 03:01:53 -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=20221208 header.b=GZrotESa; 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 A045B68C67D; Fri, 25 Aug 2023 13:01:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A43368C662 for ; Fri, 25 Aug 2023 13:01:18 +0300 (EEST) Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-31aeedbb264so638572f8f.0 for ; Fri, 25 Aug 2023 03:01:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692957677; x=1693562477; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=9g8zuOazUKgFy2EtRiXDb2TPlVKRwIbU9TCmATQvyD0=; b=GZrotESaG6R3Inbmv7IHOvLAlwWFWr9Z/9sTON9f8GhZTUrSmcLTjIp5XY3fWBxnKS TtUMUZbPKVPlKYB1695ECVhyH9MVTuMx6KK+az3MbD/fRq0Vxdt6IefH43Gsi6Q+hLvn db4quuzv4dIfBIhd0IBTpDk/68umWDmzQ36pO06mBupT7FQ2Dtrczy6MGDMTcA+LjopM 4ps5PbEw/571ZlWO1yjgxWKDSD+/XsnwDxLiGKq+jO5LCeGMS1y4I5bxLwJ9BiR8Y2Fq PIibZhhjg6Zkqc1j2n9+MAqwYptXv68QxKTUhj2wjY9iSI6isgxZcIU+YwvxTWV4D21H 9XKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692957677; x=1693562477; 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=9g8zuOazUKgFy2EtRiXDb2TPlVKRwIbU9TCmATQvyD0=; b=kpNXUwG+QnyCVsxAw+S4kPn6XEy7M0cE4Bn6yR4bxWhkUz/hnOt7yNgHMtbg9A3iD+ 7dJs0+PJ/TIXBwf6sXRyrCfQ3j2VRUfpGvUFx/FehW4fWepNir8QBa+dz95oNBi5WE4K 2UvObcSzM6XjM2e2ZKN+95d7cizr3zRh4rZRHDLxLlouIE3wPf+BOSDkqMRbeX40FHao xgVWw153FaUPaWioq/WRiZTRvVchCV4KvKTubbb/bV/cATXuLHSDEJAU+gA6tvWpFUTE pxrpvUg/HJ7Dcs0QjWf9CdCCexZ3oOMBMik9aU03uFxmBJ+rS6Bap70vNPNbR+3YSWtN azjQ== X-Gm-Message-State: AOJu0YyBdxVEnkdLVEtF/sxrJgr5zuqrvgsJ6mRJ9sCPN/shuAk7HUYM 6DEEHl53hh4g2ZkIiw5tUNO2LefLs80= X-Received: by 2002:adf:fd0a:0:b0:318:8b5:4159 with SMTP id e10-20020adffd0a000000b0031808b54159mr12962851wrr.24.1692957676569; Fri, 25 Aug 2023 03:01:16 -0700 (PDT) Received: from mariano ([82.84.194.139]) by smtp.gmail.com with ESMTPSA id x8-20020a5d60c8000000b0031c52e81490sm1742003wrt.72.2023.08.25.03.01.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Aug 2023 03:01:16 -0700 (PDT) Received: by mariano (Postfix, from userid 1000) id 48E52BFB73; Fri, 25 Aug 2023 12:01:15 +0200 (CEST) From: Stefano Sabatini To: FFmpeg development discussions and patches Date: Fri, 25 Aug 2023 12:01:15 +0200 Message-Id: <20230825100115.393960-1-stefasab@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/libx264: enable x4->params.analyse.b_fast_pskip if mb_info is set 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: Stefano Sabatini Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: reBDmsIv798Q x4->params.analyse.b_fast_pskip should only be forced in case mb_info is set. Fix output change introduced in 418c954e318. --- libavcodec/libx264.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 1a7dc7bdd5..a2877d7f75 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -1190,7 +1190,9 @@ FF_ENABLE_DEPRECATION_WARNINGS } x4->params.analyse.b_mb_info = x4->mb_info; - x4->params.analyse.b_fast_pskip = 1; + if (x4->mb_info) { + x4->params.analyse.b_fast_pskip = x4->mb_info; + } // update AVCodecContext with x264 parameters avctx->has_b_frames = x4->params.i_bframe ?