| Message ID | 20220306161617.27230-1-michael@niedermayer.cc |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel] avfilter/vf_colorlevels: Fix build failure on ARM | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_aarch64_jetson | success | Make finished |
| andriy/make_fate_aarch64_jetson | success | Make fate finished |
| andriy/make_fate_armv7_RPi4 | success | Make fate finished |
| andriy/make_armv7_RPi4 | warning | New warnings during build |
On 3/6/22, Michael Niedermayer <michael@niedermayer.cc> wrote: > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavfilter/vf_colorlevels.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/libavfilter/vf_colorlevels.c b/libavfilter/vf_colorlevels.c > index a8859795dd..76adfbd8c8 100644 > --- a/libavfilter/vf_colorlevels.c > +++ b/libavfilter/vf_colorlevels.c > @@ -219,7 +219,7 @@ static int colorlevels_slice_8_planar(AVFilterContext > *ctx, void *arg, int jobnr > static int colorlevels_slice_9_planar(AVFilterContext *ctx, void *arg, int > jobnr, int nb_jobs) > { > ColorLevelsContext *s = ctx->priv; > - const int depth = s->depth; > + const int depth = 9; > DO_COMMON(uint16_t, av_clip_uintp2, 0, 1) > return 0; > } > @@ -227,7 +227,7 @@ static int colorlevels_slice_9_planar(AVFilterContext > *ctx, void *arg, int jobnr > static int colorlevels_slice_10_planar(AVFilterContext *ctx, void *arg, int > jobnr, int nb_jobs) > { > ColorLevelsContext *s = ctx->priv; > - const int depth = s->depth; > + const int depth = 10; > DO_COMMON(uint16_t, av_clip_uintp2, 0, 1) > return 0; > } > @@ -235,7 +235,7 @@ static int colorlevels_slice_10_planar(AVFilterContext > *ctx, void *arg, int jobn > static int colorlevels_slice_12_planar(AVFilterContext *ctx, void *arg, int > jobnr, int nb_jobs) > { > ColorLevelsContext *s = ctx->priv; > - const int depth = s->depth; > + const int depth = 12; > DO_COMMON(uint16_t, av_clip_uintp2, 0, 1) > return 0; > } > @@ -243,7 +243,7 @@ static int colorlevels_slice_12_planar(AVFilterContext > *ctx, void *arg, int jobn > static int colorlevels_slice_14_planar(AVFilterContext *ctx, void *arg, int > jobnr, int nb_jobs) > { > ColorLevelsContext *s = ctx->priv; > - const int depth = s->depth; > + const int depth = 14; > DO_COMMON(uint16_t, av_clip_uintp2, 0, 1) > return 0; > } > @@ -265,7 +265,7 @@ static int > colorlevels_preserve_slice_8_planar(AVFilterContext *ctx, void *arg, > static int colorlevels_preserve_slice_9_planar(AVFilterContext *ctx, void > *arg, int jobnr, int nb_jobs) > { > ColorLevelsContext *s = ctx->priv; > - const int depth = s->depth; > + const int depth = 9; > DO_COMMON(uint16_t, av_clip_uintp2, 1, 1) > return 0; > } > @@ -273,7 +273,7 @@ static int > colorlevels_preserve_slice_9_planar(AVFilterContext *ctx, void *arg, > static int colorlevels_preserve_slice_10_planar(AVFilterContext *ctx, void > *arg, int jobnr, int nb_jobs) > { > ColorLevelsContext *s = ctx->priv; > - const int depth = s->depth; > + const int depth = 10; > DO_COMMON(uint16_t, av_clip_uintp2, 1, 1) > return 0; > } > @@ -281,7 +281,7 @@ static int > colorlevels_preserve_slice_10_planar(AVFilterContext *ctx, void *arg, > static int colorlevels_preserve_slice_12_planar(AVFilterContext *ctx, void > *arg, int jobnr, int nb_jobs) > { > ColorLevelsContext *s = ctx->priv; > - const int depth = s->depth; > + const int depth = 12; > DO_COMMON(uint16_t, av_clip_uintp2, 1, 1) > return 0; > } > @@ -289,7 +289,7 @@ static int > colorlevels_preserve_slice_12_planar(AVFilterContext *ctx, void *arg, > static int colorlevels_preserve_slice_14_planar(AVFilterContext *ctx, void > *arg, int jobnr, int nb_jobs) > { > ColorLevelsContext *s = ctx->priv; > - const int depth = s->depth; > + const int depth = 14; > DO_COMMON(uint16_t, av_clip_uintp2, 1, 1) > return 0; > } > -- > 2.17.1 > > _______________________________________________ > 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". > LGTM
On Sun, 6 Mar 2022, Michael Niedermayer wrote: > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavfilter/vf_colorlevels.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) LGTM (Sorry I didn't check the ML before sending my patch. Maybe mention the commit that introduced the regression and the reason, about immediate constants, too.) // Martin
On Sun, Mar 06, 2022 at 08:12:26PM +0200, Martin Storsjö wrote: > On Sun, 6 Mar 2022, Michael Niedermayer wrote: > > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > > --- > > libavfilter/vf_colorlevels.c | 16 ++++++++-------- > > 1 file changed, 8 insertions(+), 8 deletions(-) > > LGTM > > (Sorry I didn't check the ML before sending my patch. Maybe mention the > commit that introduced the regression and the reason, about immediate > constants, too.) I will steal your commit message then will apply thx [...]
diff --git a/libavfilter/vf_colorlevels.c b/libavfilter/vf_colorlevels.c index a8859795dd..76adfbd8c8 100644 --- a/libavfilter/vf_colorlevels.c +++ b/libavfilter/vf_colorlevels.c @@ -219,7 +219,7 @@ static int colorlevels_slice_8_planar(AVFilterContext *ctx, void *arg, int jobnr static int colorlevels_slice_9_planar(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) { ColorLevelsContext *s = ctx->priv; - const int depth = s->depth; + const int depth = 9; DO_COMMON(uint16_t, av_clip_uintp2, 0, 1) return 0; } @@ -227,7 +227,7 @@ static int colorlevels_slice_9_planar(AVFilterContext *ctx, void *arg, int jobnr static int colorlevels_slice_10_planar(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) { ColorLevelsContext *s = ctx->priv; - const int depth = s->depth; + const int depth = 10; DO_COMMON(uint16_t, av_clip_uintp2, 0, 1) return 0; } @@ -235,7 +235,7 @@ static int colorlevels_slice_10_planar(AVFilterContext *ctx, void *arg, int jobn static int colorlevels_slice_12_planar(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) { ColorLevelsContext *s = ctx->priv; - const int depth = s->depth; + const int depth = 12; DO_COMMON(uint16_t, av_clip_uintp2, 0, 1) return 0; } @@ -243,7 +243,7 @@ static int colorlevels_slice_12_planar(AVFilterContext *ctx, void *arg, int jobn static int colorlevels_slice_14_planar(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) { ColorLevelsContext *s = ctx->priv; - const int depth = s->depth; + const int depth = 14; DO_COMMON(uint16_t, av_clip_uintp2, 0, 1) return 0; } @@ -265,7 +265,7 @@ static int colorlevels_preserve_slice_8_planar(AVFilterContext *ctx, void *arg, static int colorlevels_preserve_slice_9_planar(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) { ColorLevelsContext *s = ctx->priv; - const int depth = s->depth; + const int depth = 9; DO_COMMON(uint16_t, av_clip_uintp2, 1, 1) return 0; } @@ -273,7 +273,7 @@ static int colorlevels_preserve_slice_9_planar(AVFilterContext *ctx, void *arg, static int colorlevels_preserve_slice_10_planar(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) { ColorLevelsContext *s = ctx->priv; - const int depth = s->depth; + const int depth = 10; DO_COMMON(uint16_t, av_clip_uintp2, 1, 1) return 0; } @@ -281,7 +281,7 @@ static int colorlevels_preserve_slice_10_planar(AVFilterContext *ctx, void *arg, static int colorlevels_preserve_slice_12_planar(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) { ColorLevelsContext *s = ctx->priv; - const int depth = s->depth; + const int depth = 12; DO_COMMON(uint16_t, av_clip_uintp2, 1, 1) return 0; } @@ -289,7 +289,7 @@ static int colorlevels_preserve_slice_12_planar(AVFilterContext *ctx, void *arg, static int colorlevels_preserve_slice_14_planar(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) { ColorLevelsContext *s = ctx->priv; - const int depth = s->depth; + const int depth = 14; DO_COMMON(uint16_t, av_clip_uintp2, 1, 1) return 0; }
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavfilter/vf_colorlevels.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)