From patchwork Fri Jul 5 04:36:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 13822 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 14FC1449E28 for ; Fri, 5 Jul 2019 07:37:14 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E930B68ABA2; Fri, 5 Jul 2019 07:37:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B049868AAF4 for ; Fri, 5 Jul 2019 07:37:06 +0300 (EEST) Received: by mail-pg1-f178.google.com with SMTP id i18so3695290pgl.11 for ; Thu, 04 Jul 2019 21:37:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=zFNxjQ4+sj3lca5b5sJYZC01c0N+PeJEQfolHU8xaV8=; b=MPmpBtd6JwgQKZ0QrQK1aQtNzb1dovrkuv71zRxZ76f6vOhiTc+IBIVHtL5ScGTWu/ DBw4NsksCNXHGC8lZenmbfWui/j9OzxNtbzE5hnttxA2BO334O7eEZSBuPrB1KQVxaEB U53MEe7Z6AwUJMW1nqZB4xJybATQkDWLUP9mibL00q0NAK+vNWT0gemW78542sYgFapz 6CMOFF2L62JeVfdNAjiw/SKl+t0mTCZeACtYg/udRilXC/fUCQNrvNgaPiFZ9HGQZHZP 1kfiO2z4IYxTI/HPMFyBDZqEHPPvcGe1o/x6g0UaXE3EcHSswEZG6ul6GpO6YQKHERQ7 AkOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=zFNxjQ4+sj3lca5b5sJYZC01c0N+PeJEQfolHU8xaV8=; b=uSAttrF2V3QFLVmzYqcX521na5chxyQRs//bciZBVQ8/aBeqbzUM6jB44+YY+jqPzm Bq2oXGDUlP9GKllb3YiNv3siX9l/zDW21G+SmZ0WCpPDMQLf+fS+wvJWhRZBIWU+lkPJ OKY6GK70ctGNoeNZphoqDBnkm4HpLGQtMPBTma48or4Zsxi1Fxgr+twGM6NmmX3cRDsO EtCJqOIngqMfN5wf2rpRnhWN64Q1y6rKFAieJYXJz0vpiJr/RKFw9SSqRzWqi7bvylq9 xQkej7WMP2aL9uaF7WvH49y25NfGabAR26rOAhZgdR0XMh71vZmtM+nj1N3nJ/uI916p HAGw== X-Gm-Message-State: APjAAAVN+bNV2VW4gBoo/ZbtImV3dQVS+Ne1SmOQju2tO9a5AZRFEFfL THHiuZYi2tiFfJzgZXlNd1cSYHu6 X-Google-Smtp-Source: APXvYqy2UnyUE/xGh54QQfIuogyIViYcBr+TGs9kyPXjFRHKGlkccx1iEGtP/ObdWnJXa/kxP0kp1w== X-Received: by 2002:a17:90a:4803:: with SMTP id a3mr2179273pjh.58.1562301424639; Thu, 04 Jul 2019 21:37:04 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id u7sm6666295pgr.94.2019.07.04.21.37.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jul 2019 21:37:03 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Jul 2019 12:36:58 +0800 Message-Id: <1562301419-24382-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH V1 1/2] lavfi/scale: Add sub-options for in_color_matrix/out_color_matrix X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao Add sub-options for in_color_matrix/out_color_matrix Signed-off-by: Jun Zhao --- libavfilter/vf_scale.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index f741419..7aebf56 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -572,8 +572,16 @@ static const AVOption scale_options[] = { { "interl", "set interlacing", OFFSET(interlaced), AV_OPT_TYPE_BOOL, {.i64 = 0 }, -1, 1, FLAGS }, { "size", "set video size", OFFSET(size_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, FLAGS }, { "s", "set video size", OFFSET(size_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, FLAGS }, - { "in_color_matrix", "set input YCbCr type", OFFSET(in_color_matrix), AV_OPT_TYPE_STRING, { .str = "auto" }, .flags = FLAGS }, - { "out_color_matrix", "set output YCbCr type", OFFSET(out_color_matrix), AV_OPT_TYPE_STRING, { .str = NULL }, .flags = FLAGS }, + { "in_color_matrix", "set input YCbCr type", OFFSET(in_color_matrix), AV_OPT_TYPE_STRING, { .str = "auto" }, .flags = FLAGS, "color" }, + { "out_color_matrix", "set output YCbCr type", OFFSET(out_color_matrix), AV_OPT_TYPE_STRING, { .str = NULL }, .flags = FLAGS, "color"}, + { "auto", NULL, 0, AV_OPT_TYPE_CONST, { .str = "auto" }, 0, 0, FLAGS, "color" }, + { "bt601", NULL, 0, AV_OPT_TYPE_CONST, { .str = "bt601" }, 0, 0, FLAGS, "color" }, + { "bt470", NULL, 0, AV_OPT_TYPE_CONST, { .str = "bt470" }, 0, 0, FLAGS, "color" }, + { "smpte170m", NULL, 0, AV_OPT_TYPE_CONST, { .str = "smpte170m" }, 0, 0, FLAGS, "color" }, + { "bt709", NULL, 0, AV_OPT_TYPE_CONST, { .str = "bt709" }, 0, 0, FLAGS, "color" }, + { "fcc", NULL, 0, AV_OPT_TYPE_CONST, { .str = "fcc" }, 0, 0, FLAGS, "color" }, + { "smpte240m", NULL, 0, AV_OPT_TYPE_CONST, { .str = "smpte240m" }, 0, 0, FLAGS, "color" }, + { "bt2020", NULL, 0, AV_OPT_TYPE_CONST, { .str = "bt2020" }, 0, 0, FLAGS, "color" }, { "in_range", "set input color range", OFFSET( in_range), AV_OPT_TYPE_INT, {.i64 = AVCOL_RANGE_UNSPECIFIED }, 0, 2, FLAGS, "range" }, { "out_range", "set output color range", OFFSET(out_range), AV_OPT_TYPE_INT, {.i64 = AVCOL_RANGE_UNSPECIFIED }, 0, 2, FLAGS, "range" }, { "auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_RANGE_UNSPECIFIED }, 0, 0, FLAGS, "range" },