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 094AF4082F for ; Wed, 2 Mar 2022 22:47:52 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 822E868B369; Thu, 3 Mar 2022 00:47:50 +0200 (EET) Received: from mail-ua1-f47.google.com (mail-ua1-f47.google.com [209.85.222.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D5ACC68B064 for ; Thu, 3 Mar 2022 00:47:44 +0200 (EET) Received: by mail-ua1-f47.google.com with SMTP id f7so1432534uab.8 for ; Wed, 02 Mar 2022 14:47:44 -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=i5PMgc2TdfV+QHN+vFmAS6pwEMXp2/krtfzigmYs5dM=; b=TWfqZmvIBxPhuwetUdCQCLWCDFSocPaz/U16ApmzdGnh0uflO8nHEadSPq4wevtsou mdqxmbgAyWS/jh32QnR0zqKvZ6AIjEKiJGXvgVQ/jyNXPj59XgcQG/MYe4yRpNIcF/cU Y2vh/vG1owAbgV55mLjP1gjNNqtOSyvp6wRvdSC1Xfeecbf8dA2NX8yL5/w3db3s5k5o FJWlxLEGSXCzChw11s/MAMLGPQS29K7V7cfoyLXqrTjJx1NAdZzdk9Oo+5o3FJ91lsVk 1ttAc/sK9UYI03yUmU3HJjmJTK+WOp4OtjHOCyCUn68lHHKS8SlRPcssYYQxgckfi+xe wN5A== 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=i5PMgc2TdfV+QHN+vFmAS6pwEMXp2/krtfzigmYs5dM=; b=rVJgxaPzZyhbmZnkg2UpGhN8KbMrq2JggSV8sAaVfEIq2Ry/TQHKYloW4BgfAhWA53 F1DCUbP58o4Ubs4tNUghXZ7hzDUEt7ZGuZrlBK4u2nRZN4ETEoBNMtYl7Cx6TKsZ5aVo QPJgKSR/Eugw7DFirVm1t0H6pAdE/Kp2laxHLtZxUEN9HYECCc/C5jzkbtUzR14Z0koe bCCiVd9V8qd2RtYTXgAhZMt/F57GAdRbfqNkSjqbNsisNDr9P4TGfmDx0Ab60Zjnjm65 2er05cVB7e/v+HPYDRcfanY/NvF/Iwr7Nvk01j7pXQiPSURFxdrPRc2ZtFRRRYv0W8mH XgmQ== X-Gm-Message-State: AOAM533HILS710XDDyQIs7ZfGy7wvPYOdhfbmHlUk2Vk7Bykm+L7+P6B LjZruJBy5i+UV92ySxGlfwCHd3KV0GQW2A== X-Google-Smtp-Source: ABdhPJyEGGTf+fWPwTytC0bXO0WmquF/rdElBLOFOhFv1uNpE2jcy+t9rx9lHwLtDN7iSRCCnPGiSQ== X-Received: by 2002:ab0:64c3:0:b0:343:affb:a63a with SMTP id j3-20020ab064c3000000b00343affba63amr13446738uaq.100.1646261263049; Wed, 02 Mar 2022 14:47:43 -0800 (PST) Received: from [192.168.1.5] ([75.115.109.114]) by smtp.gmail.com with ESMTPSA id g81-20020a1fb654000000b003321cc19144sm63501vkf.1.2022.03.02.14.47.42 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 02 Mar 2022 14:47:42 -0800 (PST) Message-ID: <231e8392-831c-b641-b5f4-9a16f40b45f4@gmail.com> Date: Wed, 2 Mar 2022 17:47:41 -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: <20220227200322.11600-1-qyot27@gmail.com> From: Stephen Hutchinson In-Reply-To: <20220227200322.11600-1-qyot27@gmail.com> Subject: Re: [FFmpeg-devel] [PATCH] avformat/avisynth: fix fallbacks for four frameprops 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/27/22 3:03 PM, Stephen Hutchinson wrote: > If _FieldBased, _Matrix, _ColorRange, or _ChromaLocation haven't > been set, that absence would be interpreted as 0, leading to those > being set to case 0 instead of default. There is no case 0 for > _Primaries and _Transfer, so those were correctly falling back > to the default case. > > Signed-off-by: Stephen Hutchinson > --- > libavformat/avisynth.c | 184 ++++++++++++++++++++++------------------- > 1 file changed, 101 insertions(+), 83 deletions(-) > > diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c > index 318588ff52..8ba2bdead2 100644 > --- a/libavformat/avisynth.c > +++ b/libavformat/avisynth.c > @@ -78,6 +78,7 @@ typedef struct AviSynthLibrary { > 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_prop_get_type); > AVSC_DECLARE_FUNC(avs_get_env_property); > #undef AVSC_DECLARE_FUNC > } AviSynthLibrary; > @@ -158,6 +159,7 @@ static av_cold int avisynth_load_library(void) > 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_prop_get_type, 1); > LOAD_AVS_FUNC(avs_get_env_property, 1); > #undef LOAD_AVS_FUNC > > @@ -511,30 +513,38 @@ static int avisynth_create_stream_video(AVFormatContext *s, AVStream *st) > 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: > + 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; > + } > } > > /* 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: > + if(avs_library.avs_prop_get_type(avs->env, avsmap, "_ColorRange") == AVS_PROPTYPE_UNSET) { > st->codecpar->color_range = AVCOL_RANGE_UNSPECIFIED; > + } else { > + 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 */ > @@ -637,75 +647,83 @@ static int avisynth_create_stream_video(AVFormatContext *s, AVStream *st) > } > > /* 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: > + if(avs_library.avs_prop_get_type(avs->env, avsmap, "_Matrix") == AVS_PROPTYPE_UNSET) { > st->codecpar->color_space = AVCOL_SPC_UNSPECIFIED; > + } else { > + 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: > + if(avs_library.avs_prop_get_type(avs->env, avsmap, "_ChromaLocation") == AVS_PROPTYPE_UNSET) { > st->codecpar->chroma_location = AVCHROMA_LOC_UNSPECIFIED; > + } else { > + 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; 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".