April 2019 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/scpr: avoid using uninitialized value
by Paul B Mahol 28 Apr '19

28 Apr '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Apr 28 11:06:36 2019 +0200| [ea80af659c609dca45eae7ec0fb1b4bfbbc620af] | committer: Paul B Mahol avcodec/scpr: avoid using uninitialized value Fixes #7872. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ea80af659c609dca4… --- libavcodec/scpr.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/scpr.c b/libavcodec/scpr.c index e5d7d13cf0..ce614ffacf 100644 --- a/libavcodec/scpr.c +++ b/libavcodec/scpr.c @@ -382,8 +382,11 @@ static int decompress_p(AVCodecContext *avctx, ret = decode_value(s, s->range_model, 256, 1, &min); ret |= decode_value(s, s->range_model, 256, 1, &temp); + if (ret < 0) + return ret; + min += temp << 8; - ret |= decode_value(s, s->range_model, 256, 1, &max); + ret = decode_value(s, s->range_model, 256, 1, &max); ret |= decode_value(s, s->range_model, 256, 1, &temp); if (ret < 0) return ret;

1 0

avfilter/vf_lut3d: increase MAX_LEVEL
by Paul B Mahol 28 Apr '19

28 Apr '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Apr 28 10:52:21 2019 +0200| [5840a7f8a6d76d0f755dccfe544b58af1ba8b028] | committer: Paul B Mahol avfilter/vf_lut3d: increase MAX_LEVEL > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5840a7f8a6d76d0f7… --- 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 bdb0d89be2..a525039baa 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 64 +#define MAX_LEVEL 128 typedef struct LUT3DContext { const AVClass *class;

1 0

avfilter/vf_lut3d: fix range domain processing for .cube format
by Paul B Mahol 28 Apr '19

