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 EF7324A6D5 for ; Thu, 4 Jul 2024 12:52:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E299968D9D5; Thu, 4 Jul 2024 15:52:28 +0300 (EEST) Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1F4A468D8ED for ; Thu, 4 Jul 2024 15:52:22 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1720097541; bh=wbIDZFt/X4Zesd+Q/QqECKnD7Kw/7GIL1j4yBHgNPY8=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=vEf4K3hYDf3E/Sl51wFLQmVmHk+aBPIzWNVkE/Vy57Rr4vF4xorLCtF1tnRqy2uBP 33BFi2TMyem/1l4BsMoqInZMUF6OlyyDbGnutyrsdblZ3dZubEQF7WslP86/Dpg6Mz 5EnCG26RK9KVDcv/jQE0vlWXsFzF2hOb/XtohZ/E= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id C92DF4013C; Thu, 4 Jul 2024 14:52:21 +0200 (CEST) Date: Thu, 4 Jul 2024 14:52:21 +0200 Message-ID: <20240704145221.GB1528796@haasn.xyz> From: Niklas Haas To: ffmpeg-devel@ffmpeg.org In-Reply-To: <20240704115202.1235954-4-ffmpeg@haasn.xyz> References: <20240704115202.1235954-1-ffmpeg@haasn.xyz> <20240704115202.1235954-4-ffmpeg@haasn.xyz> MIME-Version: 1.0 Content-Disposition: inline Subject: Re: [FFmpeg-devel] [PATCH 4/6] avfilter/vf_scale: add in/out_chroma_loc 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: Niklas Haas Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Thu, 04 Jul 2024 13:52:00 +0200 Niklas Haas wrote: > From: Niklas Haas > > Currently, this just functions as a more principled and user-friendly > replacement for the (undocumented and hard to use) *_chr_pos fields. > > However, the goal is to automatically infer these values from the input > frames' chroma location, and deprecate the manual use of *_chr_pos > altogether. (Indeed, my plans for an swscale replacement will most > likely also end up limiting the set of legal chroma locations to those > permissible by AVFrame properties) > --- > doc/filters.texi | 15 +++++++++ > libavfilter/vf_scale.c | 75 ++++++++++++++++++++++++++++-------------- > 2 files changed, 66 insertions(+), 24 deletions(-) > > diff --git a/doc/filters.texi b/doc/filters.texi > index ca8f6e461a..3cff4eec1c 100644 > --- a/doc/filters.texi > +++ b/doc/filters.texi > @@ -21137,6 +21137,21 @@ Set full range (0-255 in case of 8-bit luma). > Set "MPEG" range (16-235 in case of 8-bit luma). > @end table > > +@item in_chroma_loc > +@item out_chroma_loc > +Set in/output chroma sample location. If not specified, center-sited chroma > +is used by default. Possible values: > + > +@table @samp > +@item auto, unknown > +@item left > +@item center > +@item topleft > +@item top > +@item bottomleft > +@item bottom > +@end table > + > @item force_original_aspect_ratio > Enable decreasing or increasing output video width or height if necessary to > keep the original aspect ratio. Possible values: > diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c > index 0b6701673f..f0de0261db 100644 > --- a/libavfilter/vf_scale.c > +++ b/libavfilter/vf_scale.c > @@ -168,6 +168,8 @@ typedef struct ScaleContext { > int in_range; > int out_range; > > + int in_chroma_loc; > + int out_chroma_loc; > int out_h_chr_pos; > int out_v_chr_pos; > int in_h_chr_pos; > @@ -617,6 +619,29 @@ fail: > return ret; > } > > +static void calc_chroma_pos(int *h_pos, int *v_pos, int chroma_loc, > + int h_pos_default, int v_pos_default, > + int h_sub, int v_sub, int index) > +{ > + *h_pos = h_pos_default; > + *v_pos = v_pos_default; > + if (chroma_loc != AVCHROMA_LOC_UNSPECIFIED) > + av_chroma_location_enum_to_pos(h_pos, v_pos, chroma_loc); > + > + if (h_sub && index > 0 /* interlaced fields */) { > + if (*v_pos == -513) > + *v_pos = 128; /* explicitly default missing info */ > + *v_pos += 256 * (index == 2); /* offset by one luma row for odd rows */ > + *v_pos >>= 1; /* double luma row distance */ > + } This logic needs to be revisited for 4:1:0 subsampled material (i.e. h_sub == 2). In this case, the luma grid is 4x4, so we need to adjust the sample location relative to the 4x4 grid. I'm not yet entirely sure how it would interact with interlaced content in this setting. I'll try and find a spec, since MPEG doesn't allow 4:1:0. > + > + /* Avoid offsetting chroma for progressive content */ > + if (!h_sub) > + *h_pos = -513; > + if (!v_sub) > + *v_pos = -513; > +} > + > static int config_props(AVFilterLink *outlink) > { > AVFilterContext *ctx = outlink->src; > @@ -673,15 +698,16 @@ static int config_props(AVFilterLink *outlink) > inlink0->h == outlink->h && > in_range == outlink->color_range && > in_colorspace == outlink->colorspace && > - inlink0->format == outlink->format) > + inlink0->format == outlink->format && > + scale->in_chroma_loc == scale->out_chroma_loc) > ; > else { > struct SwsContext **swscs[3] = {&scale->sws, &scale->isws[0], &scale->isws[1]}; > int i; > > for (i = 0; i < 3; i++) { > - int in_v_chr_pos = scale->in_v_chr_pos, out_v_chr_pos = scale->out_v_chr_pos; > int in_full, out_full, brightness, contrast, saturation; > + int h_chr_pos, v_chr_pos; > const int *inv_table, *table; > struct SwsContext *const s = sws_alloc_context(); > if (!s) > @@ -705,28 +731,17 @@ static int config_props(AVFilterLink *outlink) > av_opt_set_int(s, "dst_range", > outlink->color_range == AVCOL_RANGE_JPEG, 0); > > - /* Override chroma location default settings to have the correct > - * chroma positions. MPEG chroma positions are used by convention. > - * Note that this works for both MPEG-1/JPEG and MPEG-2/4 chroma > - * locations, since they share a vertical alignment */ > - if (desc->log2_chroma_h == 1) { > - if (in_v_chr_pos == -513) > - in_v_chr_pos = 128; /* explicitly default missing info */ > - in_v_chr_pos += 256 * (i == 2); /* offset by one luma row for odd rows */ > - in_v_chr_pos >>= i > 0; /* double luma row distance */ > - } > - > - if (outdesc->log2_chroma_h == 1) { > - if (out_v_chr_pos == -513) > - out_v_chr_pos = 128; > - out_v_chr_pos += 256 * (i == 2); > - out_v_chr_pos >>= i > 0; > - } > - > - av_opt_set_int(s, "src_h_chr_pos", scale->in_h_chr_pos, 0); > - av_opt_set_int(s, "src_v_chr_pos", in_v_chr_pos, 0); > - av_opt_set_int(s, "dst_h_chr_pos", scale->out_h_chr_pos, 0); > - av_opt_set_int(s, "dst_v_chr_pos", out_v_chr_pos, 0); > + calc_chroma_pos(&h_chr_pos, &v_chr_pos, scale->in_chroma_loc, > + scale->in_h_chr_pos, scale->in_v_chr_pos, > + desc->log2_chroma_w, desc->log2_chroma_h, i); > + av_opt_set_int(s, "src_h_chr_pos", h_chr_pos, 0); > + av_opt_set_int(s, "src_v_chr_pos", v_chr_pos, 0); > + > + calc_chroma_pos(&h_chr_pos, &v_chr_pos, scale->out_chroma_loc, > + scale->out_h_chr_pos, scale->out_v_chr_pos, > + outdesc->log2_chroma_w, outdesc->log2_chroma_h, i); > + av_opt_set_int(s, "dst_h_chr_pos", h_chr_pos, 0); > + av_opt_set_int(s, "dst_v_chr_pos", v_chr_pos, 0); > > if ((ret = sws_init_context(s, NULL, NULL)) < 0) > return ret; > @@ -987,6 +1002,8 @@ scale: > out->height = outlink->h; > out->color_range = outlink->color_range; > out->colorspace = outlink->colorspace; > + if (scale->out_chroma_loc != AVCHROMA_LOC_UNSPECIFIED) > + out->chroma_location = scale->out_chroma_loc; > > if (scale->output_is_pal) > avpriv_set_systematic_pal2((uint32_t*)out->data[1], outlink->format == AV_PIX_FMT_PAL8 ? AV_PIX_FMT_BGR8 : outlink->format); > @@ -1217,6 +1234,16 @@ static const AVOption scale_options[] = { > { "mpeg", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_RANGE_MPEG}, 0, 0, FLAGS, .unit = "range" }, > { "tv", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_RANGE_MPEG}, 0, 0, FLAGS, .unit = "range" }, > { "pc", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_RANGE_JPEG}, 0, 0, FLAGS, .unit = "range" }, > + { "in_chroma_loc", "set input chroma sample location", OFFSET(in_chroma_loc), AV_OPT_TYPE_INT, { .i64 = AVCHROMA_LOC_UNSPECIFIED }, 0, AVCHROMA_LOC_NB-1, .flags = FLAGS, .unit = "chroma_loc" }, > + { "out_chroma_loc", "set output chroma sample location", OFFSET(out_chroma_loc), AV_OPT_TYPE_INT, { .i64 = AVCHROMA_LOC_UNSPECIFIED }, 0, AVCHROMA_LOC_NB-1, .flags = FLAGS, .unit = "chroma_loc" }, > + {"auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCHROMA_LOC_UNSPECIFIED}, 0, 0, FLAGS, .unit = "chroma_loc"}, > + {"unknown", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCHROMA_LOC_UNSPECIFIED}, 0, 0, FLAGS, .unit = "chroma_loc"}, > + {"left", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCHROMA_LOC_LEFT}, 0, 0, FLAGS, .unit = "chroma_loc"}, > + {"center", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCHROMA_LOC_CENTER}, 0, 0, FLAGS, .unit = "chroma_loc"}, > + {"topleft", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCHROMA_LOC_TOPLEFT}, 0, 0, FLAGS, .unit = "chroma_loc"}, > + {"top", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCHROMA_LOC_TOP}, 0, 0, FLAGS, .unit = "chroma_loc"}, > + {"bottomleft", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCHROMA_LOC_BOTTOMLEFT}, 0, 0, FLAGS, .unit = "chroma_loc"}, > + {"bottom", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCHROMA_LOC_BOTTOM}, 0, 0, FLAGS, .unit = "chroma_loc"}, > { "in_v_chr_pos", "input vertical chroma position in luma grid/256" , OFFSET(in_v_chr_pos), AV_OPT_TYPE_INT, { .i64 = -513}, -513, 512, FLAGS }, > { "in_h_chr_pos", "input horizontal chroma position in luma grid/256", OFFSET(in_h_chr_pos), AV_OPT_TYPE_INT, { .i64 = -513}, -513, 512, FLAGS }, > { "out_v_chr_pos", "output vertical chroma position in luma grid/256" , OFFSET(out_v_chr_pos), AV_OPT_TYPE_INT, { .i64 = -513}, -513, 512, FLAGS }, > -- > 2.45.2 > _______________________________________________ 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".