October 2019 - ffmpeg-cvslog - lists.ffmpeg.org

lavc/qsvdec: remove unused check_dec_param
by Linjie Fu 26 Oct '19

26 Oct '19

ffmpeg | branch: master | Linjie Fu <linjie.fu(a)intel.com> | Fri Oct 18 16:28:59 2019 +0800| [e1d993d829a6386d1b0514ea38f723d2b31b38fe] | committer: Zhong Li lavc/qsvdec: remove unused check_dec_param Signed-off-by: Linjie Fu <linjie.fu(a)intel.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1d993d829a6386d1… --- libavcodec/qsvdec.c | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index ae5023989c..0d34021b42 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -164,33 +164,6 @@ static inline unsigned int qsv_fifo_size(const AVFifoBuffer* fifo) return av_fifo_size(fifo) / qsv_fifo_item_size(); } -static int check_dec_param(AVCodecContext *avctx, QSVContext *q, mfxVideoParam *param_in) -{ - mfxVideoParam param_out = { .mfx.CodecId = param_in->mfx.CodecId }; - mfxStatus ret; - -#define CHECK_MATCH(x) \ - do { \ - if (param_out.mfx.x != param_in->mfx.x) { \ - av_log(avctx, AV_LOG_WARNING, "Required "#x" %d is unsupported\n", \ - param_in->mfx.x); \ - } \ - } while (0) - - ret = MFXVideoDECODE_Query(q->session, param_in, &param_out); - - if (ret < 0) { - CHECK_MATCH(CodecId); - CHECK_MATCH(CodecProfile); - CHECK_MATCH(CodecLevel); - CHECK_MATCH(FrameInfo.Width); - CHECK_MATCH(FrameInfo.Height); -#undef CHECK_MATCH - return 0; - } - return 1; -} - static int qsv_decode_preinit(AVCodecContext *avctx, QSVContext *q, enum AVPixelFormat pix_fmt, mfxVideoParam *param) { mfxSession session = NULL;

1 0

avfilter/avf_showfreqs: free input frame after using it
by James Almer 26 Oct '19

26 Oct '19

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Sat Oct 26 01:21:56 2019 -0300| [1aa4fc1ec204fabed5c40873b86751976167272f] | committer: James Almer avfilter/avf_showfreqs: free input frame after using it Fixes ticket #8336. Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1aa4fc1ec204fabed… --- libavfilter/avf_showfreqs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavfilter/avf_showfreqs.c b/libavfilter/avf_showfreqs.c index c44ac564ac..645754ded3 100644 --- a/libavfilter/avf_showfreqs.c +++ b/libavfilter/avf_showfreqs.c @@ -475,6 +475,7 @@ static int activate(AVFilterContext *ctx) av_audio_fifo_write(s->fifo, (void **)in->extended_data, in->nb_samples); if (s->pts == AV_NOPTS_VALUE) s->pts = in->pts; + av_frame_free(&in); } if (av_audio_fifo_size(s->fifo) >= s->win_size) {

1 0

avfilter/vsrc_testsrc: increase max level of haldclutsrc
by Paul B Mahol 26 Oct '19

26 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Oct 26 10:24:03 2019 +0200| [4447aeaac2be3c825987cc4ea9e15c08b4bd22b8] | committer: Paul B Mahol avfilter/vsrc_testsrc: increase max level of haldclutsrc So it matches lut3d and haldclut filter. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4447aeaac2be3c825… --- libavfilter/vsrc_testsrc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c index 2a365bdc15..42d74577b7 100644 --- a/libavfilter/vsrc_testsrc.c +++ b/libavfilter/vsrc_testsrc.c @@ -280,7 +280,7 @@ AVFilter ff_vsrc_color = { #if CONFIG_HALDCLUTSRC_FILTER static const AVOption haldclutsrc_options[] = { - { "level", "set level", OFFSET(level), AV_OPT_TYPE_INT, {.i64 = 6}, 2, 8, FLAGS }, + { "level", "set level", OFFSET(level), AV_OPT_TYPE_INT, {.i64 = 6}, 2, 16, FLAGS }, COMMON_OPTIONS_NOSIZE { NULL } };

1 0

avfilter/vf_lut3d: increase max level to upper limit defined by cube format specification
by Paul B Mahol 26 Oct '19

26 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Oct 25 11:26:25 2019 +0200| [a2210f10d37e890eefa1f94a5528ac69fa1515d2] | committer: Paul B Mahol avfilter/vf_lut3d: increase max level to upper limit defined by cube format specification > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a2210f10d37e890ee… --- libavfilter/vf_lut3d.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index 551dd1973b..cd0aba1f69 100644 --- a/libavfilter/vf_lut3d.c +++ b/libavfilter/vf_lut3d.c @@ -55,7 +55,7 @@ struct rgbvec { /* 3D LUT don't often go up to level 32, but it is common to have a Hald CLUT * of 512x512 (64x64x64) */ -#define MAX_LEVEL 128 +#define MAX_LEVEL 256 typedef struct LUT3DContext { const AVClass *class;

1 0

avfilter/vf_lut3d: allocate 3d lut dynamically
by Paul B Mahol 26 Oct '19

26 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Oct 24 13:37:38 2019 +0200| [9130028d875416b46f5242e41ceae17715823823] | committer: Paul B Mahol avfilter/vf_lut3d: allocate 3d lut dynamically > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9130028d875416b46… --- libavfilter/vf_lut3d.c | 170 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 111 insertions(+), 59 deletions(-) diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index a525039baa..551dd1973b 100644 --- a/libavfilter/vf_lut3d.c +++ b/libavfilter/vf_lut3d.c @@ -65,8 +65,9 @@ typedef struct LUT3DContext { int step; avfilter_action_func *interp; struct rgbvec scale; - struct rgbvec lut[MAX_LEVEL][MAX_LEVEL][MAX_LEVEL]; + struct rgbvec *lut; int lutsize; + int lutsize2; #if CONFIG_HALDCLUT_FILTER uint8_t clut_rgba_map[4]; int clut_step; @@ -113,7 +114,7 @@ static inline struct rgbvec lerp(const struct rgbvec *v0, const struct rgbvec *v static inline struct rgbvec interp_nearest(const LUT3DContext *lut3d, const struct rgbvec *s) { - return lut3d->lut[NEAR(s->r)][NEAR(s->g)][NEAR(s->b)]; + return lut3d->lut[NEAR(s->r) * lut3d->lutsize2 + NEAR(s->g) * lut3d->lutsize + NEAR(s->b)]; } /** @@ -123,17 +124,19 @@ static inline struct rgbvec interp_nearest(const LUT3DContext *lut3d, static inline struct rgbvec interp_trilinear(const LUT3DContext *lut3d, const struct rgbvec *s) { + const int lutsize2 = lut3d->lutsize2; + const int lutsize = lut3d->lutsize; const int prev[] = {PREV(s->r), PREV(s->g), PREV(s->b)}; const int next[] = {NEXT(s->r), NEXT(s->g), NEXT(s->b)}; const struct rgbvec d = {s->r - prev[0], s->g - prev[1], s->b - prev[2]}; - const struct rgbvec c000 = lut3d->lut[prev[0]][prev[1]][prev[2]]; - const struct rgbvec c001 = lut3d->lut[prev[0]][prev[1]][next[2]]; - const struct rgbvec c010 = lut3d->lut[prev[0]][next[1]][prev[2]]; - const struct rgbvec c011 = lut3d->lut[prev[0]][next[1]][next[2]]; - const struct rgbvec c100 = lut3d->lut[next[0]][prev[1]][prev[2]]; - const struct rgbvec c101 = lut3d->lut[next[0]][prev[1]][next[2]]; - const struct rgbvec c110 = lut3d->lut[next[0]][next[1]][prev[2]]; - const struct rgbvec c111 = lut3d->lut[next[0]][next[1]][next[2]]; + const struct rgbvec c000 = lut3d->lut[prev[0] * lutsize2 + prev[1] * lutsize + prev[2]]; + const struct rgbvec c001 = lut3d->lut[prev[0] * lutsize2 + prev[1] * lutsize + next[2]]; + const struct rgbvec c010 = lut3d->lut[prev[0] * lutsize2 + next[1] * lutsize + prev[2]]; + const struct rgbvec c011 = lut3d->lut[prev[0] * lutsize2 + next[1] * lutsize + next[2]]; + const struct rgbvec c100 = lut3d->lut[next[0] * lutsize2 + prev[1] * lutsize + prev[2]]; + const struct rgbvec c101 = lut3d->lut[next[0] * lutsize2 + prev[1] * lutsize + next[2]]; + const struct rgbvec c110 = lut3d->lut[next[0] * lutsize2 + next[1] * lutsize + prev[2]]; + const struct rgbvec c111 = lut3d->lut[next[0] * lutsize2 + next[1] * lutsize + next[2]]; const struct rgbvec c00 = lerp(&c000, &c100, d.r); const struct rgbvec c10 = lerp(&c010, &c110, d.r); const struct rgbvec c01 = lerp(&c001, &c101, d.r); @@ -151,48 +154,50 @@ static inline struct rgbvec interp_trilinear(const LUT3DContext *lut3d, static inline struct rgbvec interp_tetrahedral(const LUT3DContext *lut3d, const struct rgbvec *s) { + const int lutsize2 = lut3d->lutsize2; + const int lutsize = lut3d->lutsize; const int prev[] = {PREV(s->r), PREV(s->g), PREV(s->b)}; const int next[] = {NEXT(s->r), NEXT(s->g), NEXT(s->b)}; const struct rgbvec d = {s->r - prev[0], s->g - prev[1], s->b - prev[2]}; - const struct rgbvec c000 = lut3d->lut[prev[0]][prev[1]][prev[2]]; - const struct rgbvec c111 = lut3d->lut[next[0]][next[1]][next[2]]; + const struct rgbvec c000 = lut3d->lut[prev[0] * lutsize2 + prev[1] * lutsize + prev[2]]; + const struct rgbvec c111 = lut3d->lut[next[0] * lutsize2 + next[1] * lutsize + next[2]]; struct rgbvec c; if (d.r > d.g) { if (d.g > d.b) { - const struct rgbvec c100 = lut3d->lut[next[0]][prev[1]][prev[2]]; - const struct rgbvec c110 = lut3d->lut[next[0]][next[1]][prev[2]]; + const struct rgbvec c100 = lut3d->lut[next[0] * lutsize2 + prev[1] * lutsize + prev[2]]; + const struct rgbvec c110 = lut3d->lut[next[0] * lutsize2 + next[1] * lutsize + prev[2]]; c.r = (1-d.r) * c000.r + (d.r-d.g) * c100.r + (d.g-d.b) * c110.r + (d.b) * c111.r; c.g = (1-d.r) * c000.g + (d.r-d.g) * c100.g + (d.g-d.b) * c110.g + (d.b) * c111.g; c.b = (1-d.r) * c000.b + (d.r-d.g) * c100.b + (d.g-d.b) * c110.b + (d.b) * c111.b; } else if (d.r > d.b) { - const struct rgbvec c100 = lut3d->lut[next[0]][prev[1]][prev[2]]; - const struct rgbvec c101 = lut3d->lut[next[0]][prev[1]][next[2]]; + const struct rgbvec c100 = lut3d->lut[next[0] * lutsize2 + prev[1] * lutsize + prev[2]]; + const struct rgbvec c101 = lut3d->lut[next[0] * lutsize2 + prev[1] * lutsize + next[2]]; c.r = (1-d.r) * c000.r + (d.r-d.b) * c100.r + (d.b-d.g) * c101.r + (d.g) * c111.r; c.g = (1-d.r) * c000.g + (d.r-d.b) * c100.g + (d.b-d.g) * c101.g + (d.g) * c111.g; c.b = (1-d.r) * c000.b + (d.r-d.b) * c100.b + (d.b-d.g) * c101.b + (d.g) * c111.b; } else { - const struct rgbvec c001 = lut3d->lut[prev[0]][prev[1]][next[2]]; - const struct rgbvec c101 = lut3d->lut[next[0]][prev[1]][next[2]]; + const struct rgbvec c001 = lut3d->lut[prev[0] * lutsize2 + prev[1] * lutsize + next[2]]; + const struct rgbvec c101 = lut3d->lut[next[0] * lutsize2 + prev[1] * lutsize + next[2]]; c.r = (1-d.b) * c000.r + (d.b-d.r) * c001.r + (d.r-d.g) * c101.r + (d.g) * c111.r; c.g = (1-d.b) * c000.g + (d.b-d.r) * c001.g + (d.r-d.g) * c101.g + (d.g) * c111.g; c.b = (1-d.b) * c000.b + (d.b-d.r) * c001.b + (d.r-d.g) * c101.b + (d.g) * c111.b; } } else { if (d.b > d.g) { - const struct rgbvec c001 = lut3d->lut[prev[0]][prev[1]][next[2]]; - const struct rgbvec c011 = lut3d->lut[prev[0]][next[1]][next[2]]; + const struct rgbvec c001 = lut3d->lut[prev[0] * lutsize2 + prev[1] * lutsize + next[2]]; + const struct rgbvec c011 = lut3d->lut[prev[0] * lutsize2 + next[1] * lutsize + next[2]]; c.r = (1-d.b) * c000.r + (d.b-d.g) * c001.r + (d.g-d.r) * c011.r + (d.r) * c111.r; c.g = (1-d.b) * c000.g + (d.b-d.g) * c001.g + (d.g-d.r) * c011.g + (d.r) * c111.g; c.b = (1-d.b) * c000.b + (d.b-d.g) * c001.b + (d.g-d.r) * c011.b + (d.r) * c111.b; } else if (d.b > d.r) { - const struct rgbvec c010 = lut3d->lut[prev[0]][next[1]][prev[2]]; - const struct rgbvec c011 = lut3d->lut[prev[0]][next[1]][next[2]]; + const struct rgbvec c010 = lut3d->lut[prev[0] * lutsize2 + next[1] * lutsize + prev[2]]; + const struct rgbvec c011 = lut3d->lut[prev[0] * lutsize2 + next[1] * lutsize + next[2]]; c.r = (1-d.g) * c000.r + (d.g-d.b) * c010.r + (d.b-d.r) * c011.r + (d.r) * c111.r; c.g = (1-d.g) * c000.g + (d.g-d.b) * c010.g + (d.b-d.r) * c011.g + (d.r) * c111.g; c.b = (1-d.g) * c000.b + (d.g-d.b) * c010.b + (d.b-d.r) * c011.b + (d.r) * c111.b; } else { - const struct rgbvec c010 = lut3d->lut[prev[0]][next[1]][prev[2]]; - const struct rgbvec c110 = lut3d->lut[next[0]][next[1]][prev[2]]; + const struct rgbvec c010 = lut3d->lut[prev[0] * lutsize2 + next[1] * lutsize + prev[2]]; + const struct rgbvec c110 = lut3d->lut[next[0] * lutsize2 + next[1] * lutsize + prev[2]]; c.r = (1-d.g) * c000.r + (d.g-d.r) * c010.r + (d.r-d.b) * c110.r + (d.b) * c111.r; c.g = (1-d.g) * c000.g + (d.g-d.r) * c010.g + (d.r-d.b) * c110.g + (d.b) * c111.g; c.b = (1-d.g) * c000.b + (d.g-d.r) * c010.b + (d.r-d.b) * c110.b + (d.b) * c111.b; @@ -346,30 +351,50 @@ static int skip_line(const char *p) } \ } while (loop_cond) +static int allocate_3dlut(AVFilterContext *ctx, int lutsize) +{ + LUT3DContext *lut3d = ctx->priv; + + if (lutsize < 2 || lutsize > MAX_LEVEL) { + av_log(ctx, AV_LOG_ERROR, "Too large or invalid 3D LUT size\n"); + return AVERROR(EINVAL); + } + + av_freep(&lut3d->lut); + lut3d->lut = av_malloc_array(lutsize * lutsize * lutsize, sizeof(*lut3d->lut)); + if (!lut3d->lut) + return AVERROR(ENOMEM); + lut3d->lutsize = lutsize; + lut3d->lutsize2 = lutsize * lutsize; + return 0; +} + /* Basically r g and b float values on each line, with a facultative 3DLUTSIZE * directive; seems to be generated by Davinci */ static int parse_dat(AVFilterContext *ctx, FILE *f) { LUT3DContext *lut3d = ctx->priv; char line[MAX_LINE_SIZE]; - int i, j, k, size; + int ret, i, j, k, size, size2; lut3d->lutsize = size = 33; + size2 = size * size; NEXT_LINE(skip_line(line)); if (!strncmp(line, "3DLUTSIZE ", 10)) { size = strtol(line + 10, NULL, 0); - if (size < 2 || size > MAX_LEVEL) { - av_log(ctx, AV_LOG_ERROR, "Too large or invalid 3D LUT size\n"); - return AVERROR(EINVAL); - } - lut3d->lutsize = size; + NEXT_LINE(skip_line(line)); } + + ret = allocate_3dlut(ctx, size); + if (ret < 0) + return ret; + for (k = 0; k < size; k++) { for (j = 0; j < size; j++) { for (i = 0; i < size; i++) { - struct rgbvec *vec = &lut3d->lut[k][j][i]; + struct rgbvec *vec = &lut3d->lut[k * size2 + j * size + i]; if (k != 0 || j != 0 || i != 0) NEXT_LINE(skip_line(line)); if (av_sscanf(line, "%f %f %f", &vec->r, &vec->g, &vec->b) != 3) @@ -390,18 +415,18 @@ static int parse_cube(AVFilterContext *ctx, FILE *f) while (fgets(line, sizeof(line), f)) { if (!strncmp(line, "LUT_3D_SIZE", 11)) { - int i, j, k; + int ret, i, j, k; const int size = strtol(line + 12, NULL, 0); + const int size2 = size * size; + + ret = allocate_3dlut(ctx, size); + if (ret < 0) + return ret; - if (size < 2 || size > MAX_LEVEL) { - av_log(ctx, AV_LOG_ERROR, "Too large or invalid 3D LUT size\n"); - return AVERROR(EINVAL); - } - lut3d->lutsize = size; for (k = 0; k < size; k++) { for (j = 0; j < size; j++) { for (i = 0; i < size; i++) { - struct rgbvec *vec = &lut3d->lut[i][j][k]; + struct rgbvec *vec = &lut3d->lut[i * size2 + j * size + k]; do { try_again: @@ -442,17 +467,23 @@ static int parse_3dl(AVFilterContext *ctx, FILE *f) { char line[MAX_LINE_SIZE]; LUT3DContext *lut3d = ctx->priv; - int i, j, k; + int ret, i, j, k; const int size = 17; + const int size2 = 17 * 17; const float scale = 16*16*16; lut3d->lutsize = size; + + ret = allocate_3dlut(ctx, size); + if (ret < 0) + return ret; + NEXT_LINE(skip_line(line)); for (k = 0; k < size; k++) { for (j = 0; j < size; j++) { for (i = 0; i < size; i++) { int r, g, b; - struct rgbvec *vec = &lut3d->lut[k][j][i]; + struct rgbvec *vec = &lut3d->lut[k * size2 + j * size + i]; NEXT_LINE(skip_line(line)); if (av_sscanf(line, "%d %d %d", &r, &g, &b) != 3) @@ -471,7 +502,7 @@ static int parse_m3d(AVFilterContext *ctx, FILE *f) { LUT3DContext *lut3d = ctx->priv; float scale; - int i, j, k, size, in = -1, out = -1; + int ret, i, j, k, size, size2, in = -1, out = -1; char line[MAX_LINE_SIZE]; uint8_t rgb_map[3] = {0, 1, 2}; @@ -510,12 +541,18 @@ static int parse_m3d(AVFilterContext *ctx, FILE *f) } for (size = 1; size*size*size < in; size++); lut3d->lutsize = size; + size2 = size * size; + + ret = allocate_3dlut(ctx, size); + if (ret < 0) + return ret; + scale = 1. / (out - 1); for (k = 0; k < size; k++) { for (j = 0; j < size; j++) { for (i = 0; i < size; i++) { - struct rgbvec *vec = &lut3d->lut[k][j][i]; + struct rgbvec *vec = &lut3d->lut[k * size2 + j * size + i]; float val[3]; NEXT_LINE(0); @@ -538,7 +575,7 @@ static int parse_cinespace(AVFilterContext *ctx, FILE *f) float in_max[3] = {1.0, 1.0, 1.0}; float out_min[3] = {0.0, 0.0, 0.0}; float out_max[3] = {1.0, 1.0, 1.0}; - int inside_metadata = 0, size; + int ret, inside_metadata = 0, size, size2; NEXT_LINE(skip_line(line)); if (strncmp(line, "CSPLUTV100", 10)) { @@ -591,17 +628,16 @@ static int parse_cinespace(AVFilterContext *ctx, FILE *f) } size = size_r; - if (size < 2 || size > MAX_LEVEL) { - av_log(ctx, AV_LOG_ERROR, "Too large or invalid 3D LUT size\n"); - return AVERROR(EINVAL); - } + size2 = size * size; - lut3d->lutsize = size; + ret = allocate_3dlut(ctx, size); + if (ret < 0) + return ret; for (int k = 0; k < size; k++) { for (int j = 0; j < size; j++) { for (int i = 0; i < size; i++) { - struct rgbvec *vec = &lut3d->lut[i][j][k]; + struct rgbvec *vec = &lut3d->lut[i * size2 + j * size + k]; if (k != 0 || j != 0 || i != 0) NEXT_LINE(skip_line(line)); if (av_sscanf(line, "%f %f %f", &vec->r, &vec->g, &vec->b) != 3) @@ -624,22 +660,29 @@ static int parse_cinespace(AVFilterContext *ctx, FILE *f) return 0; } -static void set_identity_matrix(LUT3DContext *lut3d, int size) +static int set_identity_matrix(AVFilterContext *ctx, int size) { - int i, j, k; + LUT3DContext *lut3d = ctx->priv; + int ret, i, j, k; + const int size2 = size * size; const float c = 1. / (size - 1); - lut3d->lutsize = size; + ret = allocate_3dlut(ctx, size); + if (ret < 0) + return ret; + for (k = 0; k < size; k++) { for (j = 0; j < size; j++) { for (i = 0; i < size; i++) { - struct rgbvec *vec = &lut3d->lut[k][j][i]; + struct rgbvec *vec = &lut3d->lut[k * size2 + j * size + i]; vec->r = k * c; vec->g = j * c; vec->b = i * c; } } } + + return 0; } static int query_formats(AVFilterContext *ctx) @@ -780,8 +823,7 @@ static av_cold int lut3d_init(AVFilterContext *ctx) lut3d->scale.r = lut3d->scale.g = lut3d->scale.b = 1.f; if (!lut3d->file) { - set_identity_matrix(lut3d, 32); - return 0; + return set_identity_matrix(ctx, 32); } f = fopen(lut3d->file, "r"); @@ -824,6 +866,13 @@ end: return ret; } +static av_cold void lut3d_uninit(AVFilterContext *ctx) +{ + LUT3DContext *lut3d = ctx->priv; + + av_freep(&lut3d->lut); +} + static const AVFilterPad lut3d_inputs[] = { { .name = "default", @@ -847,6 +896,7 @@ AVFilter ff_vf_lut3d = { .description = NULL_IF_CONFIG_SMALL("Adjust colors using a 3D LUT."), .priv_size = sizeof(LUT3DContext), .init = lut3d_init, + .uninit = lut3d_uninit, .query_formats = query_formats, .inputs = lut3d_inputs, .outputs = lut3d_outputs, @@ -865,6 +915,7 @@ static void update_clut_packed(LUT3DContext *lut3d, const AVFrame *frame) const int step = lut3d->clut_step; const uint8_t *rgba_map = lut3d->clut_rgba_map; const int level = lut3d->lutsize; + const int level2 = lut3d->lutsize2; #define LOAD_CLUT(nbits) do { \ int i, j, k, x = 0, y = 0; \ @@ -874,7 +925,7 @@ static void update_clut_packed(LUT3DContext *lut3d, const AVFrame *frame) for (i = 0; i < level; i++) { \ const uint##nbits##_t *src = (const uint##nbits##_t *) \ (data + y*linesize + x*step); \ - struct rgbvec *vec = &lut3d->lut[i][j][k]; \ + struct rgbvec *vec = &lut3d->lut[i * level2 + j * level + k]; \ vec->r = src[rgba_map[0]] / (float)((1<<(nbits)) - 1); \ vec->g = src[rgba_map[1]] / (float)((1<<(nbits)) - 1); \ vec->b = src[rgba_map[2]] / (float)((1<<(nbits)) - 1); \ @@ -903,6 +954,7 @@ static void update_clut_planar(LUT3DContext *lut3d, const AVFrame *frame) const int rlinesize = frame->linesize[2]; const int w = lut3d->clut_width; const int level = lut3d->lutsize; + const int level2 = lut3d->lutsize2; #define LOAD_CLUT_PLANAR(nbits, depth) do { \ int i, j, k, x = 0, y = 0; \ @@ -916,7 +968,7 @@ static void update_clut_planar(LUT3DContext *lut3d, const AVFrame *frame) (datab + y*blinesize); \ const uint##nbits##_t *rsrc = (const uint##nbits##_t *) \ (datar + y*rlinesize); \ - struct rgbvec *vec = &lut3d->lut[i][j][k]; \ + struct rgbvec *vec = &lut3d->lut[i * level2 + j * level + k]; \ vec->r = gsrc[x] / (float)((1<<(depth)) - 1); \ vec->g = bsrc[x] / (float)((1<<(depth)) - 1); \ vec->b = rsrc[x] / (float)((1<<(depth)) - 1); \ @@ -1001,9 +1053,8 @@ static int config_clut(AVFilterLink *inlink) max_clut_level, max_clut_size, max_clut_size); return AVERROR(EINVAL); } - lut3d->lutsize = level; - return 0; + return allocate_3dlut(ctx, level); } static int update_apply_clut(FFFrameSync *fs) @@ -1039,6 +1090,7 @@ static av_cold void haldclut_uninit(AVFilterContext *ctx) { LUT3DContext *lut3d = ctx->priv; ff_framesync_uninit(&lut3d->fs); + av_freep(&lut3d->lut); } static const AVOption haldclut_options[] = {

1 0

[ffmpeg-web] branch master updated. fc2d9ed web/css: add white-normal normal for button wrap
by ffmpeg-git＠ffmpeg.org 25 Oct '19

25 Oct '19

The branch, master has been updated via fc2d9ed07d4f99ff34d13cf90a47db866dd021e9 (commit) from fce4352d00a934c78e1cd366c0d5e08a86223322 (commit) - Log ----------------------------------------------------------------- commit fc2d9ed07d4f99ff34d13cf90a47db866dd021e9 Author: Lou Logan <lou(a)lrcd.com> AuthorDate: Fri Oct 25 14:01:24 2019 -0800 Commit: Lou Logan <lou(a)lrcd.com> CommitDate: Fri Oct 25 14:01:24 2019 -0800 web/css: add white-normal normal for button wrap Signed-off-by: Lou Logan <lou(a)lrcd.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> Suggested-by: Deby Page <db0company(a)gmail.com> diff --git a/src/less/style.less b/src/less/style.less index c83f3e6..9c738fc 100644 --- a/src/less/style.less +++ b/src/less/style.less @@ -399,6 +399,7 @@ code { padding: 3%; display: inline-block; margin-bottom: 5px; + white-space: normal; } small { display: block; ----------------------------------------------------------------------- Summary of changes: src/less/style.less | 1 + 1 file changed, 1 insertion(+) hooks/post-receive --

1 0

avformat/avienc: Remove superfluous header
by Andreas Rheinhardt 25 Oct '19

25 Oct '19

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Fri Oct 25 20:07:37 2019 +0200| [b78227e1684a0ef186bf4bf273950f97803289dc] | committer: Michael Niedermayer avformat/avienc: Remove superfluous header 04d2540c added intreadwrite.h to avienc.c, although there was (and is) no need to do so. The inclusion seems to be a mistake as this commit added a AV_WL32 to avidec.c. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b78227e1684a0ef18… --- libavformat/avienc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/avienc.c b/libavformat/avienc.c index 5f143bccce..940ea33510 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -31,7 +31,6 @@ #include "libavutil/avstring.h" #include "libavutil/avutil.h" #include "libavutil/internal.h" -#include "libavutil/intreadwrite.h" #include "libavutil/dict.h" #include "libavutil/avassert.h" #include "libavutil/timestamp.h"

1 0

avformat/avidec: Remove superfluous header
by Andreas Rheinhardt 25 Oct '19

25 Oct '19

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Fri Oct 25 20:07:36 2019 +0200| [982539a07af72ab5bae551b92e3a63bf5cf86cf6] | committer: Michael Niedermayer avformat/avidec: Remove superfluous header bswap.h was included since 7b114c09, yet since 3788a3c0 no explicit use of anything from bswap.h has been made, so remove this header. (Only AV_RL32 is used and while this might imply swapping on big-endian systems, it is contained in libavutil/intreadwrite.h.) Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=982539a07af72ab5b… --- libavformat/avidec.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 1ca26968fa..5cf67a4771 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -23,7 +23,6 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" -#include "libavutil/bswap.h" #include "libavutil/opt.h" #include "libavutil/dict.h" #include "libavutil/internal.h"

1 0

avformat/asfenc: Remove unnecessary header
by Andreas Rheinhardt 25 Oct '19

25 Oct '19

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Fri Oct 25 20:07:33 2019 +0200| [09e938b3a12938fff6cb36c70407d8913acfd04b] | committer: Michael Niedermayer avformat/asfenc: Remove unnecessary header libavutil/parseutils.h has been included in 22bbd6e8 for av_parse_time() and the header has not been removed when said function was replaced by ff_parse_creation_time_metadata() in ea1bf08a. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=09e938b3a12938fff… --- libavformat/asfenc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index 3cfe75a5d5..9f54173bf9 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -22,7 +22,6 @@ #include "libavutil/avassert.h" #include "libavutil/dict.h" #include "libavutil/mathematics.h" -#include "libavutil/parseutils.h" #include "libavutil/opt.h" #include "avformat.h" #include "avlanguage.h"

1 0

avformat/aiffenc: Add deinit function
by Andreas Rheinhardt 25 Oct '19

25 Oct '19

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Fri Oct 25 03:38:07 2019 +0200| [2e37237ff107ea7175e15fed5e2f8d8aba80e225] | committer: Michael Niedermayer avformat/aiffenc: Add deinit function Prevents memleaks if the trailer is never written. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2e37237ff107ea717… --- libavformat/aiffenc.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c index d37b9ae1c6..e25794d185 100644 --- a/libavformat/aiffenc.c +++ b/libavformat/aiffenc.c @@ -260,7 +260,7 @@ static int aiff_write_trailer(AVFormatContext *s) /* Write ID3 tags */ if (aiff->write_id3v2) if ((ret = put_id3v2_tags(s, aiff)) < 0) - goto free; + return ret; /* File length */ file_size = avio_tell(pb); @@ -270,12 +270,16 @@ static int aiff_write_trailer(AVFormatContext *s) avio_flush(pb); } -free: - ff_packet_list_free(&aiff->pict_list, &aiff->pict_list_end); - return ret; } +static void aiff_deinit(AVFormatContext *s) +{ + AIFFOutputContext *aiff = s->priv_data; + + ff_packet_list_free(&aiff->pict_list, &aiff->pict_list_end); +} + #define OFFSET(x) offsetof(AIFFOutputContext, x) #define ENC AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { @@ -304,6 +308,7 @@ AVOutputFormat ff_aiff_muxer = { .write_header = aiff_write_header, .write_packet = aiff_write_packet, .write_trailer = aiff_write_trailer, + .deinit = aiff_deinit, .codec_tag = (const AVCodecTag* const []){ ff_codec_aiff_tags, 0 }, .priv_class = &aiff_muxer_class, };

1 0