28 Apr '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Apr 25 14:53:53 2019 +0200| [d5b2458f469506576fdcab10e3dbd718757cb853] | committer: Paul B Mahol avfilter/vf_lut3d: fix range domain processing for .cube format The ranges are for input, not for output. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d5b2458f469506576… --- libavfilter/vf_lut3d.c | 73 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 51 insertions(+), 22 deletions(-) diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index 50ea5a8545..bdb0d89be2 100644 --- a/libavfilter/vf_lut3d.c +++ b/libavfilter/vf_lut3d.c @@ -64,6 +64,7 @@ typedef struct LUT3DContext { uint8_t rgba_map[4]; int step; avfilter_action_func *interp; + struct rgbvec scale; struct rgbvec lut[MAX_LEVEL][MAX_LEVEL][MAX_LEVEL]; int lutsize; #if CONFIG_HALDCLUT_FILTER @@ -219,7 +220,9 @@ static int interp_##nbits##_##name##_p##depth(AVFilterContext *ctx, void *arg, i const uint8_t *srcbrow = in->data[1] + slice_start * in->linesize[1]; \ const uint8_t *srcrrow = in->data[2] + slice_start * in->linesize[2]; \ const uint8_t *srcarow = in->data[3] + slice_start * in->linesize[3]; \ - const float scale = (1. / ((1<<depth) - 1)) * (lut3d->lutsize - 1); \ + const float scale_r = (lut3d->scale.r / ((1<<depth) - 1)) * (lut3d->lutsize - 1); \ + const float scale_g = (lut3d->scale.g / ((1<<depth) - 1)) * (lut3d->lutsize - 1); \ + const float scale_b = (lut3d->scale.b / ((1<<depth) - 1)) * (lut3d->lutsize - 1); \ \ for (y = slice_start; y < slice_end; y++) { \ uint##nbits##_t *dstg = (uint##nbits##_t *)grow; \ @@ -231,9 +234,9 @@ static int interp_##nbits##_##name##_p##depth(AVFilterContext *ctx, void *arg, i const uint##nbits##_t *srcr = (const uint##nbits##_t *)srcrrow; \ const uint##nbits##_t *srca = (const uint##nbits##_t *)srcarow; \ for (x = 0; x < in->width; x++) { \ - const struct rgbvec scaled_rgb = {srcr[x] * scale, \ - srcg[x] * scale, \ - srcb[x] * scale}; \ + const struct rgbvec scaled_rgb = {srcr[x] * scale_r, \ + srcg[x] * scale_g, \ + srcb[x] * scale_b}; \ struct rgbvec vec = interp_##name(lut3d, &scaled_rgb); \ dstr[x] = av_clip_uintp2(vec.r * (float)((1<<depth) - 1), depth); \ dstg[x] = av_clip_uintp2(vec.g * (float)((1<<depth) - 1), depth); \ @@ -295,15 +298,17 @@ static int interp_##nbits##_##name(AVFilterContext *ctx, void *arg, int jobnr, i const int slice_end = (in->height * (jobnr+1)) / nb_jobs; \ uint8_t *dstrow = out->data[0] + slice_start * out->linesize[0]; \ const uint8_t *srcrow = in ->data[0] + slice_start * in ->linesize[0]; \ - const float scale = (1. / ((1<<nbits) - 1)) * (lut3d->lutsize - 1); \ + const float scale_r = (lut3d->scale.r / ((1<<nbits) - 1)) * (lut3d->lutsize - 1); \ + const float scale_g = (lut3d->scale.g / ((1<<nbits) - 1)) * (lut3d->lutsize - 1); \ + const float scale_b = (lut3d->scale.b / ((1<<nbits) - 1)) * (lut3d->lutsize - 1); \ \ for (y = slice_start; y < slice_end; y++) { \ uint##nbits##_t *dst = (uint##nbits##_t *)dstrow; \ const uint##nbits##_t *src = (const uint##nbits##_t *)srcrow; \ for (x = 0; x < in->width * step; x += step) { \ - const struct rgbvec scaled_rgb = {src[x + r] * scale, \ - src[x + g] * scale, \ - src[x + b] * scale}; \ + const struct rgbvec scaled_rgb = {src[x + r] * scale_r, \ + src[x + g] * scale_g, \ + src[x + b] * scale_b}; \ struct rgbvec vec = interp_##name(lut3d, &scaled_rgb); \ dst[x + r] = av_clip_uint##nbits(vec.r * (float)((1<<nbits) - 1)); \ dst[x + g] = av_clip_uint##nbits(vec.g * (float)((1<<nbits) - 1)); \ @@ -417,15 +422,17 @@ try_again: } while (skip_line(line)); if (av_sscanf(line, "%f %f %f", &vec->r, &vec->g, &vec->b) != 3) return AVERROR_INVALIDDATA; - vec->r *= max[0] - min[0]; - vec->g *= max[1] - min[1]; - vec->b *= max[2] - min[2]; } } } break; } } + + lut3d->scale.r = av_clipf(1. / (max[0] - min[0]), 0.f, 1.f); + lut3d->scale.g = av_clipf(1. / (max[1] - min[1]), 0.f, 1.f); + lut3d->scale.b = av_clipf(1. / (max[2] - min[2]), 0.f, 1.f); + return 0; } @@ -609,6 +616,11 @@ static int parse_cinespace(AVFilterContext *ctx, FILE *f) break; } } + + lut3d->scale.r = av_clipf(1. / (in_max[0] - in_min[0]), 0.f, 1.f); + lut3d->scale.g = av_clipf(1. / (in_max[1] - in_min[1]), 0.f, 1.f); + lut3d->scale.b = av_clipf(1. / (in_max[2] - in_min[2]), 0.f, 1.f); + return 0; } @@ -765,6 +777,8 @@ static av_cold int lut3d_init(AVFilterContext *ctx) const char *ext; LUT3DContext *lut3d = ctx->priv; + lut3d->scale.r = lut3d->scale.g = lut3d->scale.b = 1.f; + if (!lut3d->file) { set_identity_matrix(lut3d, 32); return 0; @@ -1016,6 +1030,7 @@ static int update_apply_clut(FFFrameSync *fs) static av_cold int haldclut_init(AVFilterContext *ctx) { LUT3DContext *lut3d = ctx->priv; + lut3d->scale.r = lut3d->scale.g = lut3d->scale.b = 1.f; lut3d->fs.on_event = update_apply_clut; return 0; } @@ -1087,6 +1102,7 @@ typedef struct LUT1DContext { const AVClass *class; char *file; int interpolation; ///<interp_1d_mode + struct rgbvec scale; uint8_t rgba_map[4]; int step; float lut[3][MAX_1D_LEVEL]; @@ -1182,6 +1198,11 @@ static int parse_cinespace_1d(AVFilterContext *ctx, FILE *f) break; } } + + lut1d->scale.r = av_clipf(1. / (in_max[0] - in_min[0]), 0.f, 1.f); + lut1d->scale.g = av_clipf(1. / (in_max[1] - in_min[1]), 0.f, 1.f); + lut1d->scale.b = av_clipf(1. / (in_max[2] - in_min[2]), 0.f, 1.f); + return 0; } @@ -1227,13 +1248,15 @@ try_again: } while (skip_line(line)); if (av_sscanf(line, "%f %f %f", &lut1d->lut[0][i], &lut1d->lut[1][i], &lut1d->lut[2][i]) != 3) return AVERROR_INVALIDDATA; - lut1d->lut[0][i] *= max[0] - min[0]; - lut1d->lut[1][i] *= max[1] - min[1]; - lut1d->lut[2][i] *= max[2] - min[2]; } break; } } + + lut1d->scale.r = av_clipf(1. / (max[0] - min[0]), 0.f, 1.f); + lut1d->scale.g = av_clipf(1. / (max[1] - min[1]), 0.f, 1.f); + lut1d->scale.b = av_clipf(1. / (max[2] - min[2]), 0.f, 1.f); + return 0; } @@ -1349,7 +1372,9 @@ static int interp_1d_##nbits##_##name##_p##depth(AVFilterContext *ctx, \ const uint8_t *srcrrow = in->data[2] + slice_start * in->linesize[2]; \ const uint8_t *srcarow = in->data[3] + slice_start * in->linesize[3]; \ const float factor = (1 << depth) - 1; \ - const float scale = (1. / factor) * (lut1d->lutsize - 1); \ + const float scale_r = (lut1d->scale.r / factor) * (lut1d->lutsize - 1); \ + const float scale_g = (lut1d->scale.g / factor) * (lut1d->lutsize - 1); \ + const float scale_b = (lut1d->scale.b / factor) * (lut1d->lutsize - 1); \ \ for (y = slice_start; y < slice_end; y++) { \ uint##nbits##_t *dstg = (uint##nbits##_t *)grow; \ @@ -1361,9 +1386,9 @@ static int interp_1d_##nbits##_##name##_p##depth(AVFilterContext *ctx, \ const uint##nbits##_t *srcr = (const uint##nbits##_t *)srcrrow; \ const uint##nbits##_t *srca = (const uint##nbits##_t *)srcarow; \ for (x = 0; x < in->width; x++) { \ - float r = srcr[x] * scale; \ - float g = srcg[x] * scale; \ - float b = srcb[x] * scale; \ + float r = srcr[x] * scale_r; \ + float g = srcg[x] * scale_g; \ + float b = srcb[x] * scale_b; \ r = interp_1d_##name(lut1d, 0, r); \ g = interp_1d_##name(lut1d, 1, g); \ b = interp_1d_##name(lut1d, 2, b); \ @@ -1441,15 +1466,17 @@ static int interp_1d_##nbits##_##name(AVFilterContext *ctx, void *arg, \ uint8_t *dstrow = out->data[0] + slice_start * out->linesize[0]; \ const uint8_t *srcrow = in ->data[0] + slice_start * in ->linesize[0]; \ const float factor = (1 << nbits) - 1; \ - const float scale = (1. / factor) * (lut1d->lutsize - 1); \ + const float scale_r = (lut1d->scale.r / factor) * (lut1d->lutsize - 1); \ + const float scale_g = (lut1d->scale.g / factor) * (lut1d->lutsize - 1); \ + const float scale_b = (lut1d->scale.b / factor) * (lut1d->lutsize - 1); \ \ for (y = slice_start; y < slice_end; y++) { \ uint##nbits##_t *dst = (uint##nbits##_t *)dstrow; \ const uint##nbits##_t *src = (const uint##nbits##_t *)srcrow; \ for (x = 0; x < in->width * step; x += step) { \ - float rr = src[x + r] * scale; \ - float gg = src[x + g] * scale; \ - float bb = src[x + b] * scale; \ + float rr = src[x + r] * scale_r; \ + float gg = src[x + g] * scale_g; \ + float bb = src[x + b] * scale_b; \ rr = interp_1d_##name(lut1d, 0, rr); \ gg = interp_1d_##name(lut1d, 1, gg); \ bb = interp_1d_##name(lut1d, 2, bb); \ @@ -1544,6 +1571,8 @@ static av_cold int lut1d_init(AVFilterContext *ctx) const char *ext; LUT1DContext *lut1d = ctx->priv; + lut1d->scale.r = lut1d->scale.g = lut1d->scale.b = 1.f; + if (!lut1d->file) { set_identity_matrix_1d(lut1d, 32); return 0;

