On Sun, Aug 21, 2016 at 12:03:45AM +0200, Paul B Mahol wrote: > On 8/20/16, Paul B Mahol <one...@gmail.com> wrote: > > On 8/20/16, Michael Niedermayer <mich...@niedermayer.cc> wrote: > >> On Sat, Aug 20, 2016 at 07:42:09PM +0200, Paul B Mahol wrote: > >>> Hi, > >>> > >>> patch attached. > >> > >>> vf_crop.c | 2 -- > >>> 1 file changed, 2 deletions(-) > >>> fa7e5dd663b07c06f58f845cb3b519f8904e3bca > >>> 0001-avfilter-vf_crop-make-it-possible-to-crop-single-pix.patch > >>> From e9f380d9aab2f1f82183f05b91f37ec1e50bd6da Mon Sep 17 00:00:00 2001 > >>> From: Paul B Mahol <one...@gmail.com> > >>> Date: Sat, 20 Aug 2016 19:38:48 +0200 > >>> Subject: [PATCH] avfilter/vf_crop: make it possible to crop single > >>> pixels > >>> from > >>> subsampled pixel formats > >>> > >>> --- > >>> libavfilter/vf_crop.c | 2 -- > >>> 1 file changed, 2 deletions(-) > >>> > >>> diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c > >>> index 01773fa..91cb3c0 100644 > >>> --- a/libavfilter/vf_crop.c > >>> +++ b/libavfilter/vf_crop.c > >>> @@ -184,8 +184,6 @@ static int config_input(AVFilterLink *link) > >>> s->w_expr, s->h_expr); > >>> return AVERROR(EINVAL); > >>> } > >>> - s->w &= ~((1 << s->hsub) - 1); > >>> - s->h &= ~((1 << s->vsub) - 1); > >> > >> this might be unexpected for people that use expressions > >> like w:h*aspectwhatever > >> as they could get odd sized videos which might have issues playing > >> on some devices > >> > >> I agree that when litteral numbers are specified the change makes > >> sense > > > > Then I will add option, by default turned off, to enable exact cropping. > > > > New patch attached.
> doc/filters.texi | 5 +++++
> libavfilter/vf_crop.c | 21 +++++++++++++++------
> 2 files changed, 20 insertions(+), 6 deletions(-)
> 5faa13e197bdea192aa98bc14717145412ae67d3
> 0001-avfilter-vf_crop-make-possible-to-do-exact-cropping-.patch
> From 9fa1ce9969edaa9f0307616b4ca9706f618036bb Mon Sep 17 00:00:00 2001
> From: Paul B Mahol <one...@gmail.com>
> Date: Sun, 21 Aug 2016 00:01:57 +0200
> Subject: [PATCH] avfilter/vf_crop: make possible to do exact cropping for
> subsampled videos
>
> ---
> doc/filters.texi | 5 +++++
> libavfilter/vf_crop.c | 21 +++++++++++++++------
> 2 files changed, 20 insertions(+), 6 deletions(-)
>
> diff --git a/doc/filters.texi b/doc/filters.texi
> index e9b8c93..591a55d 100644
> --- a/doc/filters.texi
> +++ b/doc/filters.texi
> @@ -5633,6 +5633,11 @@ This expression is evaluated per-frame.
> If set to 1 will force the output display aspect ratio
> to be the same of the input, by changing the output sample aspect
> ratio. It defaults to 0.
> +
> +@item exact
> +Enable exact cropping. If enabled, subsampled videos will be cropped at exact
> +width/height/x/y as specified and will not be rounded to nearest smaller
> value.
> +It defaults to 0.
> @end table
>
> The @var{out_w}, @var{out_h}, @var{x}, @var{y} parameters are
> diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c
> index 01773fa..bcdbb8c 100644
> --- a/libavfilter/vf_crop.c
> +++ b/libavfilter/vf_crop.c
> @@ -82,6 +82,7 @@ typedef struct CropContext {
>
> AVRational out_sar; ///< output sample aspect ratio
> int keep_aspect; ///< keep display aspect ratio when cropping
> + int exact; ///< exact cropping, for subsampled formats
>
> int max_step[4]; ///< max pixel step for each plane, expressed as a
> number of bytes
> int hsub, vsub; ///< chroma subsampling
> @@ -184,8 +185,11 @@ static int config_input(AVFilterLink *link)
> s->w_expr, s->h_expr);
> return AVERROR(EINVAL);
> }
> - s->w &= ~((1 << s->hsub) - 1);
> - s->h &= ~((1 << s->vsub) - 1);
> +
> + if (!s->exact) {
> + s->w &= ~((1 << s->hsub) - 1);
> + s->h &= ~((1 << s->vsub) - 1);
> + }
>
> av_expr_free(s->x_pexpr);
> av_expr_free(s->y_pexpr);
> @@ -219,8 +223,10 @@ static int config_input(AVFilterLink *link)
> /* set default, required in the case the first computed value for x/y is
> NAN */
> s->x = (link->w - s->w) / 2;
> s->y = (link->h - s->h) / 2;
> - s->x &= ~((1 << s->hsub) - 1);
> - s->y &= ~((1 << s->vsub) - 1);
> + if (!s->exact) {
> + s->x &= ~((1 << s->hsub) - 1);
> + s->y &= ~((1 << s->vsub) - 1);
> + }
> return 0;
>
> fail_expr:
> @@ -269,8 +275,10 @@ static int filter_frame(AVFilterLink *link, AVFrame
> *frame)
> s->x = link->w - s->w;
> if ((unsigned)s->y + (unsigned)s->h > link->h)
> s->y = link->h - s->h;
> - s->x &= ~((1 << s->hsub) - 1);
> - s->y &= ~((1 << s->vsub) - 1);
> + if (!s->exact) {
> + s->x &= ~((1 << s->hsub) - 1);
> + s->y &= ~((1 << s->vsub) - 1);
> + }
>
> av_log(ctx, AV_LOG_TRACE, "n:%d t:%f pos:%f x:%d y:%d x+w:%d y+h:%d\n",
> (int)s->var_values[VAR_N], s->var_values[VAR_T],
> s->var_values[VAR_POS],
> @@ -344,6 +352,7 @@ static const AVOption crop_options[] = {
> { "x", "set the x crop area expression", OFFSET(x_expr),
> AV_OPT_TYPE_STRING, {.str = "(in_w-out_w)/2"}, CHAR_MIN, CHAR_MAX, FLAGS },
> { "y", "set the y crop area expression", OFFSET(y_expr),
> AV_OPT_TYPE_STRING, {.str = "(in_h-out_h)/2"}, CHAR_MIN, CHAR_MAX, FLAGS },
> { "keep_aspect", "keep aspect ratio",
> OFFSET(keep_aspect), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS },
> + { "exact", "do exact cropping", OFFSET(exact),
> AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS },
> { NULL }
> };
LGTM
thx
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
Asymptotically faster algorithms should always be preferred if you have
asymptotical amounts of data
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
