| Message ID | 20230911075232.797886-5-fei.w.wang@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel,v5,1/8] avcodec/cbs_av1: Add tx mode enum values | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Mon, Sep 11, 2023 at 3:53 AM <fei.w.wang-at-intel.com@ffmpeg.org> wrote: > > From: Fei Wang <fei.w.wang@intel.com> > > Signed-off-by: Fei Wang <fei.w.wang@intel.com> > --- > libavcodec/vaapi_encode.c | 65 +++++++++++++++++++++++---------------- > 1 file changed, 38 insertions(+), 27 deletions(-) > > diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c > index 5ae63c9f25..46762342eb 100644 > --- a/libavcodec/vaapi_encode.c > +++ b/libavcodec/vaapi_encode.c > @@ -650,6 +650,41 @@ fail_at_end: > return err; > } > > +static int vaapi_encode_set_output_property(AVCodecContext *avctx, > + VAAPIEncodePicture *pic, > + AVPacket *pkt) > +{ > + VAAPIEncodeContext *ctx = avctx->priv_data; > + > + if (pic->type == PICTURE_TYPE_IDR) > + pkt->flags |= AV_PKT_FLAG_KEY; > + > + pkt->pts = pic->pts; > + pkt->duration = pic->duration; > + > + // for no-delay encoders this is handled in generic codec > + if (avctx->codec->capabilities & AV_CODEC_CAP_DELAY && > + avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) { > + pkt->opaque = pic->opaque; > + pkt->opaque_ref = pic->opaque_ref; > + pic->opaque_ref = NULL; > + } > + > + if (ctx->output_delay == 0) { > + pkt->dts = pkt->pts; > + } else if (pic->encode_order < ctx->decode_delay) { > + if (ctx->ts_ring[pic->encode_order] < INT64_MIN + ctx->dts_pts_diff) > + pkt->dts = INT64_MIN; > + else > + pkt->dts = ctx->ts_ring[pic->encode_order] - ctx->dts_pts_diff; > + } else { > + pkt->dts = ctx->ts_ring[(pic->encode_order - ctx->decode_delay) % > + (3 * ctx->output_delay + ctx->async_depth)]; > + } > + > + return 0; > +} > + > static int vaapi_encode_output(AVCodecContext *avctx, > VAAPIEncodePicture *pic, AVPacket *pkt) > { > @@ -691,12 +726,6 @@ static int vaapi_encode_output(AVCodecContext *avctx, > ptr += buf->size; > } > > - if (pic->type == PICTURE_TYPE_IDR) > - pkt->flags |= AV_PKT_FLAG_KEY; > - > - pkt->pts = pic->pts; > - pkt->duration = pic->duration; > - > vas = vaUnmapBuffer(ctx->hwctx->display, pic->output_buffer); > if (vas != VA_STATUS_SUCCESS) { > av_log(avctx, AV_LOG_ERROR, "Failed to unmap output buffers: " > @@ -705,14 +734,6 @@ static int vaapi_encode_output(AVCodecContext *avctx, > goto fail; > } > > - // for no-delay encoders this is handled in generic codec > - if (avctx->codec->capabilities & AV_CODEC_CAP_DELAY && > - avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) { > - pkt->opaque = pic->opaque; > - pkt->opaque_ref = pic->opaque_ref; > - pic->opaque_ref = NULL; > - } > - > av_buffer_unref(&pic->output_buffer_ref); > pic->output_buffer = VA_INVALID_ID; > > @@ -1273,19 +1294,9 @@ int ff_vaapi_encode_receive_packet(AVCodecContext *avctx, AVPacket *pkt) > return err; > } > > - if (ctx->output_delay == 0) { > - pkt->dts = pkt->pts; > - } else if (pic->encode_order < ctx->decode_delay) { > - if (ctx->ts_ring[pic->encode_order] < INT64_MIN + ctx->dts_pts_diff) > - pkt->dts = INT64_MIN; > - else > - pkt->dts = ctx->ts_ring[pic->encode_order] - ctx->dts_pts_diff; > - } else { > - pkt->dts = ctx->ts_ring[(pic->encode_order - ctx->decode_delay) % > - (3 * ctx->output_delay + ctx->async_depth)]; > - } > - av_log(avctx, AV_LOG_DEBUG, "Output packet: pts %"PRId64" dts %"PRId64".\n", > - pkt->pts, pkt->dts); > + vaapi_encode_set_output_property(avctx, pic, pkt); > + av_log(avctx, AV_LOG_DEBUG, "Output packet: pts %"PRId64", dts %"PRId64", " > + "size %d bytes.\n", pkt->pts, pkt->dts, pkt->size); > > ctx->output_order = pic->encode_order; > vaapi_encode_clear_old(avctx); > -- > 2.25.1 > LGTM. Reviewed-by: Neal Gompa <ngompa13@gmail.com>
diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 5ae63c9f25..46762342eb 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -650,6 +650,41 @@ fail_at_end: return err; } +static int vaapi_encode_set_output_property(AVCodecContext *avctx, + VAAPIEncodePicture *pic, + AVPacket *pkt) +{ + VAAPIEncodeContext *ctx = avctx->priv_data; + + if (pic->type == PICTURE_TYPE_IDR) + pkt->flags |= AV_PKT_FLAG_KEY; + + pkt->pts = pic->pts; + pkt->duration = pic->duration; + + // for no-delay encoders this is handled in generic codec + if (avctx->codec->capabilities & AV_CODEC_CAP_DELAY && + avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) { + pkt->opaque = pic->opaque; + pkt->opaque_ref = pic->opaque_ref; + pic->opaque_ref = NULL; + } + + if (ctx->output_delay == 0) { + pkt->dts = pkt->pts; + } else if (pic->encode_order < ctx->decode_delay) { + if (ctx->ts_ring[pic->encode_order] < INT64_MIN + ctx->dts_pts_diff) + pkt->dts = INT64_MIN; + else + pkt->dts = ctx->ts_ring[pic->encode_order] - ctx->dts_pts_diff; + } else { + pkt->dts = ctx->ts_ring[(pic->encode_order - ctx->decode_delay) % + (3 * ctx->output_delay + ctx->async_depth)]; + } + + return 0; +} + static int vaapi_encode_output(AVCodecContext *avctx, VAAPIEncodePicture *pic, AVPacket *pkt) { @@ -691,12 +726,6 @@ static int vaapi_encode_output(AVCodecContext *avctx, ptr += buf->size; } - if (pic->type == PICTURE_TYPE_IDR) - pkt->flags |= AV_PKT_FLAG_KEY; - - pkt->pts = pic->pts; - pkt->duration = pic->duration; - vas = vaUnmapBuffer(ctx->hwctx->display, pic->output_buffer); if (vas != VA_STATUS_SUCCESS) { av_log(avctx, AV_LOG_ERROR, "Failed to unmap output buffers: " @@ -705,14 +734,6 @@ static int vaapi_encode_output(AVCodecContext *avctx, goto fail; } - // for no-delay encoders this is handled in generic codec - if (avctx->codec->capabilities & AV_CODEC_CAP_DELAY && - avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) { - pkt->opaque = pic->opaque; - pkt->opaque_ref = pic->opaque_ref; - pic->opaque_ref = NULL; - } - av_buffer_unref(&pic->output_buffer_ref); pic->output_buffer = VA_INVALID_ID; @@ -1273,19 +1294,9 @@ int ff_vaapi_encode_receive_packet(AVCodecContext *avctx, AVPacket *pkt) return err; } - if (ctx->output_delay == 0) { - pkt->dts = pkt->pts; - } else if (pic->encode_order < ctx->decode_delay) { - if (ctx->ts_ring[pic->encode_order] < INT64_MIN + ctx->dts_pts_diff) - pkt->dts = INT64_MIN; - else - pkt->dts = ctx->ts_ring[pic->encode_order] - ctx->dts_pts_diff; - } else { - pkt->dts = ctx->ts_ring[(pic->encode_order - ctx->decode_delay) % - (3 * ctx->output_delay + ctx->async_depth)]; - } - av_log(avctx, AV_LOG_DEBUG, "Output packet: pts %"PRId64" dts %"PRId64".\n", - pkt->pts, pkt->dts); + vaapi_encode_set_output_property(avctx, pic, pkt); + av_log(avctx, AV_LOG_DEBUG, "Output packet: pts %"PRId64", dts %"PRId64", " + "size %d bytes.\n", pkt->pts, pkt->dts, pkt->size); ctx->output_order = pic->encode_order; vaapi_encode_clear_old(avctx);