1 0

avcodec/pnm_parser: Remember the length already scanned for ascii images
by Michael Niedermayer 27 Apr '19

27 Apr '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sat Apr 27 14:08:07 2019 +0200| [801939588999a5cfe8d2aeabe7114a09f892a1f4] | committer: Michael Niedermayer avcodec/pnm_parser: Remember the length already scanned for ascii images Fixes: speed regression with xmap_samsung_gear_2560x1280.pgm Found-by: Michael Koch Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=801939588999a5cfe… --- libavcodec/pnm_parser.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/libavcodec/pnm_parser.c b/libavcodec/pnm_parser.c index 210a8a048e..de0e32ba9c 100644 --- a/libavcodec/pnm_parser.c +++ b/libavcodec/pnm_parser.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "parser.h" //for ParseContext @@ -27,6 +28,7 @@ typedef struct PNMParseContext { ParseContext pc; int remaining_bytes; + int ascii_scan; }PNMParseContext; static int pnm_parse(AVCodecParserContext *s, AVCodecContext *avctx, @@ -77,17 +79,28 @@ retry: } else if (pnmctx.type < 4) { uint8_t *bs = pnmctx.bytestream; const uint8_t *end = pnmctx.bytestream_end; + uint8_t *sync = bs; + + if (pc->index) { + av_assert0(pnmpc->ascii_scan <= end - bs); + bs += pnmpc->ascii_scan; + } while (bs < end) { - int c = *bs++; + int c; + sync = bs; + c = *bs++; if (c == '#') { while (c != '\n' && bs < end) c = *bs++; } else if (c == 'P') { next = bs - pnmctx.bytestream_start + skip - 1; + pnmpc->ascii_scan = 0; break; } } + if (next == END_NOT_FOUND) + pnmpc->ascii_scan = sync - pnmctx.bytestream + skip; } else { next = pnmctx.bytestream - pnmctx.bytestream_start + skip + av_image_get_buffer_size(avctx->pix_fmt, avctx->width, avctx->height, 1);

