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 06006410BA for ; Sun, 13 Feb 2022 23:34:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 04CFC68B2E8; Mon, 14 Feb 2022 01:34:44 +0200 (EET) Received: from mail-vs1-f53.google.com (mail-vs1-f53.google.com [209.85.217.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C631268B216 for ; Mon, 14 Feb 2022 01:34:37 +0200 (EET) Received: by mail-vs1-f53.google.com with SMTP id m24so16880744vsp.7 for ; Sun, 13 Feb 2022 15:34:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :references:from:in-reply-to:content-transfer-encoding; bh=N7aezt1/EAOSPUrzw3PRGUAcJnYG+RmuKWAntQgzszQ=; b=Deqp3ZroSk4/1WaKsIJ2aCzxog15lVN2/YumvcEzfoqKM6jn5bnKv5HsC2jUF/7zgV 10LFHo6EyCkSFp0eS8/Tue6+ExjHhMWsQB0SfA30DIdu0yjxOnX4ocEDS1S1Sc8XW13b dmTigMpltJkNVEHjkih5KfgmhzSxin7OUXeWfl/Z1gvF+jPakITOQSL/uHotYiFOup5v ivuYo3OCsmH/ZeFYkAkHIOl6wtTkpvv3+jufOcLsoOG7o7ae0nqvGH/hUggBMO6D+Cqb 60nfyPVZwx/s92DlXSlPxMoiDxh3kY7VF4ktcoB1krl1+2JBYc8DwPEPwieMsjrxCDJY 5WAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=N7aezt1/EAOSPUrzw3PRGUAcJnYG+RmuKWAntQgzszQ=; b=A08Yv5fJsNNT2dtljaW8XVFJNj5C5l5lE9vTGRrYBlxoCrcbE1ktLpEey+2XniGC5Z smyl2eNtO7QOljisK5gK9Hpf63PnHr2eD3Oy2iON8w3CETyDpxbFrq8PfcL2SFp5LTTf c1szg4PPgHEcLGydZTT9rB4/3mGALQ6lvjRDuRZxyPbxgjpMLraCV8VUN+ktPEtVV6u5 +AmKe/Gx4bY+LTsHv6mJg2nj5Lq8nCym+d3WEPfDvecDZF3eu63ix3nMNCMW5ZR+Cucb I2yXEbi43MlKTYApXZM5lAjkIB44mvJyX7dDJxlnq/REfWFxRAz8jPTcukelo9u2iCmp pOvA== X-Gm-Message-State: AOAM532UJH76z8wiPd9ZmSKo70nDboom/Vp8EX1uNB8gyGhI9hmD4wT1 5+yQqYD9IdCraFP9q6SVXzuVsl5RHLs= X-Google-Smtp-Source: ABdhPJxSJdwWr4+7r7x09atjUWGAP480h5ocWDclngceP9Lrk0hPesQyI0G7ezek/CI5C++0o3e0+g== X-Received: by 2002:a05:6102:c8d:: with SMTP id f13mr3100164vst.33.1644795276318; Sun, 13 Feb 2022 15:34:36 -0800 (PST) Received: from [192.168.1.5] ([75.115.109.114]) by smtp.gmail.com with ESMTPSA id e22sm5207182vko.51.2022.02.13.15.34.35 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 13 Feb 2022 15:34:36 -0800 (PST) Message-ID: Date: Sun, 13 Feb 2022 18:34:35 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Content-Language: en-US To: FFmpeg development discussions and patches References: <20220208110240.4179-1-qyot27@gmail.com> <20220208110240.4179-3-qyot27@gmail.com> From: Stephen Hutchinson In-Reply-To: <20220208110240.4179-3-qyot27@gmail.com> Subject: Re: [FFmpeg-devel] [PATCH 2/3] avisynth: use AviSynth+'s frame properties to set various fields 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 2/8/22 6:02 AM, Stephen Hutchinson wrote: > * Field Order > * Chroma Location > * Color Transfer Characteristics > * Color Range > * Color Primaries > * Matrix Coefficients > > The existing TFF/BFF detection is retained as a fallback for > older versions of AviSynth that can't access frame properties. > The other properties have no legacy equivalent to detect them. > > Signed-off-by: Stephen Hutchinson > --- > libavformat/avisynth.c | 263 +++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 250 insertions(+), 13 deletions(-) > > diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c > index 1e862a6a85..8bc39869a3 100644 > --- a/libavformat/avisynth.c > +++ b/libavformat/avisynth.c > @@ -19,6 +19,8 @@ > * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > */ > > +#include > + > #include "libavutil/attributes.h" > #include "libavutil/internal.h" > > @@ -76,6 +78,9 @@ typedef struct AviSynthLibrary { > AVSC_DECLARE_FUNC(avs_get_row_size_p); > AVSC_DECLARE_FUNC(avs_is_planar_rgb); > AVSC_DECLARE_FUNC(avs_is_planar_rgba); > + AVSC_DECLARE_FUNC(avs_get_frame_props_ro); > + AVSC_DECLARE_FUNC(avs_prop_get_int); > + AVSC_DECLARE_FUNC(avs_get_env_property); > #undef AVSC_DECLARE_FUNC > } AviSynthLibrary; > > @@ -153,6 +158,9 @@ static av_cold int avisynth_load_library(void) > LOAD_AVS_FUNC(avs_get_row_size_p, 1); > LOAD_AVS_FUNC(avs_is_planar_rgb, 1); > LOAD_AVS_FUNC(avs_is_planar_rgba, 1); > + LOAD_AVS_FUNC(avs_get_frame_props_ro, 1); > + LOAD_AVS_FUNC(avs_prop_get_int, 1); > + LOAD_AVS_FUNC(avs_get_env_property, 1); > #undef LOAD_AVS_FUNC > > atexit(avisynth_atexit_handler); > @@ -236,6 +244,10 @@ static av_cold void avisynth_atexit_handler(void) > static int avisynth_create_stream_video(AVFormatContext *s, AVStream *st) > { > AviSynthContext *avs = s->priv_data; > + const AVS_Map *avsmap; > + AVS_VideoFrame *frame; > + int framedata, error; > + bool frameprop; > int planar = 0; // 0: packed, 1: YUV, 2: Y8, 3: Planar RGB, 4: YUVA, 5: Planar RGBA > > st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; > @@ -251,19 +263,6 @@ static int avisynth_create_stream_video(AVFormatContext *s, AVStream *st) > avpriv_set_pts_info(st, 32, avs->vi->fps_denominator, avs->vi->fps_numerator); > > > - st->codecpar->field_order = AV_FIELD_UNKNOWN; > - /* AviSynth works with frame-based video, detecting field order can > - * only work when avs_is_field_based returns 'false'. */ > - av_log(s, AV_LOG_TRACE, "avs_is_field_based: %d\n", avs_is_field_based(avs->vi)); > - if (avs_is_field_based(avs->vi) == 0) { > - if (avs_is_tff(avs->vi)) { > - st->codecpar->field_order = AV_FIELD_TT; > - } > - else if (avs_is_bff(avs->vi)) { > - st->codecpar->field_order = AV_FIELD_BB; > - } > - } > - > switch (avs->vi->pixel_type) { > /* 10~16-bit YUV pix_fmts (AviSynth+) */ > case AVS_CS_YUV444P10: > @@ -499,6 +498,244 @@ static int avisynth_create_stream_video(AVFormatContext *s, AVStream *st) > avs->n_planes = 1; > avs->planes = avs_planes_packed; > } > + > + /* Read AviSynth+'s frame properties to set additional info. > + * > + * Due to a bug preventing the C interface from accessing frame > + * properties in earlier versions of interface version 8, only > + * enable this if we detect version 8.1 at the minimum. */ > + > + if (!avs_library.avs_get_env_property) { > + av_log(s, AV_LOG_TRACE, "%s\n", > + "avs_get_env_property does not exist in AviSynth library; frame properties won't be checked."); > + frameprop = false; > + } else { > + if (avs_library.avs_get_env_property(avs->env, AVS_AEP_INTERFACE_BUGFIX)) { > + av_log(s, AV_LOG_TRACE, "%s\n", "Using interface version 8.1 or higher, reading frame properties."); > + frameprop = true; > + } else { > + av_log(s, AV_LOG_TRACE, "%s\n", "Using interface version 8.0, need 8.1+ to read frame properties."); > + frameprop = false; > + } > + } > + > + if (frameprop = true) { > + > + frame = avs_library.avs_get_frame(avs->clip, framedata); > + avsmap = avs_library.avs_get_frame_props_ro(avs->env, frame); > + > + /* Field order */ > + 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; > + } > + > + /* Color Range */ > + switch (avs_library.avs_prop_get_int(avs->env, avsmap, "_ColorRange", 0, &error)) { > + case 0: > + st->codecpar->color_range = AVCOL_RANGE_JPEG; > + break; > + case 1: > + st->codecpar->color_range = AVCOL_RANGE_MPEG; > + break; > + default: > + st->codecpar->color_range = AVCOL_RANGE_UNSPECIFIED; > + } > + > + /* 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; > + } > + > + /* 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; > + } > + > + /* Matrix coefficients */ > + switch (avs_library.avs_prop_get_int(avs->env, avsmap, "_Matrix", 0, &error)) { > + case 0: > + st->codecpar->color_space = AVCOL_SPC_RGB; > + break; > + case 1: > + st->codecpar->color_space = AVCOL_SPC_BT709; > + break; > + case 2: > + st->codecpar->color_space = AVCOL_SPC_UNSPECIFIED; > + break; > + case 4: > + st->codecpar->color_space = AVCOL_SPC_FCC; > + break; > + case 5: > + st->codecpar->color_space = AVCOL_SPC_BT470BG; > + break; > + case 6: > + st->codecpar->color_space = AVCOL_SPC_SMPTE170M; > + break; > + case 7: > + st->codecpar->color_space = AVCOL_SPC_SMPTE240M; > + break; > + case 8: > + st->codecpar->color_space = AVCOL_SPC_YCGCO; > + break; > + case 9: > + st->codecpar->color_space = AVCOL_SPC_BT2020_NCL; > + break; > + case 10: > + st->codecpar->color_space = AVCOL_SPC_BT2020_CL; > + break; > + case 11: > + st->codecpar->color_space = AVCOL_SPC_SMPTE2085; > + break; > + case 12: > + st->codecpar->color_space = AVCOL_SPC_CHROMA_DERIVED_NCL; > + break; > + case 13: > + st->codecpar->color_space = AVCOL_SPC_CHROMA_DERIVED_CL; > + break; > + case 14: > + st->codecpar->color_space = AVCOL_SPC_ICTCP; > + break; > + default: > + st->codecpar->color_space = AVCOL_SPC_UNSPECIFIED; > + } > + > + /* Chroma Location */ > + 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; > + } > + } else { > + st->codecpar->field_order = AV_FIELD_UNKNOWN; > + /* AviSynth works with frame-based video, detecting field order can > + * only work when avs_is_field_based returns 'false'. */ > + av_log(s, AV_LOG_TRACE, "avs_is_field_based: %d\n", avs_is_field_based(avs->vi)); > + if (avs_is_field_based(avs->vi) == 0) { > + if (avs_is_tff(avs->vi)) { > + st->codecpar->field_order = AV_FIELD_TT; > + } > + else if (avs_is_bff(avs->vi)) { > + st->codecpar->field_order = AV_FIELD_BB; > + } > + } > + } > + > return 0; > } > Pushed. _______________________________________________ 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".