From patchwork Mon Aug 29 00:02:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hutchinson X-Patchwork-Id: 37543 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1633970pzh; Sun, 28 Aug 2022 17:04:04 -0700 (PDT) X-Google-Smtp-Source: AA6agR7RH+9WR0GRwMuePGgOTnsIBMiKXM/843XYK+NOeTM2y8e+t0+ZuBtRgIvwB/8t4xgYW8xN X-Received: by 2002:a05:6402:51ce:b0:43e:74bc:dce with SMTP id r14-20020a05640251ce00b0043e74bc0dcemr14942132edd.225.1661731444319; Sun, 28 Aug 2022 17:04:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661731444; cv=none; d=google.com; s=arc-20160816; b=KXUZK+G3GAc3H0G9Wdyglt5MlRvuK7lfCQ/qFVwpgpwOxtOUNMxzErBzJjSHIq4VO4 QNxnioij0WVUPSpFIO58k3cLoRy3eh1AhWx8I07BdvlJnHn/A8zeWl44P0g6y5wAwn9p kaLZBqG9+wA4r5OGb4uKsqTKDQNhZP6ztlsDRjv7Jvd9EKUU34+pwSogmtTYPVRXEzHD 3qYnZOCf3U0ebIJ0KAMbzqsZe6+TvNUyNrpEJEfNJZs2bD2PzJUXUykKSz4KnKOyUF9h 1KHeJUEHHDVZghz2xMJsF/BvNZW6zkfyZBHeMSBVzq42VsNPhmzLzypw+fY2ziES6ewK /Vhg== 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=PKRuCUZDlDnYvbwaA8ZqD8zvCyaQnRHoJTwBNkTslwE=; b=UR+XxdmQBCEleZYLTeFnjPvdtVDD4K3FA9lv/jT051Z/5Kh2it6/2sL05bprDzJVcQ atSDq+eI9/lmcFxLDZ5xzaph4wuusTC/mt84ER7RI769Zux7+AxiGB4Nt4d439FIb8Ec a74ma8Ge6w19kUe/f+Gr8RIZoA2QS0VLHRbW6An5szzzbFJE0ErQlwTRSgQNeyJhTNxY LmFmOJsOtnS1z4mwLbOygOk/I/99a4C4bNs0SPL8mw8iSgE77CJzIi55eth0R/GVP7bo I0IC0TB/yJMHn0BnWbA4S/N/bF0rSbYZg54Pst12TPDp8oe47WdIY6b6waZqBe9L4A+I J1vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=avQ18ypy; 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 m6-20020a056402510600b00447c220a3desi6814854edd.167.2022.08.28.17.04.04; Sun, 28 Aug 2022 17:04:04 -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=avQ18ypy; 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 3DD3468BA38; Mon, 29 Aug 2022 03:03:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f43.google.com (mail-vs1-f43.google.com [209.85.217.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E746868B9DC for ; Mon, 29 Aug 2022 03:03:01 +0300 (EEST) Received: by mail-vs1-f43.google.com with SMTP id m66so6818305vsm.12 for ; Sun, 28 Aug 2022 17:03:01 -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=VYbQQ7o0/mld4qFpPjX8hrrnIhstZpCqpF5ZMEtrbHc=; b=avQ18ypyUE/+U/oPj9EymGixgkFcmVH3IfMA7lxGrD7b/ARbCkxbh+EkeNA9pmV5Pl 7lTJ/+dI8gEjLSxfyQjT4E44fXDzlIB41/nkdVDmNHYrt2btDRBIX1iqpPRCCFQ1G5U0 I+3fW7PTlo3sfjuQXT28A2SZ/KCKANfD1xys7eoCVdILOcsGRtz2ipMFCB5ASWQR8dkg QCMCyjSBPu18tJ9Kv9z5wm0CJW13yP+7c8H0CliYhlxSrfDM9r1WdP6wQgjlJxa8pY7e ss6YAiU2pHn6RHIz9Y7tB9lrzU/k1xv6DvWW13i4b13R8ELULU64BtZdFx0CXjp/voCg 1j0g== 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=VYbQQ7o0/mld4qFpPjX8hrrnIhstZpCqpF5ZMEtrbHc=; b=eg03/psMIx87ZHoUsLWLGBg1JUoN1Tkhco9Upc2DRgiyJpz0qPq/e/nCQ8lYsaJU3h u15247RaBCujMyx2pT+8xfwGHGg3ReoIyMT10VJPB08TKjG35X7A42IhsLHoHWJ7kmEg mj/o7wKrj/MyX9GbbX3TMNkjQeYFbglWfOczUMCWv+LoNQawatS6dxnMNj2mAWZD5tUx ScEkFGfK32N9eZp38tqp7ASo7BhK4keNx5giur+NK18j63D6UNglnSUUqUQ0W7wP58af 9ytLaA9PKoGxKZO5n39Srf5VR8N1oOYqzF6A7yhNjHC3OpV4OCvm88Rw6+ku65r1UUMk OcIg== X-Gm-Message-State: ACgBeo2K7j4TyT4gaE9QO07JauCxJVc569lkQ7XzdYd6gznhGAFfYgSR /l+OqnmInB+9kITRtS+M3sjhcedNuQRIOw== X-Received: by 2002:a67:e15e:0:b0:390:d7ec:b5ef with SMTP id o30-20020a67e15e000000b00390d7ecb5efmr1039909vsl.66.1661731380367; Sun, 28 Aug 2022 17:03:00 -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.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Aug 2022 17:02:59 -0700 (PDT) From: Stephen Hutchinson To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Aug 2022 20:02:42 -0400 Message-Id: <20220829000244.71123-8-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 7/9] avformat/avisynth: add read_frameprop_transfer 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: OkDbqtRGQ6dO Signed-off-by: Stephen Hutchinson --- libavformat/avisynth.c | 112 +++++++++++++++++++++-------------------- 1 file changed, 58 insertions(+), 54 deletions(-) diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index 945ce0e245..ff4435758e 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -107,6 +107,7 @@ typedef struct AviSynthContext { int frameprop_field_order; int frameprop_range; int frameprop_primaries; + int frameprop_transfer; int frameprop_sar; /* Linked list pointers. */ @@ -611,60 +612,62 @@ static int avisynth_create_stream_video(AVFormatContext *s, AVStream *st) } /* Color Transfer Characteristics */ - switch (avs_library.avs_prop_get_int(avs->env, avsmap, "_Transfer", 0, &error)) { - case 1: - st->codecpar->color_trc = AVCOL_TRC_BT709; - break; - case 2: - st->codecpar->color_trc = AVCOL_TRC_UNSPECIFIED; - break; - case 4: - st->codecpar->color_trc = AVCOL_TRC_GAMMA22; - break; - case 5: - st->codecpar->color_trc = AVCOL_TRC_GAMMA28; - break; - case 6: - st->codecpar->color_trc = AVCOL_TRC_SMPTE170M; - break; - case 7: - st->codecpar->color_trc = AVCOL_TRC_SMPTE240M; - break; - case 8: - st->codecpar->color_trc = AVCOL_TRC_LINEAR; - break; - case 9: - st->codecpar->color_trc = AVCOL_TRC_LOG; - break; - case 10: - st->codecpar->color_trc = AVCOL_TRC_LOG_SQRT; - break; - case 11: - st->codecpar->color_trc = AVCOL_TRC_IEC61966_2_4; - break; - case 12: - st->codecpar->color_trc = AVCOL_TRC_BT1361_ECG; - break; - case 13: - st->codecpar->color_trc = AVCOL_TRC_IEC61966_2_1; - break; - case 14: - st->codecpar->color_trc = AVCOL_TRC_BT2020_10; - break; - case 15: - st->codecpar->color_trc = AVCOL_TRC_BT2020_12; - break; - case 16: - st->codecpar->color_trc = AVCOL_TRC_SMPTE2084; - break; - case 17: - st->codecpar->color_trc = AVCOL_TRC_SMPTE428; - break; - case 18: - st->codecpar->color_trc = AVCOL_TRC_ARIB_STD_B67; - break; - default: - st->codecpar->color_trc = AVCOL_TRC_UNSPECIFIED; + if(avs->frameprop_transfer) { + switch (avs_library.avs_prop_get_int(avs->env, avsmap, "_Transfer", 0, &error)) { + case 1: + st->codecpar->color_trc = AVCOL_TRC_BT709; + break; + case 2: + st->codecpar->color_trc = AVCOL_TRC_UNSPECIFIED; + break; + case 4: + st->codecpar->color_trc = AVCOL_TRC_GAMMA22; + break; + case 5: + st->codecpar->color_trc = AVCOL_TRC_GAMMA28; + break; + case 6: + st->codecpar->color_trc = AVCOL_TRC_SMPTE170M; + break; + case 7: + st->codecpar->color_trc = AVCOL_TRC_SMPTE240M; + break; + case 8: + st->codecpar->color_trc = AVCOL_TRC_LINEAR; + break; + case 9: + st->codecpar->color_trc = AVCOL_TRC_LOG; + break; + case 10: + st->codecpar->color_trc = AVCOL_TRC_LOG_SQRT; + break; + case 11: + st->codecpar->color_trc = AVCOL_TRC_IEC61966_2_4; + break; + case 12: + st->codecpar->color_trc = AVCOL_TRC_BT1361_ECG; + break; + case 13: + st->codecpar->color_trc = AVCOL_TRC_IEC61966_2_1; + break; + case 14: + st->codecpar->color_trc = AVCOL_TRC_BT2020_10; + break; + case 15: + st->codecpar->color_trc = AVCOL_TRC_BT2020_12; + break; + case 16: + st->codecpar->color_trc = AVCOL_TRC_SMPTE2084; + break; + case 17: + st->codecpar->color_trc = AVCOL_TRC_SMPTE428; + break; + case 18: + st->codecpar->color_trc = AVCOL_TRC_ARIB_STD_B67; + break; + default: + st->codecpar->color_trc = AVCOL_TRC_UNSPECIFIED; + } } /* Matrix coefficients */ @@ -1164,6 +1167,7 @@ static const AVOption avisynth_options[] = { { "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_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_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 }, };