1 0

avcodec/pnm_parser: Remember the size of the image and do not reparse the header
by Michael Niedermayer 27 Apr '19

27 Apr '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Apr 24 21:14:19 2019 +0200| [9fc1031ac2e8691e0140854d727b58cb62431b2b] | committer: Michael Niedermayer avcodec/pnm_parser: Remember the size of the image and do not reparse the header Fixes: Timeout (11sec -> 60ms) Fixes: 14270/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PAM_fuzzer-5734809634078720 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9fc1031ac2e8691e0… --- libavcodec/pnm_parser.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/libavcodec/pnm_parser.c b/libavcodec/pnm_parser.c index 95241c30b3..210a8a048e 100644 --- a/libavcodec/pnm_parser.c +++ b/libavcodec/pnm_parser.c @@ -24,19 +24,35 @@ #include "parser.h" //for ParseContext #include "pnm.h" +typedef struct PNMParseContext { + ParseContext pc; + int remaining_bytes; +}PNMParseContext; static int pnm_parse(AVCodecParserContext *s, AVCodecContext *avctx, const uint8_t **poutbuf, int *poutbuf_size, const uint8_t *buf, int buf_size) { - ParseContext *pc = s->priv_data; + PNMParseContext *pnmpc = s->priv_data; + ParseContext *pc = &pnmpc->pc; PNMContext pnmctx; - int next; + int next = END_NOT_FOUND; int skip = 0; for (; pc->overread > 0; pc->overread--) { pc->buffer[pc->index++]= pc->buffer[pc->overread_index++]; } + + if (pnmpc->remaining_bytes) { + int inc = FFMIN(pnmpc->remaining_bytes, buf_size); + skip += inc; + pnmpc->remaining_bytes -= inc; + + if (!pnmpc->remaining_bytes) + next = skip; + goto end; + } + retry: if (pc->index) { pnmctx.bytestream_start = @@ -47,7 +63,6 @@ retry: pnmctx.bytestream = (uint8_t *) buf + skip; /* casts avoid warnings */ pnmctx.bytestream_end = (uint8_t *) buf + buf_size - skip; } - next = END_NOT_FOUND; if (ff_pnm_decode_header(avctx, &pnmctx) < 0) { if (pnmctx.bytestream < pnmctx.bytestream_end) { if (pc->index) { @@ -79,9 +94,11 @@ retry: } if (next != END_NOT_FOUND && pnmctx.bytestream_start != buf + skip) next -= pc->index; - if (next > buf_size) + if (next > buf_size) { + pnmpc->remaining_bytes = next - buf_size; next = END_NOT_FOUND; - + } +end: if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) { *poutbuf = NULL; *poutbuf_size = 0; @@ -95,7 +112,7 @@ retry: AVCodecParser ff_pnm_parser = { .codec_ids = { AV_CODEC_ID_PGM, AV_CODEC_ID_PGMYUV, AV_CODEC_ID_PPM, AV_CODEC_ID_PBM, AV_CODEC_ID_PAM }, - .priv_data_size = sizeof(ParseContext), + .priv_data_size = sizeof(PNMParseContext), .parser_parse = pnm_parse, .parser_close = ff_parse_close, };

