December 2018 - ffmpeg-cvslog

avfilter/af_sofalizer: stop allocating never used buffers
by Paul B Mahol 31 Dec '18

31 Dec '18

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Mon Dec 31 19:40:18 2018 +0100| [51b356eef85df7864b673b9cc990210bca631a04] | committer: Paul B Mahol avfilter/af_sofalizer: stop allocating never used buffers > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=51b356eef85df7864… --- libavfilter/af_sofalizer.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/libavfilter/af_sofalizer.c b/libavfilter/af_sofalizer.c index 52c3b49ccd..48123594a6 100644 --- a/libavfilter/af_sofalizer.c +++ b/libavfilter/af_sofalizer.c @@ -719,12 +719,20 @@ static int load_data(AVFilterContext *ctx, int azim, int elev, float radius, int n_samples = s->sofa.n_samples; ir_samples = s->sofa.ir_samples; - s->data_ir[0] = av_calloc(n_samples, sizeof(float) * s->n_conv); - s->data_ir[1] = av_calloc(n_samples, sizeof(float) * s->n_conv); + if (s->type == TIME_DOMAIN) { + s->data_ir[0] = av_calloc(n_samples, sizeof(float) * s->n_conv); + s->data_ir[1] = av_calloc(n_samples, sizeof(float) * s->n_conv); + + if (!s->data_ir[0] || !s->data_ir[1]) { + ret = AVERROR(ENOMEM); + goto fail; + } + } + s->delay[0] = av_calloc(s->n_conv, sizeof(int)); s->delay[1] = av_calloc(s->n_conv, sizeof(int)); - if (!s->data_ir[0] || !s->data_ir[1] || !s->delay[0] || !s->delay[1]) { + if (!s->delay[0] || !s->delay[1]) { ret = AVERROR(ENOMEM); goto fail; }

1 0

avfilter/af_afir: fix overhead for small partitions
by Paul B Mahol 31 Dec '18

31 Dec '18

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Mon Dec 31 18:04:59 2018 +0100| [86555a2fbf3339ec7cd3487d7e21739c6730db2e] | committer: Paul B Mahol avfilter/af_afir: fix overhead for small partitions > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=86555a2fbf3339ec7… --- libavfilter/af_afir.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/libavfilter/af_afir.c b/libavfilter/af_afir.c index 73a613f153..c4baf63c02 100644 --- a/libavfilter/af_afir.c +++ b/libavfilter/af_afir.c @@ -56,12 +56,12 @@ static void fcmul_add_c(float *sum, const float *t, const float *c, ptrdiff_t le sum[2 * n] += t[2 * n] * c[2 * n]; } -static int fir_channel(AVFilterContext *ctx, void *arg, int ch) +static int fir_quantum(AVFilterContext *ctx, AVFrame *out, int ch, int offset) { AudioFIRContext *s = ctx->priv; - const float *in = (const float *)s->in[0]->extended_data[ch]; - AVFrame *out = arg; - float *block, *buf, *ptr = (float *)out->extended_data[ch]; + const float *in = (const float *)s->in[0]->extended_data[ch] + offset; + float *block, *buf, *ptr = (float *)out->extended_data[ch] + offset; + const int nb_samples = FFMIN(s->min_part_size, out->nb_samples - offset); int n, i, j; for (int segment = 0; segment < s->nb_segments; segment++) { @@ -70,7 +70,7 @@ static int fir_channel(AVFilterContext *ctx, void *arg, int ch) float *dst = (float *)seg->output->extended_data[ch]; float *sum = (float *)seg->sum->extended_data[ch]; - s->fdsp->vector_fmul_scalar(src + seg->input_offset, in, s->dry_gain, FFALIGN(out->nb_samples, 4)); + s->fdsp->vector_fmul_scalar(src + seg->input_offset, in, s->dry_gain, FFALIGN(nb_samples, 4)); emms_c(); seg->output_offset[ch] += s->min_part_size; @@ -80,7 +80,7 @@ static int fir_channel(AVFilterContext *ctx, void *arg, int ch) memmove(src, src + s->min_part_size, (seg->input_size - s->min_part_size) * sizeof(*src)); dst += seg->output_offset[ch]; - for (n = 0; n < out->nb_samples; n++) { + for (n = 0; n < nb_samples; n++) { ptr[n] += dst[n]; } continue; @@ -127,17 +127,28 @@ static int fir_channel(AVFilterContext *ctx, void *arg, int ch) memmove(src, src + s->min_part_size, (seg->input_size - s->min_part_size) * sizeof(*src)); - for (n = 0; n < out->nb_samples; n++) { + for (n = 0; n < nb_samples; n++) { ptr[n] += dst[n]; } } - s->fdsp->vector_fmul_scalar(ptr, ptr, s->wet_gain, FFALIGN(out->nb_samples, 4)); + s->fdsp->vector_fmul_scalar(ptr, ptr, s->wet_gain, FFALIGN(nb_samples, 4)); emms_c(); return 0; } +static int fir_channel(AVFilterContext *ctx, AVFrame *out, int ch) +{ + AudioFIRContext *s = ctx->priv; + + for (int offset = 0; offset < out->nb_samples; offset += s->min_part_size) { + fir_quantum(ctx, out, ch, offset); + } + + return 0; +} + static int fir_channels(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) { AVFrame *out = arg; @@ -525,8 +536,8 @@ static int activate(AVFilterContext *ctx) { AudioFIRContext *s = ctx->priv; AVFilterLink *outlink = ctx->outputs[0]; + int ret, status, available, wanted; AVFrame *in = NULL; - int ret, status; int64_t pts; FF_FILTER_FORWARD_STATUS_BACK_ALL(ctx->outputs[0], ctx); @@ -557,7 +568,9 @@ static int activate(AVFilterContext *ctx) return ret; } - ret = ff_inlink_consume_samples(ctx->inputs[0], s->min_part_size, s->min_part_size, &in); + available = ff_inlink_queued_samples(ctx->inputs[0]); + wanted = FFMAX(s->min_part_size, (available / s->min_part_size) * s->min_part_size); + ret = ff_inlink_consume_samples(ctx->inputs[0], wanted, wanted, &in); if (ret > 0) ret = fir_frame(s, in, outlink);

1 0

avcodec/scpr: Avoid per pixel y checks in decode_run_i
by Michael Niedermayer 31 Dec '18

31 Dec '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Thu Dec 27 10:36:38 2018 +0100| [c4276a7f30f0521d61644bfbe8869000f82488e9] | committer: Michael Niedermayer avcodec/scpr: Avoid per pixel y checks in decode_run_i about 1% faster Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c4276a7f30f0521d6… --- libavcodec/scpr.h | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/libavcodec/scpr.h b/libavcodec/scpr.h index e22188ab3a..15cb87c464 100644 --- a/libavcodec/scpr.h +++ b/libavcodec/scpr.h @@ -89,12 +89,12 @@ static int decode_run_i(AVCodecContext *avctx, uint32_t ptype, int run, uint32_t lx = *plx, ly = *ply; + if (y >= avctx->height) + return AVERROR_INVALIDDATA; + switch (ptype) { case 0: while (run-- > 0) { - if (y >= avctx->height) - return AVERROR_INVALIDDATA; - dst[y * linesize + x] = clr; lx = x; ly = y; @@ -102,14 +102,13 @@ static int decode_run_i(AVCodecContext *avctx, uint32_t ptype, int run, if (x >= avctx->width) { x = 0; (y)++; + if (y >= avctx->height && run) + return AVERROR_INVALIDDATA; } } break; case 1: while (run-- > 0) { - if (y >= avctx->height) - return AVERROR_INVALIDDATA; - dst[y * linesize + x] = dst[ly * linesize + lx]; lx = x; ly = y; @@ -117,15 +116,17 @@ static int decode_run_i(AVCodecContext *avctx, uint32_t ptype, int run, if (x >= avctx->width) { x = 0; (y)++; + if (y >= avctx->height && run) + return AVERROR_INVALIDDATA; } } clr = dst[ly * linesize + lx]; break; case 2: - while (run-- > 0) { - if (y < 1 || y >= avctx->height) - return AVERROR_INVALIDDATA; + if (y < 1) + return AVERROR_INVALIDDATA; + while (run-- > 0) { clr = dst[y * linesize + x + off + 1]; dst[y * linesize + x] = clr; lx = x; @@ -134,19 +135,20 @@ static int decode_run_i(AVCodecContext *avctx, uint32_t ptype, int run, if (x >= avctx->width) { x = 0; (y)++; + if (y >= avctx->height && run) + return AVERROR_INVALIDDATA; } } break; case 4: + if (y < 1 || (y == 1 && x == 0)) + return AVERROR_INVALIDDATA; + while (run-- > 0) { uint8_t *odst = (uint8_t *)dst; int off1 = (ly * linesize + lx) * 4; int off2 = ((y * linesize + x) + off) * 4; - if (y < 1 || y >= avctx->height || - (y == 1 && x == 0)) - return AVERROR_INVALIDDATA; - if (x == 0) { z = backstep * 4; } else { @@ -170,15 +172,16 @@ static int decode_run_i(AVCodecContext *avctx, uint32_t ptype, int run, if (x >= avctx->width) { x = 0; (y)++; + if (y >= avctx->height && run) + return AVERROR_INVALIDDATA; } } break; case 5: - while (run-- > 0) { - if (y < 1 || y >= avctx->height || - (y == 1 && x == 0)) - return AVERROR_INVALIDDATA; + if (y < 1 || (y == 1 && x == 0)) + return AVERROR_INVALIDDATA; + while (run-- > 0) { if (x == 0) { z = backstep; } else { @@ -193,6 +196,8 @@ static int decode_run_i(AVCodecContext *avctx, uint32_t ptype, int run, if (x >= avctx->width) { x = 0; (y)++; + if (y >= avctx->height && run) + return AVERROR_INVALIDDATA; } } break;

1 0

avcodec/scpr: Factor some indexes out in decode_run_i()
by Michael Niedermayer 31 Dec '18

31 Dec '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Thu Dec 27 02:21:00 2018 +0100| [20564d23fd931c7f7b55b878b5bcd60e24e0a739] | committer: Michael Niedermayer avcodec/scpr: Factor some indexes out in decode_run_i() This improves the speed of decode_run_i() After: clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SCPR_fuzzer-5656821117747200 in 13516 ms Before: clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SCPR_fuzzer-5656821117747200 in 14018 ms Improves: 11270/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SCPR_fuzzer-5656821117747200 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=20564d23fd931c7f7… --- libavcodec/scpr.h | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/libavcodec/scpr.h b/libavcodec/scpr.h index bb9b4d6a9b..e22188ab3a 100644 --- a/libavcodec/scpr.h +++ b/libavcodec/scpr.h @@ -140,26 +140,28 @@ static int decode_run_i(AVCodecContext *avctx, uint32_t ptype, int run, case 4: while (run-- > 0) { uint8_t *odst = (uint8_t *)dst; + int off1 = (ly * linesize + lx) * 4; + int off2 = ((y * linesize + x) + off) * 4; if (y < 1 || y >= avctx->height || (y == 1 && x == 0)) return AVERROR_INVALIDDATA; if (x == 0) { - z = backstep; + z = backstep * 4; } else { z = 0; } - r = odst[(ly * linesize + lx) * 4] + - odst[((y * linesize + x) + off) * 4 + 4] - - odst[((y * linesize + x) + off - z) * 4]; - g = odst[(ly * linesize + lx) * 4 + 1] + - odst[((y * linesize + x) + off) * 4 + 5] - - odst[((y * linesize + x) + off - z) * 4 + 1]; - b = odst[(ly * linesize + lx) * 4 + 2] + - odst[((y * linesize + x) + off) * 4 + 6] - - odst[((y * linesize + x) + off - z) * 4 + 2]; + r = odst[off1] + + odst[off2 + 4] - + odst[off2 - z ]; + g = odst[off1 + 1] + + odst[off2 + 5] - + odst[off2 - z + 1]; + b = odst[off1 + 2] + + odst[off2 + 6] - + odst[off2 - z + 2]; clr = ((b & 0xFF) << 16) + ((g & 0xFF) << 8) + (r & 0xFF); dst[y * linesize + x] = clr; lx = x;

1 0

avcodec/scpr: Use local variables in decode_run_i()
by Michael Niedermayer 31 Dec '18

31 Dec '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Thu Dec 27 02:21:00 2018 +0100| [609e2e64f6e0b348ce861ccd8d17c7a7651b9157] | committer: Michael Niedermayer avcodec/scpr: Use local variables in decode_run_i() This improves the speed of decode_run_i() Before: clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SCPR_fuzzer-5656821117747200 in 17420 ms After: clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SCPR_fuzzer-5656821117747200 in 14018 ms Improves: 11270/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SCPR_fuzzer-5656821117747200 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=609e2e64f6e0b348c… --- libavcodec/scpr.h | 125 +++++++++++++++++++++++++++++------------------------- 1 file changed, 67 insertions(+), 58 deletions(-) diff --git a/libavcodec/scpr.h b/libavcodec/scpr.h index a013d7e600..bb9b4d6a9b 100644 --- a/libavcodec/scpr.h +++ b/libavcodec/scpr.h @@ -78,58 +78,62 @@ typedef struct SCPRContext { } SCPRContext; static int decode_run_i(AVCodecContext *avctx, uint32_t ptype, int run, - int *x, int *y, uint32_t clr, uint32_t *dst, - int linesize, uint32_t *lx, uint32_t *ly, + int *px, int *py, uint32_t clr, uint32_t *dst, + int linesize, uint32_t *plx, uint32_t *ply, uint32_t backstep, int off, int *cx, int *cx1) { uint32_t r, g, b; int z; + int x = *px, + y = *py; + uint32_t lx = *plx, + ly = *ply; switch (ptype) { case 0: while (run-- > 0) { - if (*y >= avctx->height) + if (y >= avctx->height) return AVERROR_INVALIDDATA; - dst[*y * linesize + *x] = clr; - *lx = *x; - *ly = *y; - (*x)++; - if (*x >= avctx->width) { - *x = 0; - (*y)++; + dst[y * linesize + x] = clr; + lx = x; + ly = y; + (x)++; + if (x >= avctx->width) { + x = 0; + (y)++; } } break; case 1: while (run-- > 0) { - if (*y >= avctx->height) + if (y >= avctx->height) return AVERROR_INVALIDDATA; - dst[*y * linesize + *x] = dst[*ly * linesize + *lx]; - *lx = *x; - *ly = *y; - (*x)++; - if (*x >= avctx->width) { - *x = 0; - (*y)++; + dst[y * linesize + x] = dst[ly * linesize + lx]; + lx = x; + ly = y; + (x)++; + if (x >= avctx->width) { + x = 0; + (y)++; } } - clr = dst[*ly * linesize + *lx]; + clr = dst[ly * linesize + lx]; break; case 2: while (run-- > 0) { - if (*y < 1 || *y >= avctx->height) + if (y < 1 || y >= avctx->height) return AVERROR_INVALIDDATA; - clr = dst[*y * linesize + *x + off + 1]; - dst[*y * linesize + *x] = clr; - *lx = *x; - *ly = *y; - (*x)++; - if (*x >= avctx->width) { - *x = 0; - (*y)++; + clr = dst[y * linesize + x + off + 1]; + dst[y * linesize + x] = clr; + lx = x; + ly = y; + (x)++; + if (x >= avctx->width) { + x = 0; + (y)++; } } break; @@ -137,61 +141,66 @@ static int decode_run_i(AVCodecContext *avctx, uint32_t ptype, int run, while (run-- > 0) { uint8_t *odst = (uint8_t *)dst; - if (*y < 1 || *y >= avctx->height || - (*y == 1 && *x == 0)) + if (y < 1 || y >= avctx->height || + (y == 1 && x == 0)) return AVERROR_INVALIDDATA; - if (*x == 0) { + if (x == 0) { z = backstep; } else { z = 0; } - r = odst[(*ly * linesize + *lx) * 4] + - odst[((*y * linesize + *x) + off) * 4 + 4] - - odst[((*y * linesize + *x) + off - z) * 4]; - g = odst[(*ly * linesize + *lx) * 4 + 1] + - odst[((*y * linesize + *x) + off) * 4 + 5] - - odst[((*y * linesize + *x) + off - z) * 4 + 1]; - b = odst[(*ly * linesize + *lx) * 4 + 2] + - odst[((*y * linesize + *x) + off) * 4 + 6] - - odst[((*y * linesize + *x) + off - z) * 4 + 2]; + r = odst[(ly * linesize + lx) * 4] + + odst[((y * linesize + x) + off) * 4 + 4] - + odst[((y * linesize + x) + off - z) * 4]; + g = odst[(ly * linesize + lx) * 4 + 1] + + odst[((y * linesize + x) + off) * 4 + 5] - + odst[((y * linesize + x) + off - z) * 4 + 1]; + b = odst[(ly * linesize + lx) * 4 + 2] + + odst[((y * linesize + x) + off) * 4 + 6] - + odst[((y * linesize + x) + off - z) * 4 + 2]; clr = ((b & 0xFF) << 16) + ((g & 0xFF) << 8) + (r & 0xFF); - dst[*y * linesize + *x] = clr; - *lx = *x; - *ly = *y; - (*x)++; - if (*x >= avctx->width) { - *x = 0; - (*y)++; + dst[y * linesize + x] = clr; + lx = x; + ly = y; + (x)++; + if (x >= avctx->width) { + x = 0; + (y)++; } } break; case 5: while (run-- > 0) { - if (*y < 1 || *y >= avctx->height || - (*y == 1 && *x == 0)) + if (y < 1 || y >= avctx->height || + (y == 1 && x == 0)) return AVERROR_INVALIDDATA; - if (*x == 0) { + if (x == 0) { z = backstep; } else { z = 0; } - clr = dst[*y * linesize + *x + off - z]; - dst[*y * linesize + *x] = clr; - *lx = *x; - *ly = *y; - (*x)++; - if (*x >= avctx->width) { - *x = 0; - (*y)++; + clr = dst[y * linesize + x + off - z]; + dst[y * linesize + x] = clr; + lx = x; + ly = y; + (x)++; + if (x >= avctx->width) { + x = 0; + (y)++; } } break; } + *px = x; + *py = y; + *plx= lx; + *ply= ly; + if (avctx->bits_per_coded_sample == 16) { *cx1 = (clr & 0x3F00) >> 2; *cx = (clr & 0x3FFFFF) >> 16;

1 0

avcodec/rangecoder: Add and test ff_rac_check_termination()
by Michael Niedermayer 31 Dec '18

31 Dec '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sun Dec 23 14:17:11 2018 +0100| [b6c2c589041cd99c5bf4117d13708ab010f97bd1] | committer: Michael Niedermayer avcodec/rangecoder: Add and test ff_rac_check_termination() Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b6c2c589041cd99c5… --- libavcodec/rangecoder.c | 19 +++++++++++++++++++ libavcodec/rangecoder.h | 9 +++++++++ libavcodec/tests/rangecoder.c | 7 +++++-- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/libavcodec/rangecoder.c b/libavcodec/rangecoder.c index fa7d5526d1..a6a3f082ef 100644 --- a/libavcodec/rangecoder.c +++ b/libavcodec/rangecoder.c @@ -121,3 +121,22 @@ int ff_rac_terminate(RangeCoder *c, int version) return c->bytestream - c->bytestream_start; } + +int ff_rac_check_termination(RangeCoder *c, int version) +{ + if (version == 1) { + RangeCoder tmp = *c; + get_rac(c, (uint8_t[]) { 129 }); + + if (c->bytestream == tmp.bytestream && c->bytestream > c->bytestream_start) + tmp.low -= *--tmp.bytestream; + tmp.bytestream_end = tmp.bytestream; + + if (get_rac(&tmp, (uint8_t[]) { 129 })) + return AVERROR_INVALIDDATA; + } else { + if (c->bytestream_end != c->bytestream) + return AVERROR_INVALIDDATA; + } + return 0; +} diff --git a/libavcodec/rangecoder.h b/libavcodec/rangecoder.h index 4495f6df1a..4d4ca4d526 100644 --- a/libavcodec/rangecoder.h +++ b/libavcodec/rangecoder.h @@ -57,6 +57,15 @@ void ff_init_range_decoder(RangeCoder *c, const uint8_t *buf, int buf_size); */ int ff_rac_terminate(RangeCoder *c, int version); +/** + * Check if at the current position there is a valid looking termination + * @param version version 0 requires the decoder to know the data size in bytes + * version 1 needs about 1 bit more space but does not need to + * carry the size from encoder to decoder + * @returns negative AVERROR code on error or non negative. + */ +int ff_rac_check_termination(RangeCoder *c, int version); + void ff_build_rac_states(RangeCoder *c, int factor, int max_p); static inline void renorm_encoder(RangeCoder *c) diff --git a/libavcodec/tests/rangecoder.c b/libavcodec/tests/rangecoder.c index 3fd07ed9a9..b6edc1493f 100644 --- a/libavcodec/tests/rangecoder.c +++ b/libavcodec/tests/rangecoder.c @@ -60,8 +60,11 @@ int main(void) av_log(NULL, AV_LOG_ERROR, "rac failure at %d pass %d version %d\n", i, p, version); return 1; } - if(version) - get_rac(&c, (uint8_t[]) { 129 }); + + if (ff_rac_check_termination(&c, version) < 0) { + av_log(NULL, AV_LOG_ERROR, "rac failure at termination pass %d version %d\n", p, version); + return 1; + } if (c.bytestream - c.bytestream_start - actual_length != version) { av_log(NULL, AV_LOG_ERROR, "rac failure at pass %d version %d\n", p, version); return 1;

1 0

avcodec/rangecoder: Document ff_rac_terminate()
by Michael Niedermayer 31 Dec '18

31 Dec '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Dec 19 02:40:20 2018 +0100| [20b10ba83c46d1f2b381b0b3e70ce44195473815] | committer: Michael Niedermayer avcodec/rangecoder: Document ff_rac_terminate() Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=20b10ba83c46d1f2b… --- libavcodec/rangecoder.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/rangecoder.h b/libavcodec/rangecoder.h index e5c7a3cc71..4495f6df1a 100644 --- a/libavcodec/rangecoder.h +++ b/libavcodec/rangecoder.h @@ -48,7 +48,15 @@ typedef struct RangeCoder { void ff_init_range_encoder(RangeCoder *c, uint8_t *buf, int buf_size); void ff_init_range_decoder(RangeCoder *c, const uint8_t *buf, int buf_size); + +/** + * Terminates the range coder + * @param version version 0 requires the decoder to know the data size in bytes + * version 1 needs about 1 bit more space but does not need to + * carry the size from encoder to decoder + */ int ff_rac_terminate(RangeCoder *c, int version); + void ff_build_rac_states(RangeCoder *c, int factor, int max_p); static inline void renorm_encoder(RangeCoder *c)

1 0

avcodec/tests/rangecoder: Test coder more completely
by Michael Niedermayer 31 Dec '18

31 Dec '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Dec 19 02:40:19 2018 +0100| [0c4af1390f12a391c483086758bcdfd17f3edc63] | committer: Michael Niedermayer avcodec/tests/rangecoder: Test coder more completely Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0c4af1390f12a391c… --- libavcodec/tests/rangecoder.c | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/libavcodec/tests/rangecoder.c b/libavcodec/tests/rangecoder.c index 76a13e7091..3fd07ed9a9 100644 --- a/libavcodec/tests/rangecoder.c +++ b/libavcodec/tests/rangecoder.c @@ -24,41 +24,50 @@ #include "libavcodec/rangecoder.h" -#define SIZE 10240 +#define SIZE 1240 int main(void) { RangeCoder c; uint8_t b[9 * SIZE]; uint8_t r[9 * SIZE]; - int i; + int i, p, actual_length, version; uint8_t state[10]; AVLFG prng; av_lfg_init(&prng, 1); + for (version = 0; version < 2; version++) { + for (p = 0; p< 1024; p++) { + ff_init_range_encoder(&c, b, SIZE); + ff_build_rac_states(&c, (1LL << 32) / 20, 128 + 64 + 32 + 16); - ff_init_range_encoder(&c, b, SIZE); - ff_build_rac_states(&c, (1LL << 32) / 20, 128 + 64 + 32 + 16); + memset(state, 128, sizeof(state)); - memset(state, 128, sizeof(state)); + for (i = 0; i < SIZE; i++) + r[i] = av_lfg_get(&prng) % 7; - for (i = 0; i < SIZE; i++) - r[i] = av_lfg_get(&prng) % 7; + for (i = 0; i < SIZE; i++) + put_rac(&c, state, r[i] & 1); - for (i = 0; i < SIZE; i++) - put_rac(&c, state, r[i] & 1); + actual_length = ff_rac_terminate(&c, version); - ff_rac_terminate(&c, 0); + ff_init_range_decoder(&c, b, version ? SIZE : actual_length); - ff_init_range_decoder(&c, b, SIZE); + memset(state, 128, sizeof(state)); - memset(state, 128, sizeof(state)); - - for (i = 0; i < SIZE; i++) - if ((r[i] & 1) != get_rac(&c, state)) { - av_log(NULL, AV_LOG_ERROR, "rac failure at %d\n", i); - return 1; + for (i = 0; i < SIZE; i++) + if ((r[i] & 1) != get_rac(&c, state)) { + av_log(NULL, AV_LOG_ERROR, "rac failure at %d pass %d version %d\n", i, p, version); + return 1; + } + if(version) + get_rac(&c, (uint8_t[]) { 129 }); + if (c.bytestream - c.bytestream_start - actual_length != version) { + av_log(NULL, AV_LOG_ERROR, "rac failure at pass %d version %d\n", p, version); + return 1; + } } + } return 0; }

1 0

avcodec/rangecoder: factorize termination version code
by Michael Niedermayer 31 Dec '18

31 Dec '18

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Dec 19 02:40:18 2018 +0100| [1be9a28f8e8cd2553f978670901174a8808b9a1a] | committer: Michael Niedermayer avcodec/rangecoder: factorize termination version code Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1be9a28f8e8cd2553… --- libavcodec/ffv1enc.c | 10 +++------- libavcodec/rangecoder.c | 4 +++- libavcodec/rangecoder.h | 2 +- libavcodec/snowenc.c | 2 +- libavcodec/sonic.c | 2 +- libavcodec/tests/rangecoder.c | 2 +- 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index f5eb0feb4e..796d81f7c6 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -449,7 +449,7 @@ static int write_extradata(FFV1Context *f) put_symbol(c, state, f->intra = (f->avctx->gop_size < 2), 0); } - f->avctx->extradata_size = ff_rac_terminate(c); + f->avctx->extradata_size = ff_rac_terminate(c, 0); v = av_crc(av_crc_get_table(AV_CRC_32_IEEE), 0, f->avctx->extradata, f->avctx->extradata_size); AV_WL32(f->avctx->extradata + f->avctx->extradata_size, v); f->avctx->extradata_size += 4; @@ -1065,9 +1065,7 @@ retry: encode_slice_header(f, fs); } if (fs->ac == AC_GOLOMB_RICE) { - if (f->version > 2) - put_rac(&fs->c, (uint8_t[]) { 129 }, 0); - fs->ac_byte_count = f->version > 2 || (!x && !y) ? ff_rac_terminate(&fs->c) : 0; + fs->ac_byte_count = f->version > 2 || (!x && !y) ? ff_rac_terminate(&fs->c, f->version > 2) : 0; init_put_bits(&fs->pb, fs->c.bytestream_start + fs->ac_byte_count, fs->c.bytestream_end - fs->c.bytestream_start - fs->ac_byte_count); @@ -1232,9 +1230,7 @@ FF_ENABLE_DEPRECATION_WARNINGS int bytes; if (fs->ac != AC_GOLOMB_RICE) { - uint8_t state = 129; - put_rac(&fs->c, &state, 0); - bytes = ff_rac_terminate(&fs->c); + bytes = ff_rac_terminate(&fs->c, 1); } else { flush_put_bits(&fs->pb); // FIXME: nicer padding bytes = fs->ac_byte_count + (put_bits_count(&fs->pb) + 7) / 8; diff --git a/libavcodec/rangecoder.c b/libavcodec/rangecoder.c index 0d53bef076..fa7d5526d1 100644 --- a/libavcodec/rangecoder.c +++ b/libavcodec/rangecoder.c @@ -106,8 +106,10 @@ void ff_build_rac_states(RangeCoder *c, int factor, int max_p) } /* Return the number of bytes written. */ -int ff_rac_terminate(RangeCoder *c) +int ff_rac_terminate(RangeCoder *c, int version) { + if (version == 1) + put_rac(c, (uint8_t[]) { 129 }, 0); c->range = 0xFF; c->low += 0xFF; renorm_encoder(c); diff --git a/libavcodec/rangecoder.h b/libavcodec/rangecoder.h index 44af88b8f5..e5c7a3cc71 100644 --- a/libavcodec/rangecoder.h +++ b/libavcodec/rangecoder.h @@ -48,7 +48,7 @@ typedef struct RangeCoder { void ff_init_range_encoder(RangeCoder *c, uint8_t *buf, int buf_size); void ff_init_range_decoder(RangeCoder *c, const uint8_t *buf, int buf_size); -int ff_rac_terminate(RangeCoder *c); +int ff_rac_terminate(RangeCoder *c, int version); void ff_build_rac_states(RangeCoder *c, int factor, int max_p); static inline void renorm_encoder(RangeCoder *c) diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 61a658fa44..df1729a083 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -1899,7 +1899,7 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif - pkt->size = ff_rac_terminate(c); + pkt->size = ff_rac_terminate(c, 0); if (s->current_picture->key_frame) pkt->flags |= AV_PKT_FLAG_KEY; *got_packet = 1; diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c index 2e3ca79fdd..34d2952e69 100644 --- a/libavcodec/sonic.c +++ b/libavcodec/sonic.c @@ -842,7 +842,7 @@ static int sonic_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, // av_log(avctx, AV_LOG_DEBUG, "used bytes: %d\n", (put_bits_count(&pb)+7)/8); - avpkt->size = ff_rac_terminate(&c); + avpkt->size = ff_rac_terminate(&c, 0); *got_packet_ptr = 1; return 0; diff --git a/libavcodec/tests/rangecoder.c b/libavcodec/tests/rangecoder.c index 2da5c0ce33..76a13e7091 100644 --- a/libavcodec/tests/rangecoder.c +++ b/libavcodec/tests/rangecoder.c @@ -48,7 +48,7 @@ int main(void) for (i = 0; i < SIZE; i++) put_rac(&c, state, r[i] & 1); - ff_rac_terminate(&c); + ff_rac_terminate(&c, 0); ff_init_range_decoder(&c, b, SIZE);

1 0

avcodec: add HYMT decoder
by Paul B Mahol 31 Dec '18

31 Dec '18

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Aug 22 22:11:42 2018 +0200| [41c1643d75860208d6debb8cb85d3edbd9457bd3] | committer: Paul B Mahol avcodec: add HYMT decoder > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=41c1643d75860208d… --- Changelog | 1 + libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/avcodec.h | 1 + libavcodec/codec_desc.c | 7 ++ libavcodec/huffyuvdec.c | 174 ++++++++++++++++++++++++++++++++---------------- libavcodec/version.h | 4 +- libavformat/riff.c | 1 + 8 files changed, 131 insertions(+), 59 deletions(-) diff --git a/Changelog b/Changelog index 4945efbba0..f135fa56b6 100644 --- a/Changelog +++ b/Changelog @@ -12,6 +12,7 @@ version <next>: - PCM-DVD encoder - GIF parser - vividas demuxer +- hymt decoder version 4.1: diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 08f89ae0b2..99799ceed2 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -383,6 +383,7 @@ OBJS-$(CONFIG_HQ_HQA_DECODER) += hq_hqa.o hq_hqadata.o hq_hqadsp.o \ OBJS-$(CONFIG_HQX_DECODER) += hqx.o hqxvlc.o hqxdsp.o canopus.o OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o huffyuvdec.o OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o huffyuvenc.o +OBJS-$(CONFIG_HYMT_DECODER) += huffyuv.o huffyuvdec.o OBJS-$(CONFIG_IDCIN_DECODER) += idcinvideo.o OBJS-$(CONFIG_IDF_DECODER) += bintext.o cga_data.o OBJS-$(CONFIG_IFF_ILBM_DECODER) += iff.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index d70646e91a..4755af71b2 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -152,6 +152,7 @@ extern AVCodec ff_hq_hqa_decoder; extern AVCodec ff_hqx_decoder; extern AVCodec ff_huffyuv_encoder; extern AVCodec ff_huffyuv_decoder; +extern AVCodec ff_hymt_decoder; extern AVCodec ff_idcin_decoder; extern AVCodec ff_iff_ilbm_decoder; extern AVCodec ff_imm4_decoder; diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index fd7f60bf4a..92567ec6d0 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -452,6 +452,7 @@ enum AVCodecID { AV_CODEC_ID_MWSC, AV_CODEC_ID_WCMV, AV_CODEC_ID_RASC, + AV_CODEC_ID_HYMT, /* various PCM "codecs" */ AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 73f343ce24..2363a53283 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1691,6 +1691,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("RemotelyAnywhere Screen Capture"), .props = AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_HYMT, + .type = AVMEDIA_TYPE_VIDEO, + .name = "hymt", + .long_name = NULL_IF_CONFIG_SMALL("HuffYUV MT"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, /* various PCM "codecs" */ { diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c index 66357bfb40..4e00692631 100644 --- a/libavcodec/huffyuvdec.c +++ b/libavcodec/huffyuvdec.c @@ -905,54 +905,23 @@ static void add_median_prediction(HYuvContext *s, uint8_t *dst, const uint8_t *s s->hdsp.add_hfyu_median_pred_int16((uint16_t *)dst, (const uint16_t *)src, (const uint16_t *)diff, s->n-1, w, left, left_top); } } -static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, - AVPacket *avpkt) + +static int decode_slice(AVCodecContext *avctx, AVFrame *p, int height, + int buf_size, int y_offset, int table_size) { - const uint8_t *buf = avpkt->data; - int buf_size = avpkt->size; HYuvContext *s = avctx->priv_data; + int fake_ystride, fake_ustride, fake_vstride; const int width = s->width; const int width2 = s->width >> 1; - const int height = s->height; - int fake_ystride, fake_ustride, fake_vstride; - ThreadFrame frame = { .f = data }; - AVFrame *const p = data; - int table_size = 0, ret; - - if (buf_size < (width * height + 7)/8) - return AVERROR_INVALIDDATA; - - av_fast_padded_malloc(&s->bitstream_buffer, - &s->bitstream_buffer_size, - buf_size); - if (!s->bitstream_buffer) - return AVERROR(ENOMEM); - - s->bdsp.bswap_buf((uint32_t *) s->bitstream_buffer, - (const uint32_t *) buf, buf_size / 4); - - if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) - return ret; - - if (s->context) { - table_size = read_huffman_tables(s, s->bitstream_buffer, buf_size); - if (table_size < 0) - return table_size; - } - - if ((unsigned) (buf_size - table_size) >= INT_MAX / 8) - return AVERROR_INVALIDDATA; + int ret; - if ((ret = init_get_bits(&s->gb, s->bitstream_buffer + table_size, - (buf_size - table_size) * 8)) < 0) + if ((ret = init_get_bits8(&s->gb, s->bitstream_buffer + table_size, buf_size - table_size)) < 0) return ret; fake_ystride = s->interlaced ? p->linesize[0] * 2 : p->linesize[0]; fake_ustride = s->interlaced ? p->linesize[1] * 2 : p->linesize[1]; fake_vstride = s->interlaced ? p->linesize[2] * 2 : p->linesize[2]; - s->last_slice_end = 0; - if (s->version > 2) { int plane; for(plane = 0; plane < 1 + 2*s->chroma + s->alpha; plane++) { @@ -1034,31 +1003,31 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, return AVERROR_PATCHWELCOME; } else { leftv = - p->data[2][0] = get_bits(&s->gb, 8); + p->data[2][0 + y_offset * p->linesize[2]] = get_bits(&s->gb, 8); lefty = - p->data[0][1] = get_bits(&s->gb, 8); + p->data[0][1 + y_offset * p->linesize[0]] = get_bits(&s->gb, 8); leftu = - p->data[1][0] = get_bits(&s->gb, 8); - p->data[0][0] = get_bits(&s->gb, 8); + p->data[1][0 + y_offset * p->linesize[1]] = get_bits(&s->gb, 8); + p->data[0][0 + y_offset * p->linesize[0]] = get_bits(&s->gb, 8); switch (s->predictor) { case LEFT: case PLANE: decode_422_bitstream(s, width - 2); - lefty = s->llviddsp.add_left_pred(p->data[0] + 2, s->temp[0], + lefty = s->llviddsp.add_left_pred(p->data[0] + p->linesize[0] * y_offset + 2, s->temp[0], width - 2, lefty); if (!(s->flags & AV_CODEC_FLAG_GRAY)) { - leftu = s->llviddsp.add_left_pred(p->data[1] + 1, s->temp[1], width2 - 1, leftu); - leftv = s->llviddsp.add_left_pred(p->data[2] + 1, s->temp[2], width2 - 1, leftv); + leftu = s->llviddsp.add_left_pred(p->data[1] + p->linesize[1] * y_offset + 1, s->temp[1], width2 - 1, leftu); + leftv = s->llviddsp.add_left_pred(p->data[2] + p->linesize[2] * y_offset + 1, s->temp[2], width2 - 1, leftv); } - for (cy = y = 1; y < s->height; y++, cy++) { + for (cy = y = 1; y < height; y++, cy++) { uint8_t *ydst, *udst, *vdst; if (s->bitstream_bpp == 12) { decode_gray_bitstream(s, width); - ydst = p->data[0] + p->linesize[0] * y; + ydst = p->data[0] + p->linesize[0] * (y + y_offset); lefty = s->llviddsp.add_left_pred(ydst, s->temp[0], width, lefty); @@ -1067,15 +1036,15 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, s->llviddsp.add_bytes(ydst, ydst - fake_ystride, width); } y++; - if (y >= s->height) + if (y >= height) break; } draw_slice(s, p, y); - ydst = p->data[0] + p->linesize[0] * y; - udst = p->data[1] + p->linesize[1] * cy; - vdst = p->data[2] + p->linesize[2] * cy; + ydst = p->data[0] + p->linesize[0] * (y + y_offset); + udst = p->data[1] + p->linesize[1] * (cy + y_offset); + vdst = p->data[2] + p->linesize[2] * (cy + y_offset); decode_422_bitstream(s, width); lefty = s->llviddsp.add_left_pred(ydst, s->temp[0], @@ -1185,7 +1154,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, } else { int y; uint8_t left[4]; - const int last_line = (height - 1) * p->linesize[0]; + const int last_line = (y_offset + height - 1) * p->linesize[0]; if (s->bitstream_bpp == 32) { left[A] = p->data[0][last_line + A] = get_bits(&s->gb, 8); @@ -1208,17 +1177,17 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, s->hdsp.add_hfyu_left_pred_bgr32(p->data[0] + last_line + 4, s->temp[0], width - 1, left); - for (y = s->height - 2; y >= 0; y--) { // Yes it is stored upside down. + for (y = height - 2; y >= 0; y--) { // Yes it is stored upside down. decode_bgr_bitstream(s, width); - s->hdsp.add_hfyu_left_pred_bgr32(p->data[0] + p->linesize[0] * y, + s->hdsp.add_hfyu_left_pred_bgr32(p->data[0] + p->linesize[0] * (y + y_offset), s->temp[0], width, left); if (s->predictor == PLANE) { if (s->bitstream_bpp != 32) left[A] = 0; - if (y < s->height - 1 - s->interlaced) { - s->llviddsp.add_bytes(p->data[0] + p->linesize[0] * y, - p->data[0] + p->linesize[0] * y + + if (y < height - 1 - s->interlaced) { + s->llviddsp.add_bytes(p->data[0] + p->linesize[0] * (y + y_offset), + p->data[0] + p->linesize[0] * (y + y_offset) + fake_ystride, 4 * width); } } @@ -1236,7 +1205,82 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, return AVERROR_PATCHWELCOME; } } - emms_c(); + + return 0; +} + +static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, + AVPacket *avpkt) +{ + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; + HYuvContext *s = avctx->priv_data; + const int width = s->width; + const int height = s->height; + ThreadFrame frame = { .f = data }; + AVFrame *const p = data; + int slice, table_size = 0, ret, nb_slices; + unsigned slices_info_offset; + int slice_height; + + if (buf_size < (width * height + 7)/8) + return AVERROR_INVALIDDATA; + + av_fast_padded_malloc(&s->bitstream_buffer, + &s->bitstream_buffer_size, + buf_size); + if (!s->bitstream_buffer) + return AVERROR(ENOMEM); + + s->bdsp.bswap_buf((uint32_t *) s->bitstream_buffer, + (const uint32_t *) buf, buf_size / 4); + + if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) + return ret; + + if (s->context) { + table_size = read_huffman_tables(s, s->bitstream_buffer, buf_size); + if (table_size < 0) + return table_size; + } + + if ((unsigned) (buf_size - table_size) >= INT_MAX / 8) + return AVERROR_INVALIDDATA; + + s->last_slice_end = 0; + + if (avctx->codec_id == AV_CODEC_ID_HYMT && + (buf_size > 32 && AV_RL32(avpkt->data + buf_size - 16) == 0)) { + slices_info_offset = AV_RL32(avpkt->data + buf_size - 4); + slice_height = AV_RL32(avpkt->data + buf_size - 8); + nb_slices = AV_RL32(avpkt->data + buf_size - 12); + if (nb_slices * 8LL + slices_info_offset > buf_size - 16) + return AVERROR_INVALIDDATA; + } else { + slice_height = height; + nb_slices = 1; + } + + for (slice = 0; slice < nb_slices; slice++) { + int y_offset, slice_offset, slice_size; + + if (nb_slices > 1) { + slice_offset = AV_RL32(avpkt->data + slices_info_offset + slice * 8); + slice_size = AV_RL32(avpkt->data + slices_info_offset + slice * 8 + 4); + y_offset = height - (slice + 1) * slice_height; + s->bdsp.bswap_buf((uint32_t *)s->bitstream_buffer, + (const uint32_t *)(buf + slice_offset), slice_size / 4); + } else { + y_offset = 0; + slice_offset = 0; + slice_size = buf_size; + } + + ret = decode_slice(avctx, p, slice_height, slice_size, y_offset, table_size); + emms_c(); + if (ret < 0) + return ret; + } *got_frame = 1; @@ -1272,3 +1316,19 @@ AVCodec ff_ffvhuff_decoder = { .init_thread_copy = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy), }; #endif /* CONFIG_FFVHUFF_DECODER */ + +#if CONFIG_HYMT_DECODER +AVCodec ff_hymt_decoder = { + .name = "hymt", + .long_name = NULL_IF_CONFIG_SMALL("HuffYUV MT"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_HYMT, + .priv_data_size = sizeof(HYuvContext), + .init = decode_init, + .close = decode_end, + .decode = decode_frame, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DRAW_HORIZ_BAND | + AV_CODEC_CAP_FRAME_THREADS, + .init_thread_copy = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy), +}; +#endif /* CONFIG_HYMT_DECODER */ diff --git a/libavcodec/version.h b/libavcodec/version.h index 3c61e0c4ca..ed56a1ece5 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,8 +28,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 58 -#define LIBAVCODEC_VERSION_MINOR 42 -#define LIBAVCODEC_VERSION_MICRO 104 +#define LIBAVCODEC_VERSION_MINOR 43 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ diff --git a/libavformat/riff.c b/libavformat/riff.c index 3907e1a9f3..d5a509c8b9 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -475,6 +475,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_MWSC, MKTAG('M', 'W', 'S', 'C') }, { AV_CODEC_ID_WCMV, MKTAG('W', 'C', 'M', 'V') }, { AV_CODEC_ID_RASC, MKTAG('R', 'A', 'S', 'C') }, + { AV_CODEC_ID_HYMT, MKTAG('H', 'Y', 'M', 'T') }, { AV_CODEC_ID_NONE, 0 } };

1 0