September 2021 - ffmpeg-cvslog

avfilter/vf_blend: add geometric mode
by Paul B Mahol 29 Sep '21

29 Sep '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Sep 29 19:10:29 2021 +0200| [8ebcff91118e7b533318b6244d58143da347ce10] | committer: Paul B Mahol avfilter/vf_blend: add geometric mode > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8ebcff91118e7b533… --- doc/filters.texi | 1 + libavfilter/blend.h | 1 + libavfilter/blend_modes.c | 4 ++++ libavfilter/vf_blend.c | 2 ++ 4 files changed, 8 insertions(+) diff --git a/doc/filters.texi b/doc/filters.texi index b7912b6567..9bac3feb33 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -7543,6 +7543,7 @@ Available values for component modes are: @item freeze @item exclusion @item extremity +@item geometric @item glow @item hardlight @item hardmix diff --git a/libavfilter/blend.h b/libavfilter/blend.h index a9a436a6da..a955126687 100644 --- a/libavfilter/blend.h +++ b/libavfilter/blend.h @@ -60,6 +60,7 @@ enum BlendMode { BLEND_FREEZE, BLEND_EXTREMITY, BLEND_SOFTDIFFERENCE, + BLEND_GEOMETRIC, BLEND_NB }; diff --git a/libavfilter/blend_modes.c b/libavfilter/blend_modes.c index d75560185c..9236559d19 100644 --- a/libavfilter/blend_modes.c +++ b/libavfilter/blend_modes.c @@ -52,6 +52,7 @@ #undef SCREEN #undef BURN #undef DODGE +#undef GEOMETRIC #undef INT2FLOAT #undef FLOAT2INT #undef MDIV @@ -61,6 +62,7 @@ #define SCREEN(x, a, b) (MAX - (x) * ((MAX - (a)) * (MAX - (b)) / MAX)) #define BURN(a, b) (((a) == 0) ? (a) : FFMAX(0, MAX - ((MAX - (b)) << DEPTH) / (a))) #define DODGE(a, b) (((a) == MAX) ? (a) : FFMIN(MAX, (((b) << DEPTH) / (MAX - (a))))) +#define GEOMETRIC(a, b) (lrintf(sqrtf((unsigned)A * B))) #define INT2FLOAT(x) (x) #define FLOAT2INT(x) (x) #define MDIV (0.125f * (1 << DEPTH)) @@ -69,6 +71,7 @@ #define SCREEN(x, a, b) (1.0 - (x) * ((1.0 - (a)) * (1.0 - (b)) / 1.0)) #define BURN(a, b) (((a) <= 0.0) ? (a) : FFMAX(0.0, 1.0 - (1.0 - (b)) / (a))) #define DODGE(a, b) (((a) >= 1.0) ? (a) : FFMIN(1.0, ((b) / (1.0 - (a))))) +#define GEOMETRIC(a, b) (sqrtf(fmaxf(A, 0) * fmaxf(B, 0))) #define INT2FLOAT(x) av_int2float(x) #define FLOAT2INT(x) av_float2int(x) #define MDIV 0.125f @@ -140,3 +143,4 @@ fn(xor, INT2FLOAT(FLOAT2INT(A) ^ FLOAT2INT(B))) fn(vividlight, (A < HALF) ? BURN(2 * A, B) : DODGE(2 * (A - HALF), B)) fn(linearlight,CLIP((B < HALF) ? B + 2 * A - MAX : B + 2 * (A - HALF))) fn(softdifference,CLIP((A > B) ? (B == MAX) ? 0 : (A - B) * MAX / (MAX - B) : (B == 0) ? 0 : (B - A) * MAX / B)) +fn(geometric, GEOMETRIC(A, B)) diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index 43595a1363..c00fb12839 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -132,6 +132,7 @@ static const AVOption blend_options[] = { { "vividlight", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_VIVIDLIGHT}, 0, 0, FLAGS, "mode" }, { "xor", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_XOR}, 0, 0, FLAGS, "mode" }, { "softdifference","", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_SOFTDIFFERENCE}, 0, 0, FLAGS, "mode" }, + { "geometric", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_GEOMETRIC}, 0, 0, FLAGS, "mode" }, { "c0_expr", "set color component #0 expression", OFFSET(params[0].expr_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS }, { "c1_expr", "set color component #1 expression", OFFSET(params[1].expr_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS }, { "c2_expr", "set color component #2 expression", OFFSET(params[2].expr_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS }, @@ -396,6 +397,7 @@ static av_cold void init_blend_func_##depth##_##nbits##bit(FilterParams *param) case BLEND_VIVIDLIGHT: param->blend = blend_vividlight_##depth##bit; break; \ case BLEND_XOR: param->blend = blend_xor_##depth##bit; break; \ case BLEND_SOFTDIFFERENCE:param->blend = blend_softdifference_##depth##bit; break;\ + case BLEND_GEOMETRIC: param->blend = blend_geometric_##depth##bit; break; \ } \ } DEFINE_INIT_BLEND_FUNC(8, 8)