1 0

avcodec/scpr3: add missing check for decode_value3() return value
by James Almer 27 Apr '19

27 Apr '19

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Apr 26 12:31:19 2019 -0300| [938cb783d40ad5ee40f4e2be8617fdfb493dbe4d] | committer: James Almer avcodec/scpr3: add missing check for decode_value3() return value Fixes ticket #7866. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=938cb783d40ad5ee4… --- libavcodec/scpr3.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/scpr3.c b/libavcodec/scpr3.c index f92ccfa902..5cfad9f4d2 100644 --- a/libavcodec/scpr3.c +++ b/libavcodec/scpr3.c @@ -1038,6 +1038,9 @@ static int decompress_p3(AVCodecContext *avctx, s->range_model3.freqs[1], s->range_model3.cnts, s->range_model3.dectab, &temp); + if (ret < 0) + return ret; + min += temp << 8; ret |= decode_value3(s, 255, &s->range_model3.cntsum, s->range_model3.freqs[0],

1 0

avformat/microdvddec: skip empty lines
by Paul B Mahol 27 Apr '19

27 Apr '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Apr 27 12:47:39 2019 +0200| [163bb087f81d1cda9c29b83d9f14a376a6996f81] | committer: Paul B Mahol avformat/microdvddec: skip empty lines > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=163bb087f81d1cda9… --- libavformat/microdvddec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/microdvddec.c b/libavformat/microdvddec.c index ef6bcfbc73..ca9086afe9 100644 --- a/libavformat/microdvddec.c +++ b/libavformat/microdvddec.c @@ -102,6 +102,8 @@ static int microdvd_read_header(AVFormatContext *s) if (!len) break; line[strcspn(line, "\r\n")] = 0; + if (!*p) + continue; if (i++ < 3) { int frame; double fps;

1 0

avformat/subtitles: ignore extra '\r' at line endings
by Paul B Mahol 27 Apr '19

27 Apr '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Apr 25 23:21:38 2019 +0200| [6347146e3d3d55216445696504d49e33470e17ad] | committer: Paul B Mahol avformat/subtitles: ignore extra '\r' at line endings > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6347146e3d3d55216… --- libavformat/subtitles.c | 2 +- libavformat/subtitles.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/subtitles.c b/libavformat/subtitles.c index 93c9ef05cf..659c99d1cf 100644 --- a/libavformat/subtitles.c +++ b/libavformat/subtitles.c @@ -417,7 +417,7 @@ ptrdiff_t ff_subtitles_read_line(FFTextReader *tr, char *buf, size_t size) buf[cur++] = c; buf[cur] = '\0'; } - if (ff_text_peek_r8(tr) == '\r') + while (ff_text_peek_r8(tr) == '\r') ff_text_r8(tr); if (ff_text_peek_r8(tr) == '\n') ff_text_r8(tr); diff --git a/libavformat/subtitles.h b/libavformat/subtitles.h index ca78db224d..6b418e3621 100644 --- a/libavformat/subtitles.h +++ b/libavformat/subtitles.h @@ -188,7 +188,7 @@ static av_always_inline int ff_subtitles_next_line(const char *ptr) { int n = strcspn(ptr, "\r\n"); ptr += n; - if (*ptr == '\r') { + while (*ptr == '\r') { ptr++; n++; }

1 0

avcodec/nvenc: fix indentation
by Timo Rothenpieler 27 Apr '19

