November 2021 - ffmpeg-cvslog

avfilter/vf_estdif: do some clip calculations only once in loop
by Paul B Mahol 09 Nov '21

09 Nov '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Nov 9 09:32:20 2021 +0100| [a13646639fcddb1de3bf08c25a243218cec39a0b] | committer: Paul B Mahol avfilter/vf_estdif: do some clip calculations only once in loop > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a13646639fcddb1de… --- libavfilter/vf_estdif.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/libavfilter/vf_estdif.c b/libavfilter/vf_estdif.c index 4469cb11bf..c7a80425f0 100644 --- a/libavfilter/vf_estdif.c +++ b/libavfilter/vf_estdif.c @@ -217,10 +217,9 @@ MID6(uint16_t, 16) #define DIFF(type, ss) \ static unsigned diff_##ss(const type *const prev, \ const type *const next, \ - int end, int x, int k, int j) \ + int x, int y) \ { \ - return FFABS(prev[av_clip(x + k + j, 0, end)] - \ - next[av_clip(x - k + j, 0, end)]); \ + return FFABS(prev[x] - next[y]); \ } DIFF(uint8_t, 8) @@ -272,9 +271,11 @@ static void interpolate_##ss(ESTDIFContext *s, uint8_t *ddst, \ atype sum = 0; \ \ for (int j = -redge; j <= redge; j++) { \ - sum += diff_##ss(prev_line, next_line, end, x, i, j); \ - sum += diff_##ss(prev2_line, prev_line, end, x, i, j); \ - sum += diff_##ss(next_line, next2_line, end, x, i, j); \ + const int xx = av_clip(x + i + j, 0, end); \ + const int yy = av_clip(x - i + j, 0, end); \ + sum += diff_##ss(prev_line, next_line, xx, yy); \ + sum += diff_##ss(prev2_line, prev_line, xx, yy); \ + sum += diff_##ss(next_line, next2_line, xx, yy); \ } \ \ sD[i + rslope] = sum; \ @@ -288,9 +289,11 @@ static void interpolate_##ss(ESTDIFContext *s, uint8_t *ddst, \ atype sum = 0; \ \ for (int j = -redge; j <= redge; j++) { \ - sum += diff_##ss(prev_line, next_line, end, x, k + i, j); \ - sum += diff_##ss(prev2_line, prev_line, end, x, k + i, j); \ - sum += diff_##ss(next_line, next2_line, end, x, k + i, j); \ + const int xx = av_clip(x + k + i + j, 0, end); \ + const int yy = av_clip(x - k - i + j, 0, end); \ + sum += diff_##ss(prev_line, next_line, xx, yy); \ + sum += diff_##ss(prev2_line, prev_line, xx, yy); \ + sum += diff_##ss(next_line, next2_line, xx, yy); \ } \ \ sd[i + rslope] = sum; \

1 0

avfilter/vf_estdif: export distance cost as filter option
by Paul B Mahol 09 Nov '21