1 0

avfilter/vf_morpho: add tophat and blackhat operations
by Paul B Mahol 29 Sep '21

29 Sep '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Sep 29 16:29:00 2021 +0200| [f3b07b8b124c78d6f5f8189621900b73b268e1be] | committer: Paul B Mahol avfilter/vf_morpho: add tophat and blackhat operations > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f3b07b8b124c78d6f… --- doc/filters.texi | 2 ++ libavfilter/vf_morpho.c | 59 +++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 4f21276abf..b7912b6567 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -15375,6 +15375,8 @@ Set morphological transform to apply, can be: @item open @item close @item gradient +@item tophat +@item blackhat @end table Default is @code{erode}. diff --git a/libavfilter/vf_morpho.c b/libavfilter/vf_morpho.c index 0e0d5d0fa1..13d58c4194 100644 --- a/libavfilter/vf_morpho.c +++ b/libavfilter/vf_morpho.c @@ -40,6 +40,8 @@ enum MorphModes { OPEN, CLOSE, GRADIENT, + TOPHAT, + BLACKHAT, NB_MODES }; @@ -52,6 +54,7 @@ typedef struct IPlane { void (*max_out_place)(uint8_t *c, const uint8_t *a, const uint8_t *b, int x); void (*min_out_place)(uint8_t *c, const uint8_t *a, const uint8_t *b, int x); + void (*diff_rin_place)(uint8_t *a, const uint8_t *b, int x); void (*max_in_place)(uint8_t *a, const uint8_t *b, int x); void (*min_in_place)(uint8_t *a, const uint8_t *b, int x); void (*diff_in_place)(uint8_t *a, const uint8_t *b, int x); @@ -127,6 +130,8 @@ static const AVOption morpho_options[] = { { "open", NULL, 0, AV_OPT_TYPE_CONST, {.i64=OPEN}, 0, 0, FLAGS, "mode" }, { "close", NULL, 0, AV_OPT_TYPE_CONST, {.i64=CLOSE}, 0, 0, FLAGS, "mode" }, { "gradient",NULL, 0, AV_OPT_TYPE_CONST, {.i64=GRADIENT},0, 0, FLAGS, "mode" }, + { "tophat",NULL, 0, AV_OPT_TYPE_CONST, {.i64=TOPHAT}, 0, 0, FLAGS, "mode" }, + { "blackhat",NULL, 0, AV_OPT_TYPE_CONST, {.i64=BLACKHAT},0, 0, FLAGS, "mode" }, { "planes", "set planes to filter", OFFSET(planes), AV_OPT_TYPE_INT, {.i64=7}, 0, 15, FLAGS }, { "structure", "when to process structures", OFFSET(structures), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, FLAGS, "str" }, { "first", "process only first structure, ignore rest", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "str" }, @@ -187,10 +192,16 @@ static void maxinplace_fun(uint8_t *a, const uint8_t *b, int x) a[i] = FFMAX(a[i], b[i]); } +static void diff_fun(uint8_t *a, const uint8_t *b, int x) +{ + for (int i = 0; i < x; i++) + a[i] = FFMAX(b[i] - a[i], 0); +} + static void diffinplace_fun(uint8_t *a, const uint8_t *b, int x) { for (int i = 0; i < x; i++) - a[i] -= b[i]; + a[i] = FFMAX(a[i] - b[i], 0); } static void min16_fun(uint8_t *cc, const uint8_t *aa, const uint8_t *bb, int x) @@ -212,13 +223,22 @@ static void mininplace16_fun(uint8_t *aa, const uint8_t *bb, int x) a[i] = FFMIN(a[i], b[i]); } +static void diff16_fun(uint8_t *aa, const uint8_t *bb, int x) +{ + const uint16_t *b = (const uint16_t *)bb; + uint16_t *a = (uint16_t *)aa; + + for (int i = 0; i < x; i++) + a[i] = FFMAX(b[i] - a[i], 0); +} + static void diffinplace16_fun(uint8_t *aa, const uint8_t *bb, int x) { uint16_t *a = (uint16_t *)aa; const uint16_t *b = (const uint16_t *)bb; for (int i = 0; i < x; i++) - a[i] -= b[i]; + a[i] = FFMAX(a[i] - b[i], 0); } static void max16_fun(uint8_t *cc, const uint8_t *aa, const uint8_t *bb, int x) @@ -471,12 +491,18 @@ static int erode(IPlane *g, IPlane *f, chord_set *SE, LUT *Ty) return 0; } -static void gradient(IPlane *g, IPlane *f) +static void difference(IPlane *g, IPlane *f) { for (int y = 0; y < f->h; y++) f->diff_in_place(g->img[y], f->img[y], f->w); } +static void difference2(IPlane *g, IPlane *f) +{ + for (int y = 0; y < f->h; y++) + f->diff_rin_place(g->img[y], f->img[y], f->w); +} + static int insert_chord_set(chord_set *chords, chord c) { // Checking if chord fits in dynamic array, resize if not. @@ -711,6 +737,7 @@ static int read_iplane(IPlane *imp, const uint8_t *dst, int dst_linesize, imp->type_size = type_size; imp->max_out_place = type_size == 1 ? max_fun : max16_fun; imp->min_out_place = type_size == 1 ? min_fun : min16_fun; + imp->diff_rin_place = type_size == 1 ? diff_fun : diff16_fun; imp->max_in_place = type_size == 1 ? maxinplace_fun : maxinplace16_fun; imp->min_in_place = type_size == 1 ? mininplace_fun : mininplace16_fun; imp->diff_in_place = type_size == 1 ? diffinplace_fun : diffinplace16_fun; @@ -867,7 +894,31 @@ copy: ret = erode(&s->h[p], &s->f[p], &s->SE[p], &s->Ty[1][p]); if (ret < 0) return ret; - gradient(&s->g[p], &s->h[p]); + difference(&s->g[p], &s->h[p]); + break; + case TOPHAT: + ret = read_iplane(&s->h[p], s->temp->data[p], s->temp->linesize[p], width, height, 1, type_size, depth); + if (ret < 0) + break; + ret = erode(&s->h[p], &s->f[p], &s->SE[p], &s->Ty[0][p]); + if (ret < 0) + break; + ret = dilate(&s->g[p], &s->h[p], &s->SE[p], &s->Ty[1][p]); + if (ret < 0) + break; + difference2(&s->g[p], &s->f[p]); + break; + case BLACKHAT: + ret = read_iplane(&s->h[p], s->temp->data[p], s->temp->linesize[p], width, height, 1, type_size, depth); + if (ret < 0) + break; + ret = dilate(&s->h[p], &s->f[p], &s->SE[p], &s->Ty[0][p]); + if (ret < 0) + break; + ret = erode(&s->g[p], &s->h[p], &s->SE[p], &s->Ty[1][p]); + if (ret < 0) + break; + difference(&s->g[p], &s->f[p]); break; default: av_assert0(0);