27 Apr '19

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Wed Apr 24 22:47:24 2019 +0200| [2e254bb897471b4a4db2b846947fc6c00faac3e6] | committer: Timo Rothenpieler avcodec/nvenc: fix indentation > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2e254bb897471b4a4… --- libavcodec/nvenc.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 626662f02c..3fe64bba8b 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1564,21 +1564,21 @@ static int nvenc_find_free_reg_resource(AVCodecContext *avctx) if (ctx->nb_registered_frames == FF_ARRAY_ELEMS(ctx->registered_frames)) { for (first_round = 1; first_round >= 0; first_round--) { - for (i = 0; i < ctx->nb_registered_frames; i++) { - if (!ctx->registered_frames[i].mapped) { - if (ctx->registered_frames[i].regptr) { - if (first_round) - continue; - nv_status = p_nvenc->nvEncUnregisterResource(ctx->nvencoder, ctx->registered_frames[i].regptr); - if (nv_status != NV_ENC_SUCCESS) - return nvenc_print_error(avctx, nv_status, "Failed unregistering unused input resource"); - ctx->registered_frames[i].ptr = NULL; - ctx->registered_frames[i].regptr = NULL; + for (i = 0; i < ctx->nb_registered_frames; i++) { + if (!ctx->registered_frames[i].mapped) { + if (ctx->registered_frames[i].regptr) { + if (first_round) + continue; + nv_status = p_nvenc->nvEncUnregisterResource(ctx->nvencoder, ctx->registered_frames[i].regptr); + if (nv_status != NV_ENC_SUCCESS) + return nvenc_print_error(avctx, nv_status, "Failed unregistering unused input resource"); + ctx->registered_frames[i].ptr = NULL; + ctx->registered_frames[i].regptr = NULL; + } + return i; } - return i; } } - } } else { return ctx->nb_registered_frames++; }

1 0

avcodec/nvenc: only unregister input resources when absolutely needed
by Timo Rothenpieler 27 Apr '19

27 Apr '19

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Wed Apr 24 19:00:25 2019 +0200| [23ed147e8fc2b6b51a88af66b40f99049e5fa0d8] | committer: Timo Rothenpieler avcodec/nvenc: only unregister input resources when absolutely needed This reverts nvenc to old behaviour, which in some super rare edge cases performs better. The implication of this is that any potential API user who relies on nvenc cleaning up every frames device resources after it's done using them will have to change their usage pattern. That should not be a problem, since pretty much every normal usage pattern automatically implies that surfaces are reused from a common pool, since constant re-allocation is also very expensive. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=23ed147e8fc2b6b51… --- libavcodec/nvenc.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index d3413b3fd7..626662f02c 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1560,12 +1560,15 @@ static int nvenc_find_free_reg_resource(AVCodecContext *avctx) NV_ENCODE_API_FUNCTION_LIST *p_nvenc = &dl_fn->nvenc_funcs; NVENCSTATUS nv_status; - int i; + int i, first_round; if (ctx->nb_registered_frames == FF_ARRAY_ELEMS(ctx->registered_frames)) { + for (first_round = 1; first_round >= 0; first_round--) { for (i = 0; i < ctx->nb_registered_frames; i++) { if (!ctx->registered_frames[i].mapped) { if (ctx->registered_frames[i].regptr) { + if (first_round) + continue; nv_status = p_nvenc->nvEncUnregisterResource(ctx->nvencoder, ctx->registered_frames[i].regptr); if (nv_status != NV_ENC_SUCCESS) return nvenc_print_error(avctx, nv_status, "Failed unregistering unused input resource"); @@ -1575,6 +1578,7 @@ static int nvenc_find_free_reg_resource(AVCodecContext *avctx) return i; } } + } } else { return ctx->nb_registered_frames++; } @@ -1846,13 +1850,6 @@ static int process_output_surface(AVCodecContext *avctx, AVPacket *pkt, NvencSur res = nvenc_print_error(avctx, nv_status, "Failed unmapping input resource"); goto error; } - nv_status = p_nvenc->nvEncUnregisterResource(ctx->nvencoder, ctx->registered_frames[tmpoutsurf->reg_idx].regptr); - if (nv_status != NV_ENC_SUCCESS) { - res = nvenc_print_error(avctx, nv_status, "Failed unregistering input resource"); - goto error; - } - ctx->registered_frames[tmpoutsurf->reg_idx].ptr = NULL; - ctx->registered_frames[tmpoutsurf->reg_idx].regptr = NULL; } else if (ctx->registered_frames[tmpoutsurf->reg_idx].mapped < 0) { res = AVERROR_BUG; goto error;

1 0