From patchwork Sat Dec 18 21:53:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 32713 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2918264iog; Sat, 18 Dec 2021 13:53:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJy1QCSz9g4pFlB3AWAqlrhn/oNfObh695T0Sxz2MC4/scx9fpCY46qEQ9+gPN89sUU085cz X-Received: by 2002:aa7:c658:: with SMTP id z24mr8766018edr.187.1639864417670; Sat, 18 Dec 2021 13:53:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639864417; cv=none; d=google.com; s=arc-20160816; b=Ei3SLBn8xaKlGQ1kM51jpN66AvrlZHM1X3nn4+oGFSNBWTvvQTTegcObQsF5elXSWO ZKsQD1b3TYwKQjgEKOBiGn6UEMwRYqG9ZkQLraUswXebdwLH58eSCArajU7yB1KAakYp FN2ATpEjPTvPLHx+SQoEgeD+J9iM3tAUUXgvz3E1s47eTeZCd7nTZvvjOmW4883v3HGk kyvs3UuaBAb0rCGb+f4bUkkqJK4Z2G+tyCG4sjvje0LTonMic+YVUIpPDnIxTMy8VQfU 6fVbC/VqBGR7f/hMybfGLvXc7gObPYWM1t2Sd5wxRKd+HG1LVefhOAG4p75Jfuz2wMN1 J/8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=uuPhqspOkt0EOsnEbeDH8DzIMOHYXNX7r6mSYgNhYAc=; b=KDW480mPYFlYFa7PnogYcpHEN+6HMMpgvlkNaKeJETj7/U1L1r6EWGzVokg+PuAVhv mFud6gR940TbLQv6BraT0D/c1nz1y0rNerO6PXIq1KW1NFSHdeHa8xTUR3ubXYKzflnF pRcofPCOtU7trbP0fN89SFm+IlSvB+tX4jQervfUOUzjReKKJOpyP0ZGKC953tIMFZ1v +Fkv9RWMXi5Pg5blV/p8EYWG1lsPrA/Iqa2sn1E8e1dBxr471b2Z3AI5uTe1NV9Gn9N9 cKVqUngHb8etS6HS00C2WFeRefk2HWkdWA2tlj53ApY68wOjJvf+42bmAimG0sbNOi6K zEkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=JiLvzNUp; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k27si5334200edk.423.2021.12.18.13.53.36; Sat, 18 Dec 2021 13:53:37 -0800 (PST) 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=@rcombs.me header.s=google header.b=JiLvzNUp; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A01D568AF36; Sat, 18 Dec 2021 23:53:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f177.google.com (mail-il1-f177.google.com [209.85.166.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3DE0A68A588 for ; Sat, 18 Dec 2021 23:53:25 +0200 (EET) Received: by mail-il1-f177.google.com with SMTP id j6so3121365ila.4 for ; Sat, 18 Dec 2021 13:53:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=TLs1OQDBNBET+VcZMu56kOvR6u1mgxSgzbfuZ9oOHq4=; b=JiLvzNUpXkKKyzBg0/OCeeD86Y8rEwmry1Mh1IiKILDqlMQ/LIzoDB9QJkyMqPjmTW olUWPlLZ7RaS/bIw2hv4O/LXsWMjv5+PuLAfK7rTC8/hAsPYmfqF/TPopEYGGwNUQ12h aDlYMHH4F8PP7/EMye+4vfyN8KA5+/SGSCechTpcEP7JJFjL8fJqb7wNx22epEockMgP mbFBAeeUEEUq794Ni8sRoZcyI59OGviC4+6zaqttrDA8ehS+xDmXeoZNAvGFL8aA25QX PW7YmCCA/9Ej/pmpvuTudNwRKAB5e9+nBdDcrc8iSRzmcRK6n61Vf+eUYqYxbnBZZnZH C6Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=TLs1OQDBNBET+VcZMu56kOvR6u1mgxSgzbfuZ9oOHq4=; b=H2LRDH8dIr4kgSEiZ7GPBSSCUX2Je7BMZFdyEP/HXh3wFg4OP+J9LFNX0GN0NFvQkV 3iwSt7Ep471tbxZBs53yzUHOo5Q3KYnuKyAErB4/pR57S9g4QbYqRUBqB+b19eD1CX5d wbnzUaI3+S5mQ5y49wkRgLaCal0EF9P/ENNt+IDJJqyNsWEPeqlYh8p0n24uc2xAOVmv fmgjIdQQPGgavkDT5zwd48yP/RmxfxYP7xQ6PLonjKuooZLEZ+YCRez9XDUhxqmv902c GVxVXm4FNCpe5higWlp1czKjELMgH+6Y62FKA89WeZi6lGweEn8As74nvkkb+vNYHA7H OoHw== X-Gm-Message-State: AOAM532jQo23dE++kKBuxj3VZNBJpBC+X3L6qWbdh4Ecg15auy4xmSrU GpA3VLOCqBTggtW6XlTHKfBEq69Z1icklHw= X-Received: by 2002:a92:c10c:: with SMTP id p12mr4734728ile.306.1639864403307; Sat, 18 Dec 2021 13:53:23 -0800 (PST) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:70a5:b034:a3a1:e733]) by smtp.gmail.com with ESMTPSA id o14sm3536975ilm.7.2021.12.18.13.53.22 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 18 Dec 2021 13:53:22 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Dec 2021 15:53:18 -0600 Message-Id: <20211218215319.84070-1-rcombs@rcombs.me> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] libavcodec/videotoolboxenc: use the correct types for options 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bInCPL9j2CMx These are all set by AV_OPT_TYPE_INT or AV_OPT_TYPE_BOOL; the only reason they worked before was that this is only used on little-endian. --- libavcodec/videotoolboxenc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index 8237bd0ec5..5f1e3a9b9c 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -227,14 +227,14 @@ typedef struct VTEncContext { int64_t dts_delta; int64_t profile; - int64_t level; - int64_t entropy; - int64_t realtime; - int64_t frames_before; - int64_t frames_after; - - int64_t allow_sw; - int64_t require_sw; + int level; + int entropy; + int realtime; + int frames_before; + int frames_after; + + int allow_sw; + int require_sw; double alpha_quality; bool flushing; From patchwork Sat Dec 18 21:53:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 32714 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2918358iog; Sat, 18 Dec 2021 13:53:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJxkX4o4qUen1IA8q3yBaxnI2W2OPP384mrKjTFpyFotwPn8EE1epwh2shZrPXXlzAocqS0i X-Received: by 2002:a17:907:3fa3:: with SMTP id hr35mr7304450ejc.397.1639864428347; Sat, 18 Dec 2021 13:53:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639864428; cv=none; d=google.com; s=arc-20160816; b=KdM6EJaN3Prh7gSOjM89lrwdIqwW01oi87KOJbLahyHfS02jMYrrcfp9Qdnw1jJFr1 KYoOvyeogHX43X8HtAAHDQxHPofURydDQ0ggRKmvpMEFWt62BSYQE2fexJ6Qh8OJ18c6 /9qo309rd2up0QKZhg0EPXYVPpq4/+UnTz6er/6qyY3jW6wB/R7pU+VWO8JjMbo0veOk Iih7ORqnMS2vfp4YKP67h8Daj+BEWWkkbSwtIxTsfmrGvmadRvfWHdT1dogJ9IfRIqE6 aWFCp51yGxAn+u7z40Lyim1Nc/KQtHiv5FCirHmXNdFRVj4nXxRSd4eDar1LdlINzl5K a6pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=JQYDYuiIlyEkx+TmAkKHaTIf1vFHhYazCRegTWjOUeE=; b=maYnnvjPqV/aWt70LUodWAztHfowiZTh9uCd6V2+5QfaVeGqSP5sxZUwAPc50fvOG3 gR7OkkC+IEygw8PfNvQSL7Zl/vD7PWPr+k51F0PoXqIC/FNu3q42cfJpZ/7n47l1GBlu zPdsZRJLIZSqfX1e+I0y34bGTnastYkHZSnbBzsZmXjBTV/lUf/8x2m/19rnLLmTCgqi hunWpNvOSHpB9bhvZ3jv6tho4n0cJT+Fa/Av4LnqP5xhTKSeze+vZUwkPxacVKXSw3oq wwc6avadMIV7fNWRECeGN3hH7GwbWGzIEUdHrhYbZ1CnpgGgxa1/5epVGEtlVxp+SUXh qBug== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=Ak8RpMW0; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sd6si9586412ejc.727.2021.12.18.13.53.48; Sat, 18 Dec 2021 13:53:48 -0800 (PST) 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=@rcombs.me header.s=google header.b=Ak8RpMW0; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CFE0568AE77; Sat, 18 Dec 2021 23:53:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f171.google.com (mail-il1-f171.google.com [209.85.166.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B774168A588 for ; Sat, 18 Dec 2021 23:53:25 +0200 (EET) Received: by mail-il1-f171.google.com with SMTP id 15so4561888ilq.2 for ; Sat, 18 Dec 2021 13:53:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=VlgrpKjCQ5XqwMCVHQ3QxV9taLD8Ejx86JoTJ7rZKG4=; b=Ak8RpMW0IqVr2fs8gvqhtMSvZzWsWZs6fbYZqZpgoWHW4bjL/6QFsqsyecNWgqXTKk oTAHD3b+0cgDo+12gctMpAeT3B8gOeh0yeIVUpmeELt+nc0R1VxY9CCsfmakXKhJSHVe OTU+2ONpDpL6IHeQapgENuF/vELEngWLR7WBUhWWzeACgcXHwS2oAMQ2Jynk6SI1Er1l vXSNivsTF2+pU9vpGIT7CBZiJ/24hyh3ZS0jAxUdZTZkXd7R8VItZOzgtvLNsFw29UN1 RqdRREaur6pBAV0ksGRfdlpj4fLteUSfciyTntmrQDzz7v9WtVH3YAMNyg1zWaye8iTw mmqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VlgrpKjCQ5XqwMCVHQ3QxV9taLD8Ejx86JoTJ7rZKG4=; b=wxAR+0u/U0Y+kLIq1jm5Z4/ifTnefWMT6BIHOCaW2d4hj/fsL9DDrY9Bqa1k1D/ir5 EGLLNJVy/wChwKplXxWVbHy5CtYz0L/9BqNXSMLwLUjKU2K0iZJESbpVSN0DE2j5KLTk c+8suris99G8Lk+H0AjjmWk7CCW4nd4xZ3b2cP9o3hhnGpYrqHR0WH4r5ry+o/DBEodi 4fHibyeaJm5hKWyb0m9nwWot+p6mqgOD0dbwuYcWr8+ZRPZp9H+ksJ/9E5160uZBJXqI jF/VPoApnKXpj3wF4P783E4rKEQO89wg5mBItq0uEdN12dB/1661OkqAFe+wxQT4HvJD 1CnA== X-Gm-Message-State: AOAM532aVzvQMJ56E5c4Srg+2UQSX/qNYHYnwexZzGpgW2M5jbdqfTRP gJUtRKkjgIme0i84UmbxJ9hdhdPxQUe28l4= X-Received: by 2002:a05:6e02:156e:: with SMTP id k14mr4668762ilu.41.1639864404107; Sat, 18 Dec 2021 13:53:24 -0800 (PST) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:70a5:b034:a3a1:e733]) by smtp.gmail.com with ESMTPSA id o14sm3536975ilm.7.2021.12.18.13.53.23 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 18 Dec 2021 13:53:23 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Dec 2021 15:53:19 -0600 Message-Id: <20211218215319.84070-2-rcombs@rcombs.me> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211218215319.84070-1-rcombs@rcombs.me> References: <20211218215319.84070-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavc/videotoolboxenc: explicitly set realtime=false 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: nlfNJk0PzQk/ On some encoders, this defaults to true, which can result in encode speed being _limited_ to only slightly above realtime (as a power-saving measure), so we need a way to disable it. --- libavcodec/videotoolboxenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index 5f1e3a9b9c..3599d730d8 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -1391,10 +1391,10 @@ static int vtenc_create_encoder(AVCodecContext *avctx, } } - if (vtctx->realtime) { + if (vtctx->realtime >= 0) { status = VTSessionSetProperty(vtctx->session, compat_keys.kVTCompressionPropertyKey_RealTime, - kCFBooleanTrue); + vtctx->realtime ? kCFBooleanTrue : kCFBooleanFalse); if (status) { av_log(avctx, AV_LOG_ERROR, "Error setting realtime property: %d\n", status); @@ -2676,7 +2676,7 @@ static const enum AVPixelFormat prores_pix_fmts[] = { { "require_sw", "Require software encoding", OFFSET(require_sw), AV_OPT_TYPE_BOOL, \ { .i64 = 0 }, 0, 1, VE }, \ { "realtime", "Hint that encoding should happen in real-time if not faster (e.g. capturing from camera).", \ - OFFSET(realtime), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, \ + OFFSET(realtime), AV_OPT_TYPE_BOOL, { .i64 = 0 }, -1, 1, VE }, \ { "frames_before", "Other frames will come before the frames in this session. This helps smooth concatenation issues.", \ OFFSET(frames_before), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, \ { "frames_after", "Other frames will come after the frames in this session. This helps smooth concatenation issues.", \