09 Nov '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Nov 9 08:58:38 2021 +0100| [dcf83fd59d42b8ee6a601cdf9fc8946a1aa30520] | committer: Paul B Mahol avfilter/vf_estdif: export distance cost as filter option > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dcf83fd59d42b8ee6… --- doc/filters.texi | 4 ++++ libavfilter/vf_estdif.c | 22 ++++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index b537e421be..5ebfc11237 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -11711,6 +11711,10 @@ Allowed range is from 1 to 15. Specify the search radius for best edge matching. Default value is 2. Allowed range is from 0 to 15. +@item dcost +Specify the distance cost for edge matching. Default value is 0.5. +Allowed range is from 0 to 1. + @item interp Specify the interpolation used. Default is 4-point interpolation. It accepts one of the following values: diff --git a/libavfilter/vf_estdif.c b/libavfilter/vf_estdif.c index a8ef93826c..4469cb11bf 100644 --- a/libavfilter/vf_estdif.c +++ b/libavfilter/vf_estdif.c @@ -35,6 +35,7 @@ typedef struct ESTDIFContext { int deint; ///< which frames to deinterlace int rslope; ///< best edge slope search radius int redge; ///< best edge match search radius + float dcost; ///< distance cost for edge matching int interp; ///< type of interpolation int linesize[4]; ///< bytes of pixel data per line for each plane int planewidth[4]; ///< width of each plane @@ -42,7 +43,7 @@ typedef struct ESTDIFContext { int field; ///< which field are we on, 0 or 1 int eof; int depth; - int half; + int max; int nb_planes; int nb_threads; int64_t pts; @@ -52,7 +53,7 @@ typedef struct ESTDIFContext { const uint8_t *prev_line, const uint8_t *next_line, const uint8_t *prev2_line, const uint8_t *next2_line, const uint8_t *prev3_line, const uint8_t *next3_line, - int x, int width, int rslope, int redge, unsigned half, + int x, int width, int rslope, int redge, int depth, int *K); unsigned (*mid_8[3])(const uint8_t *const prev, @@ -92,6 +93,7 @@ static const AVOption estdif_options[] = { CONST("interlaced", "only deinterlace frames marked as interlaced", 1, "deint"), { "rslope", "specify the search radius for edge slope tracing", OFFSET(rslope), AV_OPT_TYPE_INT, {.i64=1}, 1, MAX_R, FLAGS, }, { "redge", "specify the search radius for best edge matching", OFFSET(redge), AV_OPT_TYPE_INT, {.i64=2}, 0, MAX_R, FLAGS, }, + { "dcost", "specify the distance cost for edge matching", OFFSET(dcost), AV_OPT_TYPE_FLOAT,{.dbl=0.5}, 0, 1, FLAGS, }, { "interp", "specify the type of interpolation", OFFSET(interp), AV_OPT_TYPE_INT, {.i64=1}, 0, 2, FLAGS, "interp" }, CONST("2p", "two-point interpolation", 0, "interp"), CONST("4p", "four-point interpolation", 1, "interp"), @@ -239,7 +241,7 @@ static unsigned cost_##ss(const type *const prev, \ COST(uint8_t, 8) COST(uint16_t, 16) -#define INTERPOLATE(type, atype, max, ss) \ +#define INTERPOLATE(type, atype, amax, ss) \ static void interpolate_##ss(ESTDIFContext *s, uint8_t *ddst, \ const uint8_t *const pprev_line, \ const uint8_t *const nnext_line, \ @@ -248,7 +250,7 @@ static void interpolate_##ss(ESTDIFContext *s, uint8_t *ddst, \ const uint8_t *const pprev3_line, \ const uint8_t *const nnext3_line, \ int x, int width, int rslope, \ - int redge, unsigned h, int depth, \ + int redge, int depth, \ int *K) \ { \ type *dst = (type *)ddst; \ @@ -259,10 +261,11 @@ static void interpolate_##ss(ESTDIFContext *s, uint8_t *ddst, \ const type *const next2_line = (const type *const)nnext2_line; \ const type *const next3_line = (const type *const)nnext3_line; \ const int interp = s->interp; \ + const int dcost = s->dcost * s->max; \ const int end = width - 1; \ const atype f = redge + 2; \ atype sd[S], sD[S], di = 0; \ - atype dmin = max; \ + atype dmin = amax; \ int k = *K; \ \ for (int i = -rslope; i <= rslope && abs(k) > rslope; i++) { \ @@ -276,7 +279,7 @@ static void interpolate_##ss(ESTDIFContext *s, uint8_t *ddst, \ \ sD[i + rslope] = sum; \ sD[i + rslope] += f * cost_##ss(prev_line, next_line, end, x, i); \ - sD[i + rslope] += h * abs(i); \ + sD[i + rslope] += dcost * abs(i); \ \ dmin = FFMIN(sD[i + rslope], dmin); \ } \ @@ -292,7 +295,7 @@ static void interpolate_##ss(ESTDIFContext *s, uint8_t *ddst, \ \ sd[i + rslope] = sum; \ sd[i + rslope] += f * cost_##ss(prev_line, next_line, end, x, k + i); \ - sd[i + rslope] += h * abs(k + i); \ + sd[i + rslope] += dcost * abs(k + i); \ \ dmin = FFMIN(sd[i + rslope], dmin); \ } \ @@ -332,7 +335,6 @@ static int deinterlace_slice(AVFilterContext *ctx, void *arg, AVFrame *in = td->in; const int rslope = s->rslope; const int redge = s->redge; - const int half = s->half; const int depth = s->depth; const int interlaced = in->interlaced_frame; const int tff = (s->field == (s->parity == -1 ? interlaced ? in->top_field_first : 1 : @@ -411,7 +413,7 @@ static int deinterlace_slice(AVFilterContext *ctx, void *arg, prev_line, next_line, prev2_line, next2_line, prev3_line, next3_line, - x, width, rslope, redge, half, depth, &k); + x, width, rslope, redge, depth, &k); } out_line += 2 * dst_linesize; @@ -475,7 +477,7 @@ static int config_input(AVFilterLink *inlink) s->mid_16[0] = mid2_16; s->mid_16[1] = mid4_16; s->mid_16[2] = mid6_16; - s->half = 1 << (s->depth - 1); + s->max = (1 << (s->depth)) - 1; return 0; }

