From patchwork Tue Nov 28 18:57:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vittorio Giovara X-Patchwork-Id: 6422 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp3550062jah; Tue, 28 Nov 2017 11:06:10 -0800 (PST) X-Google-Smtp-Source: AGs4zMZaKlYBRv83oZgdRnhQu77D6SZHoxbm5eExsWM9Pc3HnxGnYjQflYt1clSZPb/w/IpPNVb9 X-Received: by 10.28.217.144 with SMTP id q138mr552021wmg.9.1511895969941; Tue, 28 Nov 2017 11:06:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511895969; cv=none; d=google.com; s=arc-20160816; b=JBDZmjcojgYaVyRoUW/Qh1QEPZwqLoK+O8hfdYOGv3hM6ZFAHMP01liMARtd58XzCl 76d5spsi6xgFvni9uj4rwiENn8R/j70TLSC63r1rUy3+ItktHGIdlLEdePrHEc7uFc1C ibVX9Q5n2GsOZBReY4tJHtbqVtS34YXfobaB7mGcbT1vVO/mNOGkDfZY2m6nZ0lGGyR0 UeymGtR+JgTFojFdOWXUpO5LjwRvUcg5Gdf9WE0yCYUvN0wfLQAcOKgRlemWPuVDanil 5PgjsruVeefMBLgeoZe/zkvUCLJLoe1FKg0M0m9qdnfnM1QhP2+ykvFdTSqqVg4sFz5S WitA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=UDfoI2QPAy2Eo6VrrZZWRnvee6xq8q9K/E9utV6JNYs=; b=r3dTPXTzjm678Xs6OzwRqu6jngqNk9CCeJQeWrGqIx1BNgH3wYGQUywLFY4zI0cqVC iGYfSM5lzYfMEBrVITMNLJXlTZHxFCe66q0ToPquY7G+rednMy3Q0gFQP4oOU5AxEnFY DpdNranBNT2c0q+18pCKgtOQgWIMTAtHf+JtKhKRNTeNvE6wg/dzlT8KgdqzU9hnY6tb dvcv5rR+hJbsSc7i1TLDPAImG5rzp+s0nuDxDDC/3bOy9XMr4aDcm2c0UlcSE9QBH6ei ZWJw2DrnjMqzjXimRi1IWkRcyEU9p/AbbVH9kmXoLh71kCZo9I1k96zuSwaoR4x1kkWc Ieug== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=pgGXs1m6; 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=NONE 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 x33si25735539wrb.344.2017.11.28.11.06.09; Tue, 28 Nov 2017 11:06:09 -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=@gmail.com header.s=20161025 header.b=pgGXs1m6; 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=NONE 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 68DB368A191; Tue, 28 Nov 2017 21:06:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f195.google.com (mail-qk0-f195.google.com [209.85.220.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8ABE3689F90 for ; Tue, 28 Nov 2017 21:05:59 +0200 (EET) Received: by mail-qk0-f195.google.com with SMTP id c13so1262801qke.2 for ; Tue, 28 Nov 2017 11:06:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=Yydy9/RiM9t07n5jlCZYVlohBeFzioaPxZsg4yPPOKM=; b=pgGXs1m6IBJh60wK+KXFW94fnUaOzAacKMULUt+KaF4krt/kpDiICgiWiJjPdP/Hu6 QNL3v56FeqJhqD/ATeGzf5pXC3THEDCUOTLz7AicYQmryuFLUe0U/apVlsknBCTuOviN kyYyjVItpG65sBBwdqfcD+QmCSF8bvJflldnbVX80xRHeovRHGFbNkNjZ22ptFU9YyWD MNNNPl14EZI1DS9SQ9ur3y+LZoVn07fqJCAZGrlBewRGas/hid5vhiEUyT7QAqOnXHrA TE//z1jPMfrb1blt5LzhquipCQk9P/6GBq+Uj2DqE66RS7kvIrfMGy6lxWxRYoX2mpA7 eTVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=Yydy9/RiM9t07n5jlCZYVlohBeFzioaPxZsg4yPPOKM=; b=bLmw4iWo3kdOHQRbFJqdtAT9BCQbHonuGHYZyvxpf3jOMiFG2BccIVBKOcafVPrsAW SAYlAuIsShPBcdacnZMKh6AQD2wfn4a6tyEoUxbX3zb4kHXjNy7s4Qupozf+Zp1ip7pZ JYGv1mt7S8eW/1zz7LBssn23tLacmu7lXwwYqEiTqVO7JrxAVpigzu1NRD+ot8W5/WjI dgfSezRF+R/aANkiRA6s08pLeXDcJKK+yDttvZnHSG7oS9/ht4BrTir+74QUqnAOCxgk kp9ye3oMwBnTRDT7HhCkwyfJ0EpOdbMLyxqg5EnNN0mw82njZdeiA57LPv4oJyDfzkie pq2g== X-Gm-Message-State: AJaThX5PiqvOMmTNoTr/K7hELqOIdVopLnPjTQlL7VvWifS/uyFlOEyb o/I0WvG++NDXbAzK2PEsXG3wSg== X-Received: by 10.55.114.133 with SMTP id n127mr257398qkc.61.1511895464896; Tue, 28 Nov 2017 10:57:44 -0800 (PST) Received: from vimacbookpro.vimeows.com ([8.40.92.159]) by smtp.gmail.com with ESMTPSA id j30sm23033717qkh.61.2017.11.28.10.57.43 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 28 Nov 2017 10:57:44 -0800 (PST) From: Vittorio Giovara To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Nov 2017 13:57:41 -0500 Message-Id: <20171128185742.97858-1-vittorio.giovara@gmail.com> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH 1/2] vf_zscale: Relax color properties maximum bounds 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This simplifies adding new values, which are already validated elsewhere. Signed-off-by: Vittorio Giovara --- libavfilter/vf_zscale.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c index 09fd842fe5..972f720ee6 100644 --- a/libavfilter/vf_zscale.c +++ b/libavfilter/vf_zscale.c @@ -735,8 +735,8 @@ static const AVOption zscale_options[] = { { "unknown", 0, 0, AV_OPT_TYPE_CONST, {.i64 = -1}, 0, 0, FLAGS, "range" }, { "tv", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_RANGE_LIMITED}, 0, 0, FLAGS, "range" }, { "pc", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_RANGE_FULL}, 0, 0, FLAGS, "range" }, - { "primaries", "set color primaries", OFFSET(primaries), AV_OPT_TYPE_INT, {.i64 = -1}, -1, ZIMG_PRIMARIES_ST432_1, FLAGS, "primaries" }, - { "p", "set color primaries", OFFSET(primaries), AV_OPT_TYPE_INT, {.i64 = -1}, -1, ZIMG_PRIMARIES_ST432_1, FLAGS, "primaries" }, + { "primaries", "set color primaries", OFFSET(primaries), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, FLAGS, "primaries" }, + { "p", "set color primaries", OFFSET(primaries), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, FLAGS, "primaries" }, { "input", 0, 0, AV_OPT_TYPE_CONST, {.i64 = -1}, 0, 0, FLAGS, "primaries" }, { "709", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_PRIMARIES_709}, 0, 0, FLAGS, "primaries" }, { "unspecified", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_PRIMARIES_UNSPECIFIED}, 0, 0, FLAGS, "primaries" }, @@ -749,8 +749,8 @@ static const AVOption zscale_options[] = { { "smpte240m", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_PRIMARIES_240M}, 0, 0, FLAGS, "primaries" }, { "bt2020", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_PRIMARIES_2020}, 0, 0, FLAGS, "primaries" }, { "smpte432", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_PRIMARIES_ST432_1}, 0, 0, FLAGS, "primaries" }, - { "transfer", "set transfer characteristic", OFFSET(trc), AV_OPT_TYPE_INT, {.i64 = -1}, -1, ZIMG_TRANSFER_ARIB_B67, FLAGS, "transfer" }, - { "t", "set transfer characteristic", OFFSET(trc), AV_OPT_TYPE_INT, {.i64 = -1}, -1, ZIMG_TRANSFER_ARIB_B67, FLAGS, "transfer" }, + { "transfer", "set transfer characteristic", OFFSET(trc), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, FLAGS, "transfer" }, + { "t", "set transfer characteristic", OFFSET(trc), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, FLAGS, "transfer" }, { "input", 0, 0, AV_OPT_TYPE_CONST, {.i64 = -1}, 0, 0, FLAGS, "transfer" }, { "709", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_709}, 0, 0, FLAGS, "transfer" }, { "unspecified", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_UNSPECIFIED}, 0, 0, FLAGS, "transfer" }, @@ -767,8 +767,8 @@ static const AVOption zscale_options[] = { { "smpte2084", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_ST2084}, 0, 0, FLAGS, "transfer" }, { "iec61966-2-1", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_IEC_61966_2_1},0, 0, FLAGS, "transfer" }, { "arib-std-b67", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_TRANSFER_ARIB_B67}, 0, 0, FLAGS, "transfer" }, - { "matrix", "set colorspace matrix", OFFSET(colorspace), AV_OPT_TYPE_INT, {.i64 = -1}, -1, ZIMG_MATRIX_2020_CL, FLAGS, "matrix" }, - { "m", "set colorspace matrix", OFFSET(colorspace), AV_OPT_TYPE_INT, {.i64 = -1}, -1, ZIMG_MATRIX_2020_CL, FLAGS, "matrix" }, + { "matrix", "set colorspace matrix", OFFSET(colorspace), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, FLAGS, "matrix" }, + { "m", "set colorspace matrix", OFFSET(colorspace), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, FLAGS, "matrix" }, { "input", 0, 0, AV_OPT_TYPE_CONST, {.i64 = -1}, 0, 0, FLAGS, "matrix" }, { "709", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_MATRIX_709}, 0, 0, FLAGS, "matrix" }, { "unspecified", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_MATRIX_UNSPECIFIED}, 0, 0, FLAGS, "matrix" }, @@ -786,12 +786,12 @@ static const AVOption zscale_options[] = { { "in_range", "set input color range", OFFSET(range_in), AV_OPT_TYPE_INT, {.i64 = -1}, -1, ZIMG_RANGE_FULL, FLAGS, "range" }, { "rangein", "set input color range", OFFSET(range_in), AV_OPT_TYPE_INT, {.i64 = -1}, -1, ZIMG_RANGE_FULL, FLAGS, "range" }, { "rin", "set input color range", OFFSET(range_in), AV_OPT_TYPE_INT, {.i64 = -1}, -1, ZIMG_RANGE_FULL, FLAGS, "range" }, - { "primariesin", "set input color primaries", OFFSET(primaries_in), AV_OPT_TYPE_INT, {.i64 = -1}, -1, ZIMG_PRIMARIES_ST432_1, FLAGS, "primaries" }, - { "pin", "set input color primaries", OFFSET(primaries_in), AV_OPT_TYPE_INT, {.i64 = -1}, -1, ZIMG_PRIMARIES_ST432_1, FLAGS, "primaries" }, - { "transferin", "set input transfer characteristic", OFFSET(trc_in), AV_OPT_TYPE_INT, {.i64 = -1}, -1, ZIMG_TRANSFER_ARIB_B67, FLAGS, "transfer" }, - { "tin", "set input transfer characteristic", OFFSET(trc_in), AV_OPT_TYPE_INT, {.i64 = -1}, -1, ZIMG_TRANSFER_ARIB_B67, FLAGS, "transfer" }, - { "matrixin", "set input colorspace matrix", OFFSET(colorspace_in), AV_OPT_TYPE_INT, {.i64 = -1}, -1, ZIMG_MATRIX_2020_CL, FLAGS, "matrix" }, - { "min", "set input colorspace matrix", OFFSET(colorspace_in), AV_OPT_TYPE_INT, {.i64 = -1}, -1, ZIMG_MATRIX_2020_CL, FLAGS, "matrix" }, + { "primariesin", "set input color primaries", OFFSET(primaries_in), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, FLAGS, "primaries" }, + { "pin", "set input color primaries", OFFSET(primaries_in), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, FLAGS, "primaries" }, + { "transferin", "set input transfer characteristic", OFFSET(trc_in), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, FLAGS, "transfer" }, + { "tin", "set input transfer characteristic", OFFSET(trc_in), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, FLAGS, "transfer" }, + { "matrixin", "set input colorspace matrix", OFFSET(colorspace_in), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, FLAGS, "matrix" }, + { "min", "set input colorspace matrix", OFFSET(colorspace_in), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, FLAGS, "matrix" }, { "chromal", "set output chroma location", OFFSET(chromal), AV_OPT_TYPE_INT, {.i64 = -1}, -1, ZIMG_CHROMA_BOTTOM, FLAGS, "chroma" }, { "c", "set output chroma location", OFFSET(chromal), AV_OPT_TYPE_INT, {.i64 = -1}, -1, ZIMG_CHROMA_BOTTOM, FLAGS, "chroma" }, { "input", 0, 0, AV_OPT_TYPE_CONST, {.i64 = -1}, 0, 0, FLAGS, "chroma" },