From patchwork Mon Aug 29 00:02:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hutchinson X-Patchwork-Id: 37542 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1633902pzh; Sun, 28 Aug 2022 17:03:55 -0700 (PDT) X-Google-Smtp-Source: AA6agR5lJpCSHVenYrODScK3KUM8So39NwNDT9R9ymC0ed7JKsdPqxMlIKYbk3SxfBVZvKsMYU1F X-Received: by 2002:a17:906:8a74:b0:73d:d6bd:660b with SMTP id hy20-20020a1709068a7400b0073dd6bd660bmr11085544ejc.200.1661731435570; Sun, 28 Aug 2022 17:03:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661731435; cv=none; d=google.com; s=arc-20160816; b=wo2/Y7ePS/cjKooRogTEUEIUiYXjkjGUBUyVibn4wsgrV5Pqv5Pz2ORacP99j7D0yG 1fr78bzCaV6fjO2q8hfxGphHuHhSjN54znWLqNQAwkiXnfaNerDEaGqobmiheqWgUt+c 0yW1I6hi+9fMiEG3UrcQoOLgsLQzNF+o0u6vC0LXCqlKBBndKzcIvBkd3bBZoHyodOux gi6+Ba8X3Ih/dzPUqIYy56JZukgoZbj7RiKnmRcCoiuoMLk+3FnQuHkLjZI0ObSmXq3F FT4qUDoozE4qJyUdlUUDaoTn8Kt/WMkDNSG8YZVqkhrOU+Un+aa7mdV9SgxScI8e3p6k N24g== 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=nFc1G9Lzg5Kgs62nW1+chC+dIzESVwTiw4ugtwu3knw=; b=SQyBZm1ekZs83If4MPU8gqqEzY6RnWRycEOqyIM/A+vv5353th5y0mzX+Y84u5ojfO aV+tHTLI8xzdejm9jObBduQABYgESvkwXRVlWsgj8izTE6dwyS3iXKuEC3B0UQvrWH0t tXEPFhEkI2X6WDCJwulDMiWz2o5vdqoyppw6nljMluLWMLv2uJYBcBGFwTEbOw/q/WYG kzhoJDFbOj5vNpyLk+seU1GKuOX/zsLHGn1wyYbUdCnypdhuYfGtYO1cfGUyoM1YNQ0O F20Y6Z3WECNTZv5kujH+gIm9RBZyau6COtW9tNwUDJATQW6DypN9WCBZRLlmQj1Hxu5V DYHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=I+IeG9Hq; 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 rh16-20020a17090720f000b007418427c7b4si1307108ejb.293.2022.08.28.17.03.55; Sun, 28 Aug 2022 17:03:55 -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=I+IeG9Hq; 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 5224068B93E; Mon, 29 Aug 2022 03:03:08 +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 BC29168B9CD for ; Mon, 29 Aug 2022 03:03:00 +0300 (EEST) Received: by mail-vs1-f43.google.com with SMTP id f185so2039989vsc.4 for ; Sun, 28 Aug 2022 17:03:00 -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=m9I3uAr5KKOxq3EJIyTCsaUu6NrDcIuo1iLlZax9nZk=; b=I+IeG9Hq3PXPSu2FQXxVL7aduTVGTbgQw3QQfhfRYOuFFnNll1CtasWYg0cbpjK3yW d8QC8986jYDH5Ezz5gxQtxp2pP3xEqUozeopxD4ZlSAy4asX4yHVCOZwFCbrTEv+kxUZ hp6yQfFUwrzDVv5wkxn2WBnFMLAqNz4+Pcjwl0o1udxa4f7iigJYXjec5XCbIVcyE7Eq UrhrY5CD50ockGLP404EhUWBx3LNaq8kOAIVP96u2Cwo4dA6iOp9dFI9ynGC4+YdG8DV yR8hKx86SUCWrm3N7Sz5xG12S6uPurog4NbRbD0hvgpkRHRl4+nWXzC/aDQG/1AlmA3j yl0A== 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=m9I3uAr5KKOxq3EJIyTCsaUu6NrDcIuo1iLlZax9nZk=; b=iGp4bNYMnh3dB8PO3eOWLxuXviWTx+vBpwlsH7NtUETFd3U2yClJtMdl39nuwY/Gjx 5XYCNmxS9lyK664a53MzNu1B1ti2QzHYKPeoWcaQh1DZ/Y7Xn6iOimzFSiJhHka9BnM2 hV4zdIL216Sd/q0nz2ILENHwhBY0kEVyuxG4edalAQGbBwlGWqF0POZaGUMVjnvlinDo tuFPecpPftoKwrr1gYWTwp85vHlZvtkSaTrYOdAfMu16qq41VLyk9dv/aMOLZrsICZxI Lo2e2iIdF38MJjiVeraEhsYkFn8xZqmabM6ZwgpMRkV3Km6Hl7muMlwG2ZmDQ0qWURcs +kAQ== X-Gm-Message-State: ACgBeo1NwPpUBmxag0fublHEzRCjd+4W8ZoxLLiS1kP/GWwGSNPlpfe8 XJrAmvIhx2ZxyS0clyFPRV5zRiZVKHOusg== X-Received: by 2002:a05:6102:22d0:b0:390:d593:98f1 with SMTP id a16-20020a05610222d000b00390d59398f1mr1447943vsh.83.1661731379056; Sun, 28 Aug 2022 17:02:59 -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.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Aug 2022 17:02:58 -0700 (PDT) From: Stephen Hutchinson To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Aug 2022 20:02:41 -0400 Message-Id: <20220829000244.71123-7-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 6/9] avformat/avisynth: add read_frameprop_primaries 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: 6+e+EVNPbFPx Signed-off-by: Stephen Hutchinson --- libavformat/avisynth.c | 82 ++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 39 deletions(-) diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index 65d8448e89..945ce0e245 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -106,6 +106,7 @@ typedef struct AviSynthContext { int frameprops; int frameprop_field_order; int frameprop_range; + int frameprop_primaries; int frameprop_sar; /* Linked list pointers. */ @@ -566,45 +567,47 @@ static int avisynth_create_stream_video(AVFormatContext *s, AVStream *st) } /* Color Primaries */ - switch (avs_library.avs_prop_get_int(avs->env, avsmap, "_Primaries", 0, &error)) { - case 1: - st->codecpar->color_primaries = AVCOL_PRI_BT709; - break; - case 2: - st->codecpar->color_primaries = AVCOL_PRI_UNSPECIFIED; - break; - case 4: - st->codecpar->color_primaries = AVCOL_PRI_BT470M; - break; - case 5: - st->codecpar->color_primaries = AVCOL_PRI_BT470BG; - break; - case 6: - st->codecpar->color_primaries = AVCOL_PRI_SMPTE170M; - break; - case 7: - st->codecpar->color_primaries = AVCOL_PRI_SMPTE240M; - break; - case 8: - st->codecpar->color_primaries = AVCOL_PRI_FILM; - break; - case 9: - st->codecpar->color_primaries = AVCOL_PRI_BT2020; - break; - case 10: - st->codecpar->color_primaries = AVCOL_PRI_SMPTE428; - break; - case 11: - st->codecpar->color_primaries = AVCOL_PRI_SMPTE431; - break; - case 12: - st->codecpar->color_primaries = AVCOL_PRI_SMPTE432; - break; - case 22: - st->codecpar->color_primaries = AVCOL_PRI_EBU3213; - break; - default: - st->codecpar->color_primaries = AVCOL_PRI_UNSPECIFIED; + if(avs->frameprop_primaries) { + switch (avs_library.avs_prop_get_int(avs->env, avsmap, "_Primaries", 0, &error)) { + case 1: + st->codecpar->color_primaries = AVCOL_PRI_BT709; + break; + case 2: + st->codecpar->color_primaries = AVCOL_PRI_UNSPECIFIED; + break; + case 4: + st->codecpar->color_primaries = AVCOL_PRI_BT470M; + break; + case 5: + st->codecpar->color_primaries = AVCOL_PRI_BT470BG; + break; + case 6: + st->codecpar->color_primaries = AVCOL_PRI_SMPTE170M; + break; + case 7: + st->codecpar->color_primaries = AVCOL_PRI_SMPTE240M; + break; + case 8: + st->codecpar->color_primaries = AVCOL_PRI_FILM; + break; + case 9: + st->codecpar->color_primaries = AVCOL_PRI_BT2020; + break; + case 10: + st->codecpar->color_primaries = AVCOL_PRI_SMPTE428; + break; + case 11: + st->codecpar->color_primaries = AVCOL_PRI_SMPTE431; + break; + case 12: + st->codecpar->color_primaries = AVCOL_PRI_SMPTE432; + break; + case 22: + st->codecpar->color_primaries = AVCOL_PRI_EBU3213; + break; + default: + st->codecpar->color_primaries = AVCOL_PRI_UNSPECIFIED; + } } /* Color Transfer Characteristics */ @@ -1160,6 +1163,7 @@ 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_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_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 }, };