1 0

avfilter/f_reverse: readjust frame timestamps for areverse
by Paul B Mahol 07 Nov '21

07 Nov '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Nov 7 20:44:22 2021 +0100| [45dc668aea0edac34969b5a1ff76cf9ad3a09be1] | committer: Paul B Mahol avfilter/f_reverse: readjust frame timestamps for areverse > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=45dc668aea0edac34… --- libavfilter/f_reverse.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavfilter/f_reverse.c b/libavfilter/f_reverse.c index 586d95c063..f7a7e716fa 100644 --- a/libavfilter/f_reverse.c +++ b/libavfilter/f_reverse.c @@ -33,6 +33,7 @@ typedef struct ReverseContext { unsigned int pts_size; int64_t *pts; int flush_idx; + int64_t nb_samples; } ReverseContext; static av_cold int init(AVFilterContext *ctx) @@ -249,7 +250,8 @@ static int areverse_request_frame(AVFilterLink *outlink) if (ret == AVERROR_EOF && s->nb_frames > 0) { AVFrame *out = s->frames[s->nb_frames - 1]; - out->pts = s->pts[s->flush_idx++]; + out->pts = s->pts[s->flush_idx++] - s->nb_samples; + s->nb_samples += s->pts[s->flush_idx] - s->pts[s->flush_idx - 1] - out->nb_samples; if (av_sample_fmt_is_planar(out->format)) reverse_samples_planar(out);

1 0

avfilter/af_adelay: use outlink where applicable
by Paul B Mahol 07 Nov '21

