From: Stephen Hutchinson <qyot27@gmail.com>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: Re: [FFmpeg-devel] [PATCH 3/3 v2] avformat/avisynth: reindent
Date: Sun, 4 Sep 2022 15:08:54 -0400
Message-ID: <b48b1617-0856-d364-fd27-e55d43030000@gmail.com> (raw)
In-Reply-To: <20220831002340.31886-4-qyot27@gmail.com>
On 8/30/22 8:23 PM, Stephen Hutchinson wrote:
> Signed-off-by: Stephen Hutchinson <qyot27@gmail.com>
> ---
> libavformat/avisynth.c | 348 ++++++++++++++++++++---------------------
> 1 file changed, 174 insertions(+), 174 deletions(-)
>
> diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c
> index 7bb2977383..b426ac343e 100644
> --- a/libavformat/avisynth.c
> +++ b/libavformat/avisynth.c
> @@ -533,235 +533,235 @@ static int avisynth_create_stream_video(AVFormatContext *s, AVStream *st)
>
> /* Field order */
> if(avs->flags & AVISYNTH_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:
> + 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 */
> if(avs->flags & AVISYNTH_FRAMEPROP_RANGE) {
> - 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:
> + 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 */
> if(avs->flags & AVISYNTH_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;
> - }
> + 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 */
> if(avs->flags & AVISYNTH_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 */
> - if(avs->flags & AVISYNTH_FRAMEPROP_MATRIX) {
> - 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;
> + switch (avs_library.avs_prop_get_int(avs->env, avsmap, "_Transfer", 0, &error)) {
> case 1:
> - st->codecpar->color_space = AVCOL_SPC_BT709;
> + st->codecpar->color_trc = AVCOL_TRC_BT709;
> break;
> case 2:
> - st->codecpar->color_space = AVCOL_SPC_UNSPECIFIED;
> + st->codecpar->color_trc = AVCOL_TRC_UNSPECIFIED;
> break;
> case 4:
> - st->codecpar->color_space = AVCOL_SPC_FCC;
> + st->codecpar->color_trc = AVCOL_TRC_GAMMA22;
> break;
> case 5:
> - st->codecpar->color_space = AVCOL_SPC_BT470BG;
> + st->codecpar->color_trc = AVCOL_TRC_GAMMA28;
> break;
> case 6:
> - st->codecpar->color_space = AVCOL_SPC_SMPTE170M;
> + st->codecpar->color_trc = AVCOL_TRC_SMPTE170M;
> break;
> case 7:
> - st->codecpar->color_space = AVCOL_SPC_SMPTE240M;
> + st->codecpar->color_trc = AVCOL_TRC_SMPTE240M;
> break;
> case 8:
> - st->codecpar->color_space = AVCOL_SPC_YCGCO;
> + st->codecpar->color_trc = AVCOL_TRC_LINEAR;
> break;
> case 9:
> - st->codecpar->color_space = AVCOL_SPC_BT2020_NCL;
> + st->codecpar->color_trc = AVCOL_TRC_LOG;
> break;
> case 10:
> - st->codecpar->color_space = AVCOL_SPC_BT2020_CL;
> + st->codecpar->color_trc = AVCOL_TRC_LOG_SQRT;
> break;
> case 11:
> - st->codecpar->color_space = AVCOL_SPC_SMPTE2085;
> + st->codecpar->color_trc = AVCOL_TRC_IEC61966_2_4;
> break;
> case 12:
> - st->codecpar->color_space = AVCOL_SPC_CHROMA_DERIVED_NCL;
> + st->codecpar->color_trc = AVCOL_TRC_BT1361_ECG;
> break;
> case 13:
> - st->codecpar->color_space = AVCOL_SPC_CHROMA_DERIVED_CL;
> + st->codecpar->color_trc = AVCOL_TRC_IEC61966_2_1;
> break;
> case 14:
> - st->codecpar->color_space = AVCOL_SPC_ICTCP;
> + 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_space = AVCOL_SPC_UNSPECIFIED;
> + st->codecpar->color_trc = AVCOL_TRC_UNSPECIFIED;
> }
> }
> +
> + /* Matrix coefficients */
> + if(avs->flags & AVISYNTH_FRAMEPROP_MATRIX) {
> + 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 */
> if(avs->flags & AVISYNTH_FRAMEPROP_CHROMA_LOCATION) {
> - 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:
> + 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;
> + }
> }
> }
> - }
>
> /* Sample aspect ratio */
> if(avs->flags & AVISYNTH_FRAMEPROP_SAR) {
> - sar_num = avs_library.avs_prop_get_int(avs->env, avsmap, "_SARNum", 0, &error);
> - sar_den = avs_library.avs_prop_get_int(avs->env, avsmap, "_SARDen", 0, &error);
> - st->sample_aspect_ratio = (AVRational){ sar_num, sar_den };
> + sar_num = avs_library.avs_prop_get_int(avs->env, avsmap, "_SARNum", 0, &error);
> + sar_den = avs_library.avs_prop_get_int(avs->env, avsmap, "_SARDen", 0, &error);
> + st->sample_aspect_ratio = (AVRational){ sar_num, sar_den };
> }
>
> avs_library.avs_release_video_frame(frame);
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".
prev parent reply other threads:[~2022-09-04 19:09 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-31 0:23 [FFmpeg-devel] [PATCH 0/3 v2] avisynth: add user-selectable flags Stephen Hutchinson
2022-08-31 0:23 ` [FFmpeg-devel] [PATCH 1/3 v2] avformat/avisynth: read _SARNum/_SARDen from frame properties Stephen Hutchinson
2022-09-04 19:08 ` Stephen Hutchinson
2022-08-31 0:23 ` [FFmpeg-devel] [PATCH 2/3 v2] avformat/avisynth: implement avisynth_flags option Stephen Hutchinson
2022-09-04 19:08 ` Stephen Hutchinson
2022-08-31 0:23 ` [FFmpeg-devel] [PATCH 3/3 v2] avformat/avisynth: reindent Stephen Hutchinson
2022-09-04 19:08 ` Stephen Hutchinson [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b48b1617-0856-d364-fd27-e55d43030000@gmail.com \
--to=qyot27@gmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git