From patchwork Mon Aug 29 00:02:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hutchinson X-Patchwork-Id: 37544 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1634061pzh; Sun, 28 Aug 2022 17:04:13 -0700 (PDT) X-Google-Smtp-Source: AA6agR4qGQ48XF1AlRtUlBuMJffxKrjs1AmKEpV8r9t4kftwOHIwnYXWHJg73wAy7khP+e859D1O X-Received: by 2002:a17:907:2bd1:b0:73d:d154:8e42 with SMTP id gv17-20020a1709072bd100b0073dd1548e42mr11265263ejc.585.1661731453705; Sun, 28 Aug 2022 17:04:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661731453; cv=none; d=google.com; s=arc-20160816; b=mrYiWFTDE2FAv1jT1bsZrv1I7OxOgrHbXw3HkLC4B2p4+bWcHXgRPFCFDusK7/wkgI sziUS1rTTXDdwvqZ1OwFh4MOg2rngOtHBK2oD9GjHJcoIpfvOE3wIwfOPXGgEc+2jHdb ptemwK974A9Aj+b8bwg0hIho4bEzD4j7H6FuqvOfvnwmH/h9zupOmC2nReSFuc8rry/U C+o0xObn0kogcUOvvx1AwDxPUPneeasKGGJH8g64RDxwLDiWxQviAR3VvfxBTUzhrg/J PZXo2dx80kSwgq8M7A3303pr+Eaj8W6M8yOZDYST9qgC+xBl7eXIzZCdqGt3UqnocfvF 1cLA== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=wGBotSi5FCeAVuBKGL3094A6OBRu+mF/KRWBMnkIBEI=; b=pkvO1nh3GVPR/da922x6YIowLygPf5ePC/4TK5T5gSVfT/W5ZK5lGvdHX4cV2paVCQ lSrQYFXRZcIppKrkMKviT5qm4+n5ljbBctUktCxd4Mc+sAj1i3HlfEpwrtwPvoACMrtq lGa2IteAXNE7zX+Kzio/Rbq5o5nSt2h1BqaEGRQVEXCD/BTv3RRgs1vTo5cyybFd0TY4 YSJDNt0iIEXU0hxuInLI9cpMBgHBetNGDCT7n3oWQnis1b4GlVW9mQuu3Hr8xhMnaA0j SvbCAQKfmyra911m33uWf0Rr4+oxecnnylh7KQhXQUYycbflHpGImRqkcVNzppfwxVUQ xV5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=o16RhWzF; 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 o19-20020a170906975300b0073c5d9b3440si5791822ejy.781.2022.08.28.17.04.12; Sun, 28 Aug 2022 17:04:13 -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=o16RhWzF; 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 3E46468B9CA; Mon, 29 Aug 2022 03:03:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f54.google.com (mail-vs1-f54.google.com [209.85.217.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5E9CB68B9DC for ; Mon, 29 Aug 2022 03:03:03 +0300 (EEST) Received: by mail-vs1-f54.google.com with SMTP id k2so6825884vsk.8 for ; Sun, 28 Aug 2022 17:03:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=Is2VhFfI3JHAaUgSPfiE6sivllDapo+h9kArqLJam/U=; b=o16RhWzFdynau72rM2znBd0nAfLk4nBL3yAHwMHIUQEwaMSkx+X19lombEwQbWwk2f li96CsxG24yfsc6dFyOGgg5eF6AA+eSCFXyQBjb6OviBLl+JnRLgXr9R0j93JLLdI420 yd1DvGkcCi9DGaMoj8eLNRTMBhYXCp3B1ABAuBGZJ4QxYdaOWyGWddZ1kbaMj7vt4Lgn E7VPK6WdQHCWv6pl2AMzlTcZ55c075ZEN1YX43dSAZwn7q+fgO4+b8KyHVQmFixAMPL1 I3dPvPJ/H918DbLRokif3UAHcShnb9KIjvSpXfcdVt97YtP9xKjNBqj6t7seau4JZv9U wSSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=Is2VhFfI3JHAaUgSPfiE6sivllDapo+h9kArqLJam/U=; b=T4F9pSX428hnZu4hAj81fo9jtrvxw1j/ZAYKRidoUahLDUNx/hpzKpf7JDPAgCt8xO Yd1TpLp9MfgGGht+oAUiUvw8MMMnqGZIekNDIaXDShHCHIwFD1RaPUqW5d9isAws0mIC xrwCL9eRKykbSAUAzb22ULweXK5XQKP9WVAl4RNOb0gCT38xrWaeozVtI1Fph0rLKish v8VqBuS+8O7j1+FbucSRT9h5vzSinJ6lBR63WAdC3do0NkyLmWTbkLTcHBEOa7EsveUX Om+hNDVOj1BqIcOQgyxteNyNLTALKwETPgHrv1kqkzO1H+rCePxkN/ku9jMNmHtYid8h QtLQ== X-Gm-Message-State: ACgBeo3Mo4gV/l9JYuAPuv7ausr/v7+2BQOe1ZxNM3wAhxWrSoHK6HMX qvJpt1Ap89/vghpBlQqALngCpMUly4UXKA== X-Received: by 2002:a05:6102:943:b0:388:95b3:ae31 with SMTP id a3-20020a056102094300b0038895b3ae31mr2740312vsi.48.1661731381680; Sun, 28 Aug 2022 17:03:01 -0700 (PDT) Received: from cappuccino.. (075-115-109-114.inf.spectrum.com. [75.115.109.114]) by smtp.gmail.com with ESMTPSA id z5-20020ab05645000000b0039f07e29623sm1382804uaa.4.2022.08.28.17.03.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Aug 2022 17:03:01 -0700 (PDT) From: Stephen Hutchinson To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Aug 2022 20:02:43 -0400 Message-Id: <20220829000244.71123-9-qyot27@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220829000244.71123-1-qyot27@gmail.com> References: <20220829000244.71123-1-qyot27@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 8/9] avformat/avisynth: add read_frameprop_matrix option 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: Stephen Hutchinson Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: G0eDRZV/PRbz Signed-off-by: Stephen Hutchinson --- libavformat/avisynth.c | 98 ++++++++++++++++++++++-------------------- 1 file changed, 51 insertions(+), 47 deletions(-) diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index ff4435758e..99173a8d51 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -108,6 +108,7 @@ typedef struct AviSynthContext { int frameprop_range; int frameprop_primaries; int frameprop_transfer; + int frameprop_matrix; int frameprop_sar; /* Linked list pointers. */ @@ -671,54 +672,56 @@ static int avisynth_create_stream_video(AVFormatContext *s, AVStream *st) } /* Matrix coefficients */ - if(avs_library.avs_prop_get_type(avs->env, avsmap, "_Matrix") == AVS_PROPTYPE_UNSET) { - st->codecpar->color_space = AVCOL_SPC_UNSPECIFIED; - } else { - switch (avs_library.avs_prop_get_int(avs->env, avsmap, "_Matrix", 0, &error)) { - case 0: - st->codecpar->color_space = AVCOL_SPC_RGB; - break; - case 1: - st->codecpar->color_space = AVCOL_SPC_BT709; - break; - case 2: - st->codecpar->color_space = AVCOL_SPC_UNSPECIFIED; - break; - case 4: - st->codecpar->color_space = AVCOL_SPC_FCC; - break; - case 5: - st->codecpar->color_space = AVCOL_SPC_BT470BG; - break; - case 6: - st->codecpar->color_space = AVCOL_SPC_SMPTE170M; - break; - case 7: - st->codecpar->color_space = AVCOL_SPC_SMPTE240M; - break; - case 8: - st->codecpar->color_space = AVCOL_SPC_YCGCO; - break; - case 9: - st->codecpar->color_space = AVCOL_SPC_BT2020_NCL; - break; - case 10: - st->codecpar->color_space = AVCOL_SPC_BT2020_CL; - break; - case 11: - st->codecpar->color_space = AVCOL_SPC_SMPTE2085; - break; - case 12: - st->codecpar->color_space = AVCOL_SPC_CHROMA_DERIVED_NCL; - break; - case 13: - st->codecpar->color_space = AVCOL_SPC_CHROMA_DERIVED_CL; - break; - case 14: - st->codecpar->color_space = AVCOL_SPC_ICTCP; - break; - default: + if(avs->frameprop_matrix) { + if(avs_library.avs_prop_get_type(avs->env, avsmap, "_Matrix") == AVS_PROPTYPE_UNSET) { st->codecpar->color_space = AVCOL_SPC_UNSPECIFIED; + } else { + switch (avs_library.avs_prop_get_int(avs->env, avsmap, "_Matrix", 0, &error)) { + case 0: + st->codecpar->color_space = AVCOL_SPC_RGB; + break; + case 1: + st->codecpar->color_space = AVCOL_SPC_BT709; + break; + case 2: + st->codecpar->color_space = AVCOL_SPC_UNSPECIFIED; + break; + case 4: + st->codecpar->color_space = AVCOL_SPC_FCC; + break; + case 5: + st->codecpar->color_space = AVCOL_SPC_BT470BG; + break; + case 6: + st->codecpar->color_space = AVCOL_SPC_SMPTE170M; + break; + case 7: + st->codecpar->color_space = AVCOL_SPC_SMPTE240M; + break; + case 8: + st->codecpar->color_space = AVCOL_SPC_YCGCO; + break; + case 9: + st->codecpar->color_space = AVCOL_SPC_BT2020_NCL; + break; + case 10: + st->codecpar->color_space = AVCOL_SPC_BT2020_CL; + break; + case 11: + st->codecpar->color_space = AVCOL_SPC_SMPTE2085; + break; + case 12: + st->codecpar->color_space = AVCOL_SPC_CHROMA_DERIVED_NCL; + break; + case 13: + st->codecpar->color_space = AVCOL_SPC_CHROMA_DERIVED_CL; + break; + case 14: + st->codecpar->color_space = AVCOL_SPC_ICTCP; + break; + default: + st->codecpar->color_space = AVCOL_SPC_UNSPECIFIED; + } } } @@ -1168,6 +1171,7 @@ static const AVOption avisynth_options[] = { { "read_frameprop_range", "Read color range from script's frame properties (AviSynth+ v3.7.1+).", OFFSET(frameprop_range), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, AV_OPT_FLAG_DECODING_PARAM }, { "read_frameprop_primaries", "Read color primaries from script's frame properties (AviSynth+ v3.7.1+).", OFFSET(frameprop_primaries), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, AV_OPT_FLAG_DECODING_PARAM }, { "read_frameprop_transfer", "Read color transfer characteristics from script's frame properties (AviSynth+ v3.7.1+).", OFFSET(frameprop_transfer), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, AV_OPT_FLAG_DECODING_PARAM }, + { "read_frameprop_matrix", "Read matrix coefficients from script's frame properties (AviSynth+ v3.7.1+).", OFFSET(frameprop_matrix), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, AV_OPT_FLAG_DECODING_PARAM }, { "read_frameprop_sar", "Read SAR from script's frame properties (AviSynth+ v3.7.1+).", OFFSET(frameprop_sar), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, AV_OPT_FLAG_DECODING_PARAM }, { NULL }, };