07 Nov '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Nov 7 19:00:50 2021 +0100| [0370c3e3d4dda36a18fe640bd318b937ee98874d] | committer: Paul B Mahol avfilter/af_adelay: use outlink where applicable > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0370c3e3d4dda36a1… --- libavfilter/af_adelay.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavfilter/af_adelay.c b/libavfilter/af_adelay.c index c42fa2d175..ed8a8ae739 100644 --- a/libavfilter/af_adelay.c +++ b/libavfilter/af_adelay.c @@ -189,14 +189,15 @@ static int config_input(AVFilterLink *inlink) static int filter_frame(AVFilterLink *inlink, AVFrame *frame) { AVFilterContext *ctx = inlink->dst; + AVFilterLink *outlink = ctx->outputs[0]; AudioDelayContext *s = ctx->priv; AVFrame *out_frame; int i; if (ctx->is_disabled || !s->delays) - return ff_filter_frame(ctx->outputs[0], frame); + return ff_filter_frame(outlink, frame); - out_frame = ff_get_audio_buffer(ctx->outputs[0], frame->nb_samples); + out_frame = ff_get_audio_buffer(outlink, frame->nb_samples); if (!out_frame) { av_frame_free(&frame); return AVERROR(ENOMEM); @@ -215,9 +216,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) } out_frame->pts = s->next_pts; - s->next_pts += av_rescale_q(frame->nb_samples, (AVRational){1, inlink->sample_rate}, inlink->time_base); + s->next_pts += av_rescale_q(frame->nb_samples, (AVRational){1, outlink->sample_rate}, outlink->time_base); av_frame_free(&frame); - return ff_filter_frame(ctx->outputs[0], out_frame); + return ff_filter_frame(outlink, out_frame); } static int activate(AVFilterContext *ctx)

1 0

avcodec/mjpegdec: Use AVCodecInternal.in_pkt for buffer packet
by Andreas Rheinhardt 07 Nov '21

07 Nov '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon Oct 11 10:40:24 2021 +0200| [cd03a180cb66ca199707ad129a4ab44548711c94] | committer: Andreas Rheinhardt avcodec/mjpegdec: Use AVCodecInternal.in_pkt for buffer packet Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cd03a180cb66ca199… --- libavcodec/mjpegdec.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 7f89641660..8b154ce0ab 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -127,9 +127,7 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx) s->picture_ptr = s->picture; } - s->pkt = av_packet_alloc(); - if (!s->pkt) - return AVERROR(ENOMEM); + s->pkt = avctx->internal->in_pkt; s->avctx = avctx; ff_blockdsp_init(&s->bdsp, avctx); @@ -2960,8 +2958,6 @@ av_cold int ff_mjpeg_decode_end(AVCodecContext *avctx) } else if (s->picture_ptr) av_frame_unref(s->picture_ptr); - av_packet_free(&s->pkt); - av_frame_free(&s->smv_frame); av_freep(&s->buffer);

1 0

avcodec/libdav1d: Use av_memdup() where appropriate
by Andreas Rheinhardt 07 Nov '21

07 Nov '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon Oct 11 16:15:24 2021 +0200| [7c5ee237bebbaaac6a2734d1919c005ca9684055] | committer: Andreas Rheinhardt avcodec/libdav1d: Use av_memdup() where appropriate Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c5ee237bebbaaac6… --- libavcodec/libdav1d.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 507aaa1a96..bbc81a9dc9 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -319,13 +319,13 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) av_packet_unref(pkt); if (c->reordered_opaque != AV_NOPTS_VALUE) { - uint8_t *reordered_opaque = av_malloc(sizeof(c->reordered_opaque)); + uint8_t *reordered_opaque = av_memdup(&c->reordered_opaque, + sizeof(c->reordered_opaque)); if (!reordered_opaque) { dav1d_data_unref(data); return AVERROR(ENOMEM); } - memcpy(reordered_opaque, &c->reordered_opaque, sizeof(c->reordered_opaque)); res = dav1d_data_wrap_user_data(data, reordered_opaque, libdav1d_user_data_free, reordered_opaque); if (res < 0) {

1 0

avcodec/libdav1d: Use AVCodecInternal.in_pkt instead of stack packet
by Andreas Rheinhardt 07 Nov '21

