From patchwork Mon Aug 29 00:02:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hutchinson X-Patchwork-Id: 37540 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1633784pzh; Sun, 28 Aug 2022 17:03:37 -0700 (PDT) X-Google-Smtp-Source: AA6agR68lhM5ypna5N6jBxPQCICJgo5dY3/80x4p93F4MBqCsm3+WJ83kbo6PjAnejeoS/ah8/xv X-Received: by 2002:a05:6402:5201:b0:448:7b26:b94f with SMTP id s1-20020a056402520100b004487b26b94fmr1487886edd.119.1661731417524; Sun, 28 Aug 2022 17:03:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661731417; cv=none; d=google.com; s=arc-20160816; b=En3D+O1Fg91SKxq9XoO3cqBayj3K7MSGGxo6n7yCnxWKdidvTY7GrVnDSxkQn+4xJB IpmSCf1FCZsTyLdQcVk3/bjOEF6pCxV9uX62wpQMRD6m6n4VtMlgtQ56LtU/O5mtPNTu 5zaCIITCdQz0NDb0hVqXGdpTqzADF8BNM8efVj9h/5DSyQ2NnuUpMQFkZxMq2lBn5jum Q34D2wCVtrt58p3hyfcbsje9enDG63Nx5Flbel+4eN6dvoNqYWHxNhr87/BxcNEdRFBE MUDkjqwp8LjNpUfJq8kBeKDZEfnFDgCIKphOKKauRL+Ab/75LZmYDZcV/K+dwf6uHKAs 1+eQ== 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=HEezKmLiFhLuc8XF09qVm0bre9OjbwiXgTnk7ANZWdE=; b=NLvmOweOFSs5W7VGhFNntTXZsSmeWfHLl8M4rSBBB/gmG0F6yvhbYYQXDViEjkcLsH DqaKfn2YLnXyfF2SoIq48INU2AdspSEBN+OBY0GLs8Y32Wq+zUYl5MbRCJ63lP8wzD3+ 7HCPs5KuJMfPN5tZZfXoqywfE8uW5DBdynWY4IqMSUZB8oXQfqelTjndX63SANGPoYAD WR9fWOO8oOzUXiSqNkwSlT+43hMeCtZIZYc+WRQj2vl6ohnDn1YUoy07hDbKfP9EY98B 9FTnIU8/xdAeNIs9kU7YpUAmTIbA9gFFrzrPCOcnn1oUDTDjA5SeBH/3gk/jG11S9GIx uGfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=U52cvHJC; 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 dr17-20020a170907721100b0073dd6670bb7si5380668ejc.175.2022.08.28.17.03.37; Sun, 28 Aug 2022 17:03:37 -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=U52cvHJC; 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 4172068B9DB; Mon, 29 Aug 2022 03:03:05 +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 44AD768B9C9 for ; Mon, 29 Aug 2022 03:02:58 +0300 (EEST) Received: by mail-vk1-f173.google.com with SMTP id i129so3069175vke.3 for ; Sun, 28 Aug 2022 17:02:58 -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=IIMPa/UJzQ46/gDbr3S6uX+/yDZXSptYHON1ZSoni90=; b=U52cvHJCzRvKfcSp55yQKcPzhj7TWsvSkGWebw4JtrCYIStuSy+Q/xrklm/gL5Omvo /cFIM19po2flec2lpr79VrYom7iF0W/0Se0t9TJiVhVjgWK1Ti+BNoOWMC4mEU2zPZ7a qOWIngsBWwYWBtIUmtJKGsRLNVbiSTYgFif51YfTsLAM+5tQlV+WA+/PQSTMBe6ZD994 UFXppG2xF1qzAmyFv2JE154hpvQAsgdtpm4LjOeCBnXHP4cdtsIaxpAxnBVSAoagJ88A 2ixCKshAdoSl2cSMnHgO2m2atEU8OO7pAcoKyfJiiny+YbPfl5yOjLRQwp0450Yv9eVU fYaQ== 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=IIMPa/UJzQ46/gDbr3S6uX+/yDZXSptYHON1ZSoni90=; b=Pv6IqDjjrdi9CBUtg67c/Sgnu2uLVoxDmCCXXHITEORZr1nUUUIsNcUqnzGyzA8O/6 oqwbICPKuYwOX4r4PxcHtiPrfqfJtt33/kA8eqjb5TViGdAtiaeBzqSrzk08FhI6z8iQ xMJv0/h+1PVkKmbhqpJjA43GU/KeZQqg8wT7Er3cGcI5sL8X9SLB89NN/yDgzNzkWxn6 e491p8iS398D5zZ5xRSMnGNgRdcrFSTG+g5V0TehinxSkp8VCd/yuWADmv2uKikErMKA RitGZ+KcZCJLHdxtsU95emfGygf/DheB4hlj5s9a8EiZ5uTocamrkxKlf4HppVpiHbJj mSgw== X-Gm-Message-State: ACgBeo1o8WezWPL06WmfHJ+11mIl2NXHUYxk0H1A32SPoD5RF5Laka0d nnUT+UZGPAfONAH9jQvJrdoy2JnGKh7pEg== X-Received: by 2002:a1f:2749:0:b0:393:b7ad:c976 with SMTP id n70-20020a1f2749000000b00393b7adc976mr1909219vkn.30.1661731376290; Sun, 28 Aug 2022 17:02:56 -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.02.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Aug 2022 17:02:55 -0700 (PDT) From: Stephen Hutchinson To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Aug 2022 20:02:39 -0400 Message-Id: <20220829000244.71123-5-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 4/9] avformat/avisynth: add read_frameprop_field_order 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: I9cXU5DPUWLC Signed-off-by: Stephen Hutchinson --- libavformat/avisynth.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index 5d726d70a5..c76b50421c 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -104,6 +104,7 @@ typedef struct AviSynthContext { /* (de)activate reading frame properties */ int frameprops; + int frameprop_field_order; int frameprop_sar; /* Linked list pointers. */ @@ -525,21 +526,23 @@ static int avisynth_create_stream_video(AVFormatContext *s, AVStream *st) if(avs->frameprops) { /* Field order */ - if(avs_library.avs_prop_get_type(avs->env, avsmap, "_FieldBased") == AVS_PROPTYPE_UNSET) { - st->codecpar->field_order = AV_FIELD_UNKNOWN; - } else { - switch (avs_library.avs_prop_get_int(avs->env, avsmap, "_FieldBased", 0, &error)) { - case 0: - st->codecpar->field_order = AV_FIELD_PROGRESSIVE; - break; - case 1: - st->codecpar->field_order = AV_FIELD_BB; - break; - case 2: - st->codecpar->field_order = AV_FIELD_TT; - break; - default: + if(avs->frameprop_field_order) { + if(avs_library.avs_prop_get_type(avs->env, avsmap, "_FieldBased") == AVS_PROPTYPE_UNSET) { st->codecpar->field_order = AV_FIELD_UNKNOWN; + } else { + switch (avs_library.avs_prop_get_int(avs->env, avsmap, "_FieldBased", 0, &error)) { + case 0: + st->codecpar->field_order = AV_FIELD_PROGRESSIVE; + break; + case 1: + st->codecpar->field_order = AV_FIELD_BB; + break; + case 2: + st->codecpar->field_order = AV_FIELD_TT; + break; + default: + st->codecpar->field_order = AV_FIELD_UNKNOWN; + } } } @@ -1152,6 +1155,7 @@ static int avisynth_read_seek(AVFormatContext *s, int stream_index, #define OFFSET(x) offsetof(AviSynthContext, x) static const AVOption avisynth_options[] = { { "read_frameprops", "Read frame properties from script (AviSynth+ v3.7.1+).", OFFSET(frameprops), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, AV_OPT_FLAG_DECODING_PARAM }, + { "read_frameprop_field_order", "Read field order from script's frame properties (AviSynth+ v3.7.1+).", OFFSET(frameprop_field_order), 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 }, };