1 0

avfilter/vf_morpho: add gradient operation type
by Paul B Mahol 29 Sep '21

29 Sep '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Sep 29 15:32:49 2021 +0200| [b4626da92b06cde20a80a2fa320306eb1b1735dc] | committer: Paul B Mahol avfilter/vf_morpho: add gradient operation type > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b4626da92b06cde20… --- doc/filters.texi | 1 + libavfilter/vf_morpho.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/doc/filters.texi b/doc/filters.texi index 568c2995bc..4f21276abf 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -15374,6 +15374,7 @@ Set morphological transform to apply, can be: @item dilate @item open @item close +@item gradient @end table Default is @code{erode}. diff --git a/libavfilter/vf_morpho.c b/libavfilter/vf_morpho.c index e45f7522f8..0e0d5d0fa1 100644 --- a/libavfilter/vf_morpho.c +++ b/libavfilter/vf_morpho.c @@ -39,6 +39,7 @@ enum MorphModes { DILATE, OPEN, CLOSE, + GRADIENT, NB_MODES }; @@ -53,6 +54,7 @@ typedef struct IPlane { void (*min_out_place)(uint8_t *c, const uint8_t *a, const uint8_t *b, int x); void (*max_in_place)(uint8_t *a, const uint8_t *b, int x); void (*min_in_place)(uint8_t *a, const uint8_t *b, int x); + void (*diff_in_place)(uint8_t *a, const uint8_t *b, int x); } IPlane; typedef struct LUT { @@ -124,6 +126,7 @@ static const AVOption morpho_options[] = { { "dilate", NULL, 0, AV_OPT_TYPE_CONST, {.i64=DILATE}, 0, 0, FLAGS, "mode" }, { "open", NULL, 0, AV_OPT_TYPE_CONST, {.i64=OPEN}, 0, 0, FLAGS, "mode" }, { "close", NULL, 0, AV_OPT_TYPE_CONST, {.i64=CLOSE}, 0, 0, FLAGS, "mode" }, + { "gradient",NULL, 0, AV_OPT_TYPE_CONST, {.i64=GRADIENT},0, 0, FLAGS, "mode" }, { "planes", "set planes to filter", OFFSET(planes), AV_OPT_TYPE_INT, {.i64=7}, 0, 15, FLAGS }, { "structure", "when to process structures", OFFSET(structures), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, FLAGS, "str" }, { "first", "process only first structure, ignore rest", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "str" }, @@ -184,6 +187,12 @@ static void maxinplace_fun(uint8_t *a, const uint8_t *b, int x) a[i] = FFMAX(a[i], b[i]); } +static void diffinplace_fun(uint8_t *a, const uint8_t *b, int x) +{ + for (int i = 0; i < x; i++) + a[i] -= b[i]; +} + static void min16_fun(uint8_t *cc, const uint8_t *aa, const uint8_t *bb, int x) { const uint16_t *a = (const uint16_t *)aa; @@ -203,6 +212,15 @@ static void mininplace16_fun(uint8_t *aa, const uint8_t *bb, int x) a[i] = FFMIN(a[i], b[i]); } +static void diffinplace16_fun(uint8_t *aa, const uint8_t *bb, int x) +{ + uint16_t *a = (uint16_t *)aa; + const uint16_t *b = (const uint16_t *)bb; + + for (int i = 0; i < x; i++) + a[i] -= b[i]; +} + static void max16_fun(uint8_t *cc, const uint8_t *aa, const uint8_t *bb, int x) { const uint16_t *a = (const uint16_t *)aa; @@ -453,6 +471,12 @@ static int erode(IPlane *g, IPlane *f, chord_set *SE, LUT *Ty) return 0; } +static void gradient(IPlane *g, IPlane *f) +{ + for (int y = 0; y < f->h; y++) + f->diff_in_place(g->img[y], f->img[y], f->w); +} + static int insert_chord_set(chord_set *chords, chord c) { // Checking if chord fits in dynamic array, resize if not. @@ -689,6 +713,7 @@ static int read_iplane(IPlane *imp, const uint8_t *dst, int dst_linesize, imp->min_out_place = type_size == 1 ? min_fun : min16_fun; imp->max_in_place = type_size == 1 ? maxinplace_fun : maxinplace16_fun; imp->min_in_place = type_size == 1 ? mininplace_fun : mininplace16_fun; + imp->diff_in_place = type_size == 1 ? diffinplace_fun : diffinplace16_fun; for (int y = 0; y < h; y++) imp->img[y] = (uint8_t *)dst + y * dst_linesize; @@ -832,6 +857,18 @@ copy: break; ret = erode(&s->g[p], &s->h[p], &s->SE[p], &s->Ty[1][p]); break; + case GRADIENT: + ret = read_iplane(&s->h[p], s->temp->data[p], s->temp->linesize[p], width, height, 1, type_size, depth); + if (ret < 0) + break; + ret = dilate(&s->g[p], &s->f[p], &s->SE[p], &s->Ty[0][p]); + if (ret < 0) + break; + ret = erode(&s->h[p], &s->f[p], &s->SE[p], &s->Ty[1][p]); + if (ret < 0) + return ret; + gradient(&s->g[p], &s->h[p]); + break; default: av_assert0(0); }

