From patchwork Mon Aug 29 00:02:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hutchinson X-Patchwork-Id: 37545 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1634136pzh; Sun, 28 Aug 2022 17:04:21 -0700 (PDT) X-Google-Smtp-Source: AA6agR5GAufe79jsM2TnxrESXu6LAJx81hxVFhVWREDvNi/dqZeGEaE9HKIWw6vebMkZh+K0X6KY X-Received: by 2002:a17:907:1c89:b0:734:d05c:582e with SMTP id nb9-20020a1709071c8900b00734d05c582emr11975490ejc.282.1661731461762; Sun, 28 Aug 2022 17:04:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661731461; cv=none; d=google.com; s=arc-20160816; b=afV0p79uizED4LRW9ZfiIEJxHNvijuepW/WmJDPFsTwTi1PVKQSUnv+pDWdzRAX0TG PQP1flK3Y8KMZLmmspmMc/V1T4UxGXanhx89URKE0fhu3VKSRdk9AphcYZ/axe7Fq8J6 JiSG5uQHJa+Sdx9flnHffT98S9Cij7N399SqYxlSDQ3YaQqv0SDutDXq9xH8tOFkckQW zpWNTgSq8ZT/YeqUVx5Y7gunGjkScHO7Awz1xNgHf5wR5hhcAqI5EG5AK8wHMcuPwhrb mNCt50/ZAM9xgKw62r9bkQwDUnYFqZ06ojjoaHFg2Wv7Msy0Ty7qRZKsDxIh/YtQZTrR Wmeg== 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=hJpO4rQtVH6On6+cz2s/B19qPzH4gKaDayBqzCGjJlw=; b=q0SoOtvrMcpg4el/TvgXFArlZUKnKiZFDgggpz8EWbyFUhhTtUDquDc/a0VmTKkUTN vEh/RaKTnQY6d/BC2E2azPmyePCX0hsaHhDJE8JxjFmmPE73rJKqKJpCG8fCGXt93UVM P8GuxCgB22+OIRrH+tfa4kT3QyZHcZURJqwYbhmLwi9pAJg0ENk5iowyATblYDorGgkZ ECPjhyBFR/Mik8m1yya4jacMVZtPOdNZwPszqqZbL8Zl3R4d3m89WNkw6vGTKdUowm2A 3KHL/WoyiziDUftBvx7CKhekGJvEJPYQnwP3TdQIhuJGsaTbHJ9chU2VdyN9jMQIzoeV M6yQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=qIYy6q4e; 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 p2-20020a50cd82000000b00445cdd8f83fsi2523265edi.334.2022.08.28.17.04.21; Sun, 28 Aug 2022 17:04:21 -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=qIYy6q4e; 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 23DFA68BA0C; Mon, 29 Aug 2022 03:03:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk1-f173.google.com (mail-vk1-f173.google.com [209.85.221.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA6DB68B9DC for ; Mon, 29 Aug 2022 03:03:03 +0300 (EEST) Received: by mail-vk1-f173.google.com with SMTP id i129so3069239vke.3 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=MbFKUZkGpIY2eSDrqEXFVKpNw73Jkm8HETINaFaNPTE=; b=qIYy6q4eYnIin9VC7R+QK7fDt8X4/ydA5Jw0brbEaHKeCCnwtb2ChRu1d1rhtDL5Vt N/xI5/EN0gzUktG1in6ct+QscXS4sKCMT0+5EnDgW/DmbO+cCbHxNi+JWPWsHhALSZkl 3yTADghvpJNFe+4ErMn0TtQtBrL+/EyoqhkkYBXD9RU0DXGaaSZ/q+ZYkPoD7hBt3Qbc L21NynZyiSXbSWobguX5fwVdjwm740eJgYVksui+EPkQoMiotWB4+CACIktV34qUyZzv hswdsMNW9puW7DZNLNWIorkG2vIc4gqqVNNeWpvFCBz2LQJgbDFqCXLmVh/xZ5U7GOsk 9fuQ== 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=MbFKUZkGpIY2eSDrqEXFVKpNw73Jkm8HETINaFaNPTE=; b=Hz34cc+64IFctSohWI214WCSbhZ+p3xtiVpXZlV3Ekdv2EjxB8DKgHLF0RKlIKKCt2 b5VhUUKqLrQjplusDzoBbQlzxxB4jseuRSRWs4F6QwzBmmODW4z/vBpvTdrKDym8cejx ck1ji/3+QiXI5ZWCf7lxu5MvAFuPL7+zS8cT4dD6akEehlfOw1FqDRW4V/m70Zsj/aB6 gkhHinOxlPCwq9bJ/Cya8Ue+EVUS7Vi6SRPbi4Ydpv1wZzH64c6JZr0TLcQmv229UGag 8j++kTaSS0H6KxNx89Phi1tKhitwbxwmEThTg2Ce63gBf4sHtXVKkJ1Sxn0n1G6HDBU6 iWTQ== X-Gm-Message-State: ACgBeo0hwRMLtau5cRh8U2Riv9L/rDra3JdmHId5yGmZJ9XZVvtcXQgk 5OivezYPIY2ZXFy38fbXJnn1eTVuCqs2kw== X-Received: by 2002:a1f:e343:0:b0:393:c4dd:d8ac with SMTP id a64-20020a1fe343000000b00393c4ddd8acmr1767120vkh.30.1661731383041; Sun, 28 Aug 2022 17:03:03 -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.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Aug 2022 17:03:02 -0700 (PDT) From: Stephen Hutchinson To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Aug 2022 20:02:44 -0400 Message-Id: <20220829000244.71123-10-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 9/9] avformat/avisynth: add read_frameprop_chroma_location 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: oUCTUnOuowXI Signed-off-by: Stephen Hutchinson --- libavformat/avisynth.c | 50 +++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index 99173a8d51..4e7395c22b 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -109,6 +109,7 @@ typedef struct AviSynthContext { int frameprop_primaries; int frameprop_transfer; int frameprop_matrix; + int frameprop_chroma_location; int frameprop_sar; /* Linked list pointers. */ @@ -726,30 +727,32 @@ static int avisynth_create_stream_video(AVFormatContext *s, AVStream *st) } /* Chroma Location */ - if(avs_library.avs_prop_get_type(avs->env, avsmap, "_ChromaLocation") == AVS_PROPTYPE_UNSET) { - st->codecpar->chroma_location = AVCHROMA_LOC_UNSPECIFIED; - } else { - switch (avs_library.avs_prop_get_int(avs->env, avsmap, "_ChromaLocation", 0, &error)) { - case 0: - st->codecpar->chroma_location = AVCHROMA_LOC_LEFT; - break; - case 1: - st->codecpar->chroma_location = AVCHROMA_LOC_CENTER; - break; - case 2: - st->codecpar->chroma_location = AVCHROMA_LOC_TOPLEFT; - break; - case 3: - st->codecpar->chroma_location = AVCHROMA_LOC_TOP; - break; - case 4: - st->codecpar->chroma_location = AVCHROMA_LOC_BOTTOMLEFT; - break; - case 5: - st->codecpar->chroma_location = AVCHROMA_LOC_BOTTOM; - break; - default: + if(avs->frameprop_chroma_location) { + if(avs_library.avs_prop_get_type(avs->env, avsmap, "_ChromaLocation") == AVS_PROPTYPE_UNSET) { st->codecpar->chroma_location = AVCHROMA_LOC_UNSPECIFIED; + } else { + switch (avs_library.avs_prop_get_int(avs->env, avsmap, "_ChromaLocation", 0, &error)) { + case 0: + st->codecpar->chroma_location = AVCHROMA_LOC_LEFT; + break; + case 1: + st->codecpar->chroma_location = AVCHROMA_LOC_CENTER; + break; + case 2: + st->codecpar->chroma_location = AVCHROMA_LOC_TOPLEFT; + break; + case 3: + st->codecpar->chroma_location = AVCHROMA_LOC_TOP; + break; + case 4: + st->codecpar->chroma_location = AVCHROMA_LOC_BOTTOMLEFT; + break; + case 5: + st->codecpar->chroma_location = AVCHROMA_LOC_BOTTOM; + break; + default: + st->codecpar->chroma_location = AVCHROMA_LOC_UNSPECIFIED; + } } } @@ -1172,6 +1175,7 @@ static const AVOption avisynth_options[] = { { "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_chroma_location", "Read chroma location from script's frame properties (AviSynth+ v3.7.1+).", OFFSET(frameprop_chroma_location), 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 }, };