07 Nov '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Sep 23 23:19:24 2021 +0200| [31d0487ba23a59cdebb1ce64253b3b05000ad0f3] | committer: Andreas Rheinhardt avcodec/libdav1d: Use AVCodecInternal.in_pkt instead of stack packet Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=31d0487ba23a59cde… --- libavcodec/libdav1d.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 2d5fccec71..507aaa1a96 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -40,6 +40,9 @@ typedef struct Libdav1dContext { AVClass *class; Dav1dContext *c; + /* This packet coincides with AVCodecInternal.in_pkt + * and is not owned by us. */ + AVPacket *pkt; AVBufferPool *pool; int pool_size; @@ -214,6 +217,8 @@ static av_cold int libdav1d_init(AVCodecContext *c) #endif int res; + dav1d->pkt = c->internal->in_pkt; + av_log(c, AV_LOG_INFO, "libdav1d %s\n", dav1d_version()); dav1d_default_settings(&s); @@ -292,25 +297,26 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) int res; if (!data->sz) { - AVPacket pkt = { 0 }; + AVPacket *const pkt = dav1d->pkt; - res = ff_decode_get_packet(c, &pkt); + res = ff_decode_get_packet(c, pkt); if (res < 0 && res != AVERROR_EOF) return res; - if (pkt.size) { - res = dav1d_data_wrap(data, pkt.data, pkt.size, libdav1d_data_free, pkt.buf); + if (pkt->size) { + res = dav1d_data_wrap(data, pkt->data, pkt->size, + libdav1d_data_free, pkt->buf); if (res < 0) { - av_packet_unref(&pkt); + av_packet_unref(pkt); return res; } - data->m.timestamp = pkt.pts; - data->m.offset = pkt.pos; - data->m.duration = pkt.duration; + data->m.timestamp = pkt->pts; + data->m.offset = pkt->pos; + data->m.duration = pkt->duration; - pkt.buf = NULL; - av_packet_unref(&pkt); + pkt->buf = NULL; + av_packet_unref(pkt); if (c->reordered_opaque != AV_NOPTS_VALUE) { uint8_t *reordered_opaque = av_malloc(sizeof(c->reordered_opaque)); @@ -329,7 +335,7 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) } } } else if (res >= 0) { - av_packet_unref(&pkt); + av_packet_unref(pkt); return AVERROR(EAGAIN); } }

1 0

avcodec/libdav1d: Don't leak side-data-only packets
by Andreas Rheinhardt 07 Nov '21

07 Nov '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon Oct 11 16:01:02 2021 +0200| [776e9f9e2af40252c93e150be712f848d562fccf] | committer: Andreas Rheinhardt avcodec/libdav1d: Don't leak side-data-only packets Reviewed-by: James Almer <jamrial(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=776e9f9e2af40252c… --- libavcodec/libdav1d.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 2807210e50..2d5fccec71 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -328,6 +328,9 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) return res; } } + } else if (res >= 0) { + av_packet_unref(&pkt); + return AVERROR(EAGAIN); } }

1 0

avcodec/cuviddec: Use AVCodecInternal.in_pkt instead of stack packet
by Andreas Rheinhardt 07 Nov '21

07 Nov '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Sep 23 23:19:24 2021 +0200| [ba91b8b6857e367a05b2d6da0cbcea7b1eaf94d5] | committer: Andreas Rheinhardt avcodec/cuviddec: Use AVCodecInternal.in_pkt instead of stack packet Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ba91b8b6857e367a0… --- libavcodec/cuviddec.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libavcodec/cuviddec.c b/libavcodec/cuviddec.c index e157777c51..f03bbd8c4b 100644 --- a/libavcodec/cuviddec.c +++ b/libavcodec/cuviddec.c @@ -53,6 +53,10 @@ typedef struct CuvidContext CUvideodecoder cudecoder; CUvideoparser cuparser; + /* This packet coincides with AVCodecInternal.in_pkt + * and is not owned by us. */ + AVPacket *pkt; + char *cu_gpu; int nb_surfaces; int drop_second_field; @@ -466,12 +470,12 @@ static int cuvid_output_frame(AVCodecContext *avctx, AVFrame *frame) } if (!cuvid_is_buffer_full(avctx)) { - AVPacket pkt = {0}; - ret = ff_decode_get_packet(avctx, &pkt); + AVPacket *const pkt = ctx->pkt; + ret = ff_decode_get_packet(avctx, pkt); if (ret < 0 && ret != AVERROR_EOF) return ret; - ret = cuvid_decode_packet(avctx, &pkt); - av_packet_unref(&pkt); + ret = cuvid_decode_packet(avctx, pkt); + av_packet_unref(pkt); // cuvid_is_buffer_full() should avoid this. if (ret == AVERROR(EAGAIN)) ret = AVERROR_EXTERNAL; @@ -797,6 +801,7 @@ static av_cold int cuvid_decode_init(AVCodecContext *avctx) if (probe_desc && probe_desc->nb_components) probed_bit_depth = probe_desc->comp[0].depth; + ctx->pkt = avctx->internal->in_pkt; // Accelerated transcoding scenarios with 'ffmpeg' require that the // pix_fmt be set to AV_PIX_FMT_CUDA early. The sw_pix_fmt, and the // pix_fmt for non-accelerated transcoding, do not need to be correct

