From patchwork Wed Jul 27 14:13:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mattias Wadman X-Patchwork-Id: 37008 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp383208pzb; Wed, 27 Jul 2022 07:13:56 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tJjfiFfq6PSE/0qu7lWy8D0zig3tfyaV+6QKVOhxul1OYgJRFhpWLLN21i6Kvot/aPkJDB X-Received: by 2002:a17:907:94c3:b0:72f:3f8b:d628 with SMTP id dn3-20020a17090794c300b0072f3f8bd628mr17768408ejc.313.1658931236244; Wed, 27 Jul 2022 07:13:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658931236; cv=none; d=google.com; s=arc-20160816; b=AJFtrp/9NHZ9xxx8axgbwWDZUZyzeRhzsXKNdo69FOtWNCMvaaVrqbkhDhQVjItcsR 8tw1qN62uqK3Hw6Q/mHu8/0N+IQu3gImIAf8cNSa7rE410Z22PmIcMKEpz6uTxgWHu0h rLBhGyOTonHwQIpgJaSuCQKJIxWHO8Qmaj7yX5nZnCVdp3HJ6gJ7W5sghXoWyjv2ey3h zXHi7/2t4sQxKinnYhDqo/tMFqLSxCNtSRzB7eM5RoSEvLRMbpXFePLElWy4Jz9euxp7 uc1LPG8Y8FeA27zDHi2RKz55KF1r+4W12WLMRO+afKcWV0Q1dPsSHlAGPovEfj26DpEi SC5A== 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=72ypKrkLBjyJsMnyIcvtlEsp5qxDHoLpMYDQ2tsdzY0=; b=pi8nB5M3w/QXJcd+Aq2/hB9k9aubX05J/dNufCQapcRsD9qR4B1qKvmvfHfR+CNugd qppDPAMx/ios3a63+QPGFOxGKWD8UCJERH0C6aCVbGrCJOSfeRK2wHnkANGrQxxe7bJm 0dv3IyxafCNK+zRbYZqNGrr7aQ3Nfgr29AYNZJqxI0yGXge8v2b0AXeWqPJ9yNVe1ERf Tk35FbYYPFKH9+5gIxC8ZtfeHsFBmdPqesQ3ca7NE6UDsxOWVTktgTxST9ky5P4Oim+y lpyVugJZSJGnSfaGqfPX60ekpUVkN551RqcuV7tQudC6L7PHEztv/22Mv2VASflXWExA kcUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=GLq5V9E8; 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 s2-20020a17090699c200b0072faa2118dbsi5653776ejn.219.2022.07.27.07.13.48; Wed, 27 Jul 2022 07:13:56 -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=20210112 header.b=GLq5V9E8; 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 5565F68B9AC; Wed, 27 Jul 2022 17:13:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AE81C68B766 for ; Wed, 27 Jul 2022 17:13:38 +0300 (EEST) Received: by mail-wr1-f52.google.com with SMTP id v13so16666929wru.12 for ; Wed, 27 Jul 2022 07:13:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IehoWO7b+Gu2BFqpoCxo6Xg76yZXXFNCYgrJCqK7r4U=; b=GLq5V9E8/NXtJKut/42rIs10S726H3JOe+AdaKZVC2VOs7pKVljw7oeSPNwTy0DYXd hnn58cwgoKps7cyBoAtw4Vs1haxJmRLt0fg+a96FQbJuHTADAKMqD3160ZYwDC4P/Oop +FBasmAVF6CgoatwjCoCb/RT2rClmxbdRLBrq11LQLT4QfwEc7ISwDweXXGHL7pYQsx5 RtsRAt0zv9a30xbDmD1ro5M4dqB8/1iUpm4eeHTNJCfzJBjEVQjnqR2+srpDRJURPzLM cn4WrdhxhC8VoKRoBSvV9Wr7s3opxbMNm7ilBgEROSfrYZ5wv8ATjsSqMvt+cGjoFlDl aUUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IehoWO7b+Gu2BFqpoCxo6Xg76yZXXFNCYgrJCqK7r4U=; b=lcVKQpelMP2vJi+HhoGctEgh1cW8vRpXd0vVdIfbnYXk5nHM/9sV3yTHwhmEjXdudL SlTEL1cA6Gy9u5/x1GVR+eGbnrktRmVAkmYwiNTx7JsvtTC821Pq/CqDTZI08upeGSJ6 0YL0Wm+JU4ZuUAh7zmOt+H2CsywO2eVfk9u4qizcMxtJ1x2Ag5kuOZcLFnH0fVu/iCYB 74rbmt/iZhKEshkObSAFApMY1R+YsM8WXGyDuR+9iNdDeC76GZACc9K9k6OLb+d8i6jU zw5Gi7tNev5BszeSGkADF9oZtRbsUjfUahcA00/jYantwZTFcrZLqR9s6eXrbFIDzN89 9a4A== X-Gm-Message-State: AJIora+l5648U6qLMOAB/khIbimJvwZp6/gBzweP2RjPqZNl7oWmeCd0 ycQ7Ov+4KZybDwbrfDBfHI6gMB2Fp/T4Er55 X-Received: by 2002:adf:e606:0:b0:21e:39f6:3171 with SMTP id p6-20020adfe606000000b0021e39f63171mr13501916wrm.601.1658931217759; Wed, 27 Jul 2022 07:13:37 -0700 (PDT) Received: from C02WW1K9HV2R.spotify.net ([84.218.15.152]) by smtp.gmail.com with ESMTPSA id r10-20020a5d4e4a000000b0021e8cdd0c48sm7727716wrt.15.2022.07.27.07.13.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jul 2022 07:13:37 -0700 (PDT) From: Mattias Wadman To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Jul 2022 16:13:01 +0200 Message-Id: <20220727141301.29645-1-mattias.wadman@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_zscale: Add smpte240m transfer option and fix matrix option typo 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: Mattias Wadman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: U6Lz+1k0tM8J --- libavfilter/vf_zscale.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c index 91166dcbcb..999147b587 100644 --- a/libavfilter/vf_zscale.c +++ b/libavfilter/vf_zscale.c @@ -1033,6 +1033,7 @@ static const AVOption zscale_options[] = { { "bt470m", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_470_M}, 0, 0, FLAGS, "transfer" }, { "bt470bg", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_470_BG}, 0, 0, FLAGS, "transfer" }, { "smpte170m", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_601}, 0, 0, FLAGS, "transfer" }, + { "smpte240m", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_240M}, 0, 0, FLAGS, "transfer" }, { "bt709", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_709}, 0, 0, FLAGS, "transfer" }, { "linear", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_LINEAR}, 0, 0, FLAGS, "transfer" }, { "log100", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_LOG_100}, 0, 0, FLAGS, "transfer" }, @@ -1058,7 +1059,7 @@ static const AVOption zscale_options[] = { { "fcc", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_MATRIX_FCC}, 0, 0, FLAGS, "matrix" }, { "bt470bg", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_MATRIX_470BG}, 0, 0, FLAGS, "matrix" }, { "smpte170m", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_MATRIX_170M}, 0, 0, FLAGS, "matrix" }, - { "smpte2400m", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_MATRIX_240M}, 0, 0, FLAGS, "matrix" }, + { "smpte240m", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_MATRIX_240M}, 0, 0, FLAGS, "matrix" }, { "ycgco", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_MATRIX_YCGCO}, 0, 0, FLAGS, "matrix" }, { "bt2020nc", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_MATRIX_2020_NCL}, 0, 0, FLAGS, "matrix" }, { "bt2020c", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_MATRIX_2020_CL}, 0, 0, FLAGS, "matrix" },