1 0

avcodec/zmbvenc: Remove redundant pixel format check
by Andreas Rheinhardt 29 Sep '21

29 Sep '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Tue Sep 28 14:01:04 2021 +0200| [d619e82e973c40137a56fa4ba720382b1f688a43] | committer: Andreas Rheinhardt avcodec/zmbvenc: Remove redundant pixel format check ff_encode_preinit() already checked the pixel format via AVCodec.pix_fmts. Reviewed-by: Tomas Härdin <tjoppen(a)acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d619e82e973c40137… --- libavcodec/zmbvenc.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/zmbvenc.c b/libavcodec/zmbvenc.c index b431476241..8efdbc963e 100644 --- a/libavcodec/zmbvenc.c +++ b/libavcodec/zmbvenc.c @@ -347,9 +347,6 @@ static av_cold int encode_init(AVCodecContext *avctx) c->fmt = ZMBV_FMT_32BPP; c->bypp = 4; break; - default: - av_log(avctx, AV_LOG_INFO, "unsupported pixel format\n"); - return AVERROR(EINVAL); } /* Entropy-based score tables for comparing blocks.

1 0

avfilter/vf_floodfill: constify the AVFrame parameter in is_same() and pick_pixel() functions
by James Almer 29 Sep '21

29 Sep '21

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Tue Sep 28 21:42:24 2021 -0300| [04e9b9e5143f73b3735fa6a58dccd62dca849362] | committer: James Almer avfilter/vf_floodfill: constify the AVFrame parameter in is_same() and pick_pixel() functions Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=04e9b9e5143f73b37… --- libavfilter/vf_floodfill.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/libavfilter/vf_floodfill.c b/libavfilter/vf_floodfill.c index 21741cdb4f..5f2a4f4392 100644 --- a/libavfilter/vf_floodfill.c +++ b/libavfilter/vf_floodfill.c @@ -42,11 +42,11 @@ typedef struct FloodfillContext { int back, front; Points *points; - int (*is_same)(AVFrame *frame, int x, int y, + int (*is_same)(const AVFrame *frame, int x, int y, unsigned s0, unsigned s1, unsigned s2, unsigned s3); void (*set_pixel)(AVFrame *frame, int x, int y, unsigned d0, unsigned d1, unsigned d2, unsigned d3); - void (*pick_pixel)(AVFrame *frame, int x, int y, + void (*pick_pixel)(const AVFrame *frame, int x, int y, int *s0, int *s1, int *s2, int *s3); } FloodfillContext; @@ -57,7 +57,7 @@ static int is_inside(int x, int y, int w, int h) return 0; } -static int is_same4(AVFrame *frame, int x, int y, +static int is_same4(const AVFrame *frame, int x, int y, unsigned s0, unsigned s1, unsigned s2, unsigned s3) { unsigned c0 = frame->data[0][y * frame->linesize[0] + x]; @@ -70,7 +70,7 @@ static int is_same4(AVFrame *frame, int x, int y, return 0; } -static int is_same4_16(AVFrame *frame, int x, int y, +static int is_same4_16(const AVFrame *frame, int x, int y, unsigned s0, unsigned s1, unsigned s2, unsigned s3) { unsigned c0 = AV_RN16(frame->data[0] + y * frame->linesize[0] + 2 * x); @@ -83,7 +83,7 @@ static int is_same4_16(AVFrame *frame, int x, int y, return 0; } -static int is_same3(AVFrame *frame, int x, int y, +static int is_same3(const AVFrame *frame, int x, int y, unsigned s0, unsigned s1, unsigned s2, unsigned s3) { unsigned c0 = frame->data[0][y * frame->linesize[0] + x]; @@ -95,7 +95,7 @@ static int is_same3(AVFrame *frame, int x, int y, return 0; } -static int is_same3_16(AVFrame *frame, int x, int y, +static int is_same3_16(const AVFrame *frame, int x, int y, unsigned s0, unsigned s1, unsigned s2, unsigned s3) { unsigned c0 = AV_RN16(frame->data[0] + y * frame->linesize[0] + 2 * x); @@ -107,7 +107,7 @@ static int is_same3_16(AVFrame *frame, int x, int y, return 0; } -static int is_same1(AVFrame *frame, int x, int y, +static int is_same1(const AVFrame *frame, int x, int y, unsigned s0, unsigned s1, unsigned s2, unsigned s3) { unsigned c0 = frame->data[0][y * frame->linesize[0] + x]; @@ -117,7 +117,7 @@ static int is_same1(AVFrame *frame, int x, int y, return 0; } -static int is_same1_16(AVFrame *frame, int x, int y, +static int is_same1_16(const AVFrame *frame, int x, int y, unsigned s0, unsigned s1, unsigned s2, unsigned s3) { unsigned c0 = AV_RN16(frame->data[0] + y * frame->linesize[0] + 2 * x); @@ -173,21 +173,21 @@ static void set_pixel4_16(AVFrame *frame, int x, int y, AV_WN16(frame->data[3] + y * frame->linesize[3] + 2 * x, d3); } -static void pick_pixel1(AVFrame *frame, int x, int y, +static void pick_pixel1(const AVFrame *frame, int x, int y, int *s0, int *s1, int *s2, int *s3) { if (*s0 < 0) *s0 = frame->data[0][y * frame->linesize[0] + x]; } -static void pick_pixel1_16(AVFrame *frame, int x, int y, +static void pick_pixel1_16(const AVFrame *frame, int x, int y, int *s0, int *s1, int *s2, int *s3) { if (*s0 < 0) *s0 = AV_RN16(frame->data[0] + y * frame->linesize[0] + 2 * x); } -static void pick_pixel3(AVFrame *frame, int x, int y, +static void pick_pixel3(const AVFrame *frame, int x, int y, int *s0, int *s1, int *s2, int *s3) { if (*s0 < 0) @@ -198,7 +198,7 @@ static void pick_pixel3(AVFrame *frame, int x, int y, *s2 = frame->data[2][y * frame->linesize[2] + x]; } -static void pick_pixel3_16(AVFrame *frame, int x, int y, +static void pick_pixel3_16(const AVFrame *frame, int x, int y, int *s0, int *s1, int *s2, int *s3) { if (*s0 < 0) @@ -209,7 +209,7 @@ static void pick_pixel3_16(AVFrame *frame, int x, int y, *s2 = AV_RN16(frame->data[2] + y * frame->linesize[2] + 2 * x); } -static void pick_pixel4(AVFrame *frame, int x, int y, +static void pick_pixel4(const AVFrame *frame, int x, int y, int *s0, int *s1, int *s2, int *s3) { if (*s0 < 0) @@ -222,7 +222,7 @@ static void pick_pixel4(AVFrame *frame, int x, int y, *s3 = frame->data[3][y * frame->linesize[3] + x]; } -static void pick_pixel4_16(AVFrame *frame, int x, int y, +static void pick_pixel4_16(const AVFrame *frame, int x, int y, int *s0, int *s1, int *s2, int *s3) { if (*s0 < 0)

1 0

fate/checkasm: add missing tests to FATE
by James Almer 29 Sep '21

29 Sep '21

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Mon Sep 27 22:04:17 2021 -0300| [272c293c022fd7761f54cd97e8ba636ac03c0906] | committer: James Almer fate/checkasm: add missing tests to FATE Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=272c293c022fd7761… --- tests/fate/checkasm.mak | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/fate/checkasm.mak b/tests/fate/checkasm.mak index cec6d28286..6e7edbe655 100644 --- a/tests/fate/checkasm.mak +++ b/tests/fate/checkasm.mak @@ -18,6 +18,7 @@ FATE_CHECKASM = fate-checkasm-aacpsdsp \ fate-checkasm-hevc_idct \ fate-checkasm-hevc_pel \ fate-checkasm-hevc_sao \ + fate-checkasm-huffyuvdsp \ fate-checkasm-jpeg2000dsp \ fate-checkasm-llviddsp \ fate-checkasm-llviddspenc \ @@ -27,6 +28,7 @@ FATE_CHECKASM = fate-checkasm-aacpsdsp \ fate-checkasm-synth_filter \ fate-checkasm-sw_rgb \ fate-checkasm-sw_scale \ + fate-checkasm-utvideodsp \ fate-checkasm-v210dec \ fate-checkasm-v210enc \ fate-checkasm-vf_blend \ @@ -34,6 +36,7 @@ FATE_CHECKASM = fate-checkasm-aacpsdsp \ fate-checkasm-vf_eq \ fate-checkasm-vf_gblur \ fate-checkasm-vf_hflip \ + fate-checkasm-vf_nlmeans \ fate-checkasm-vf_threshold \ fate-checkasm-videodsp \ fate-checkasm-vp8dsp \

1 0

avcodec/libsvtav1: properly enforce CQP mode when set in wrapper
by Limin Wang 29 Sep '21

29 Sep '21

ffmpeg | branch: master | Limin Wang <lance.lmwang(a)gmail.com> | Sat Sep 25 22:09:05 2021 +0800| [c5f314309067dc85c165b975f53975c38e196258] | committer: Limin Wang avcodec/libsvtav1: properly enforce CQP mode when set in wrapper SVT-AV1 seems to have switched their default from CQP to CRF in February, so enforce the controlling option accordingly. Signed-off-by: Limin Wang <lance.lmwang(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c5f314309067dc85c… --- libavcodec/libsvtav1.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index a02ba6a82f..6196da25e6 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -205,6 +205,7 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, param->frame_rate_denominator = avctx->time_base.num * avctx->ticks_per_frame; } + param->enable_tpl_la = !!param->rate_control_mode; if (param->rate_control_mode) { param->max_qp_allowed = avctx->qmax; param->min_qp_allowed = avctx->qmin;

1 0

doc/encoders: add available values for libsvtav1 options
by Limin Wang 29 Sep '21

29 Sep '21

ffmpeg | branch: master | Limin Wang <lance.lmwang(a)gmail.com> | Sat Sep 25 22:00:03 2021 +0800| [ed89be1e022979ae1b49d4981981b79c2fb64662] | committer: Limin Wang doc/encoders: add available values for libsvtav1 options Signed-off-by: Limin Wang <lance.lmwang(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed89be1e022979ae1… --- doc/encoders.texi | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index 8fccd73691..8a7589c245 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -1750,12 +1750,30 @@ You need to explicitly configure the build with @code{--enable-libsvtav1}. @table @option @item profile Set the encoding profile. +@table @samp +@item main +@item high +@item professional +@end table @item level -Set the operating point level. +Set the operating point level. For example: '4.0' + +@item hielevel +Set the Hierarchical prediction levels. +@table @samp +@item 3level +@item 4level +This is the default. +@end table @item tier Set the operating point tier. +@table @samp +@item main +This is the default. +@item high +@end table @item rc Set the rate control mode to use.

1 0

avformat/hlsenc: add const for filename argument
by Limin Wang 29 Sep '21

29 Sep '21

ffmpeg | branch: master | Limin Wang <lance.lmwang(a)gmail.com> | Fri Aug 20 21:08:17 2021 +0800| [0f5e1877ba36feb876ec8eb0d0eb14114ebc9b3a] | committer: Limin Wang avformat/hlsenc: add const for filename argument Signed-off-by: Limin Wang <lance.lmwang(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0f5e1877ba36feb87… --- libavformat/hlsenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 7c37bc50b9..98608a834a 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -281,7 +281,7 @@ static int strftime_expand(const char *fmt, char **dest) return r; } -static int hlsenc_io_open(AVFormatContext *s, AVIOContext **pb, char *filename, +static int hlsenc_io_open(AVFormatContext *s, AVIOContext **pb, const char *filename, AVDictionary **options) { HLSContext *hls = s->priv_data;

1 0

avformat/utils: add const for argument passed to ff_is_http_proto()
by Limin Wang 29 Sep '21

29 Sep '21

ffmpeg | branch: master | Limin Wang <lance.lmwang(a)gmail.com> | Fri Aug 20 19:31:13 2021 +0800| [4be3f6d2d2dc438351d382c5324511cc3b9ed6f4] | committer: Limin Wang avformat/utils: add const for argument passed to ff_is_http_proto() Signed-off-by: Limin Wang <lance.lmwang(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4be3f6d2d2dc43835… --- libavformat/internal.h | 2 +- libavformat/utils.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/internal.h b/libavformat/internal.h index cc8c8f4b43..6f1f1c072a 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -907,7 +907,7 @@ void ff_format_io_close(AVFormatContext *s, AVIOContext **pb); * @param s AVFormatContext * @param filename URL or file name to open for writing */ -int ff_is_http_proto(char *filename); +int ff_is_http_proto(const char *filename); /** * Parse creation_time in AVFormatContext metadata if exists and warn if the diff --git a/libavformat/utils.c b/libavformat/utils.c index 2157f93e7b..509c0ecdce 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1802,7 +1802,7 @@ void ff_format_io_close(AVFormatContext *s, AVIOContext **pb) *pb = NULL; } -int ff_is_http_proto(char *filename) { +int ff_is_http_proto(const char *filename) { const char *proto = avio_find_protocol_name(filename); return proto ? (!av_strcasecmp(proto, "http") || !av_strcasecmp(proto, "https")) : 0; }

1 0