From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 74A50437BB for ; Mon, 29 Aug 2022 00:03:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0676E68B9D9; Mon, 29 Aug 2022 03:03:05 +0300 (EEST) 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-Google-Smtp-Source: AA6agR59O8aT8JV9yGgVtp5MS5MTU2F9R8svHo4hefsYI8R7BUqAzaSxxJi8lpflREssS37dbIgnxw== 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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 }, }; -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".