1 0

avcodec/crystalhd: Use AVCodecInternal.in_pkt instead of stack packet
by Andreas Rheinhardt 07 Nov '21

07 Nov '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Sep 23 23:19:24 2021 +0200| [9b851c4b92b7c55ec9d626b729350a5761aef183] | committer: Andreas Rheinhardt avcodec/crystalhd: Use AVCodecInternal.in_pkt instead of stack packet Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9b851c4b92b7c55ec… --- libavcodec/crystalhd.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/libavcodec/crystalhd.c b/libavcodec/crystalhd.c index 0238ab7378..9202a16a77 100644 --- a/libavcodec/crystalhd.c +++ b/libavcodec/crystalhd.c @@ -90,6 +90,9 @@ typedef struct OpaqueList { typedef struct { AVClass *av_class; AVCodecContext *avctx; + /* This packet coincides with AVCodecInternal.in_pkt + * and is not owned by us. */ + AVPacket *pkt; HANDLE dev; uint8_t is_70012; @@ -328,6 +331,7 @@ static av_cold int init(AVCodecContext *avctx) /* Initialize the library */ priv = avctx->priv_data; priv->avctx = avctx; + priv->pkt = avctx->internal->in_pkt; priv->draining = 0; subtype = id2subtype(priv, avctx->codec->id); @@ -703,19 +707,19 @@ static int crystalhd_receive_frame(AVCodecContext *avctx, AVFrame *frame) BC_DTS_STATUS decoder_status = { 0, }; CopyRet rec_ret; CHDContext *priv = avctx->priv_data; + AVPacket *const pkt = priv->pkt; HANDLE dev = priv->dev; int got_frame = 0; int ret = 0; - AVPacket pkt = {0}; av_log(avctx, AV_LOG_VERBOSE, "CrystalHD: receive_frame\n"); - ret = ff_decode_get_packet(avctx, &pkt); + ret = ff_decode_get_packet(avctx, pkt); if (ret < 0 && ret != AVERROR_EOF) { return ret; } - while (pkt.size > DtsTxFreeSize(dev)) { + while (pkt->size > DtsTxFreeSize(dev)) { /* * Block until there is space in the buffer for the next packet. * We assume that the hardware will make forward progress at this @@ -724,8 +728,8 @@ static int crystalhd_receive_frame(AVCodecContext *avctx, AVFrame *frame) av_log(avctx, AV_LOG_TRACE, "CrystalHD: Waiting for space in input buffer\n"); } - ret = crystalhd_decode_packet(avctx, &pkt); - av_packet_unref(&pkt); + ret = crystalhd_decode_packet(avctx, pkt); + av_packet_unref(pkt); // crystalhd_is_buffer_full() should avoid this. if (ret == AVERROR(EAGAIN)) { ret = AVERROR_EXTERNAL;

1 0