Message ID | 20230620141608.31759-2-anton@khirnov.net |
---|---|
State | New |
Headers | show |
Series | [FFmpeg-devel,1/9] lavc: add a header for internal generic-layer APIs | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | fail | Make fate failed |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | fail | Make fate failed |
Anton Khirnov: > Will allow making some state private to encoding/decoding in the future. > --- > libavcodec/avcodec.c | 26 ++------------------------ > libavcodec/avcodec_internal.h | 3 +++ > libavcodec/decode.c | 15 +++++++++++++++ > libavcodec/encode.c | 18 ++++++++++++++++++ > 4 files changed, 38 insertions(+), 24 deletions(-) > > diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c > index 638cb55146..a5cb6035b6 100644 > --- a/libavcodec/avcodec.c > +++ b/libavcodec/avcodec.c > @@ -373,33 +373,11 @@ void avcodec_flush_buffers(AVCodecContext *avctx) > { > AVCodecInternal *avci = avctx->internal; > > - if (av_codec_is_encoder(avctx->codec)) { > - int caps = avctx->codec->capabilities; > - > - if (!(caps & AV_CODEC_CAP_ENCODER_FLUSH)) { > - // Only encoders that explicitly declare support for it can be > - // flushed. Otherwise, this is a no-op. > - av_log(avctx, AV_LOG_WARNING, "Ignoring attempt to flush encoder " > - "that doesn't support it\n"); > - return; This return makes flushing an encoder that does not support it a no-op; this will no longer be true after this patch. > - } > - if (avci->in_frame) > - av_frame_unref(avci->in_frame); > - if (avci->recon_frame) > - av_frame_unref(avci->recon_frame); > - } else { > - av_packet_unref(avci->last_pkt_props); > - av_packet_unref(avci->in_pkt); > - > - avctx->pts_correction_last_pts = > - avctx->pts_correction_last_dts = INT64_MIN; > - > - av_bsf_flush(avci->bsf); > - } > + av_codec_is_encoder(avctx->codec) ? > + ff_encode_flush_buffers(avctx) : ff_decode_flush_buffers(avctx); > > avci->draining = 0; > avci->draining_done = 0; > - avci->nb_draining_errors = 0; > av_frame_unref(avci->buffer_frame); > av_packet_unref(avci->buffer_pkt); > > diff --git a/libavcodec/avcodec_internal.h b/libavcodec/avcodec_internal.h > index be60a36644..6ffe575c3e 100644 > --- a/libavcodec/avcodec_internal.h > +++ b/libavcodec/avcodec_internal.h > @@ -50,4 +50,7 @@ int ff_encode_preinit(struct AVCodecContext *avctx); > */ > int ff_decode_preinit(struct AVCodecContext *avctx); > > +void ff_decode_flush_buffers(struct AVCodecContext *avctx); > +void ff_encode_flush_buffers(struct AVCodecContext *avctx); > + > #endif // AVCODEC_AVCODEC_INTERNAL_H > diff --git a/libavcodec/decode.c b/libavcodec/decode.c > index 8adb532616..7d000fec32 100644 > --- a/libavcodec/decode.c > +++ b/libavcodec/decode.c > @@ -1739,3 +1739,18 @@ AVBufferRef *ff_hwaccel_frame_priv_alloc(AVCodecContext *avctx, > > return ref; > } > + > +void ff_decode_flush_buffers(AVCodecContext *avctx) > +{ > + AVCodecInternal *avci = avctx->internal; > + > + av_packet_unref(avci->last_pkt_props); > + av_packet_unref(avci->in_pkt); > + > + avctx->pts_correction_last_pts = > + avctx->pts_correction_last_dts = INT64_MIN; > + > + av_bsf_flush(avci->bsf); > + > + avci->nb_draining_errors = 0; > +} > diff --git a/libavcodec/encode.c b/libavcodec/encode.c > index 3a016b14c1..3341a79c9b 100644 > --- a/libavcodec/encode.c > +++ b/libavcodec/encode.c > @@ -785,3 +785,21 @@ int ff_encode_receive_frame(AVCodecContext *avctx, AVFrame *frame) > av_frame_move_ref(frame, avci->recon_frame); > return 0; > } > + > +void ff_encode_flush_buffers(AVCodecContext *avctx) > +{ > + AVCodecInternal *avci = avctx->internal; > + int caps = avctx->codec->capabilities; > + > + if (!(caps & AV_CODEC_CAP_ENCODER_FLUSH)) { > + // Only encoders that explicitly declare support for it can be > + // flushed. Otherwise, this is a no-op. > + av_log(avctx, AV_LOG_WARNING, "Ignoring attempt to flush encoder " > + "that doesn't support it\n"); > + return; > + } > + if (avci->in_frame) > + av_frame_unref(avci->in_frame); > + if (avci->recon_frame) > + av_frame_unref(avci->recon_frame); > +}
diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 638cb55146..a5cb6035b6 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -373,33 +373,11 @@ void avcodec_flush_buffers(AVCodecContext *avctx) { AVCodecInternal *avci = avctx->internal; - if (av_codec_is_encoder(avctx->codec)) { - int caps = avctx->codec->capabilities; - - if (!(caps & AV_CODEC_CAP_ENCODER_FLUSH)) { - // Only encoders that explicitly declare support for it can be - // flushed. Otherwise, this is a no-op. - av_log(avctx, AV_LOG_WARNING, "Ignoring attempt to flush encoder " - "that doesn't support it\n"); - return; - } - if (avci->in_frame) - av_frame_unref(avci->in_frame); - if (avci->recon_frame) - av_frame_unref(avci->recon_frame); - } else { - av_packet_unref(avci->last_pkt_props); - av_packet_unref(avci->in_pkt); - - avctx->pts_correction_last_pts = - avctx->pts_correction_last_dts = INT64_MIN; - - av_bsf_flush(avci->bsf); - } + av_codec_is_encoder(avctx->codec) ? + ff_encode_flush_buffers(avctx) : ff_decode_flush_buffers(avctx); avci->draining = 0; avci->draining_done = 0; - avci->nb_draining_errors = 0; av_frame_unref(avci->buffer_frame); av_packet_unref(avci->buffer_pkt); diff --git a/libavcodec/avcodec_internal.h b/libavcodec/avcodec_internal.h index be60a36644..6ffe575c3e 100644 --- a/libavcodec/avcodec_internal.h +++ b/libavcodec/avcodec_internal.h @@ -50,4 +50,7 @@ int ff_encode_preinit(struct AVCodecContext *avctx); */ int ff_decode_preinit(struct AVCodecContext *avctx); +void ff_decode_flush_buffers(struct AVCodecContext *avctx); +void ff_encode_flush_buffers(struct AVCodecContext *avctx); + #endif // AVCODEC_AVCODEC_INTERNAL_H diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 8adb532616..7d000fec32 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1739,3 +1739,18 @@ AVBufferRef *ff_hwaccel_frame_priv_alloc(AVCodecContext *avctx, return ref; } + +void ff_decode_flush_buffers(AVCodecContext *avctx) +{ + AVCodecInternal *avci = avctx->internal; + + av_packet_unref(avci->last_pkt_props); + av_packet_unref(avci->in_pkt); + + avctx->pts_correction_last_pts = + avctx->pts_correction_last_dts = INT64_MIN; + + av_bsf_flush(avci->bsf); + + avci->nb_draining_errors = 0; +} diff --git a/libavcodec/encode.c b/libavcodec/encode.c index 3a016b14c1..3341a79c9b 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -785,3 +785,21 @@ int ff_encode_receive_frame(AVCodecContext *avctx, AVFrame *frame) av_frame_move_ref(frame, avci->recon_frame); return 0; } + +void ff_encode_flush_buffers(AVCodecContext *avctx) +{ + AVCodecInternal *avci = avctx->internal; + int caps = avctx->codec->capabilities; + + if (!(caps & AV_CODEC_CAP_ENCODER_FLUSH)) { + // Only encoders that explicitly declare support for it can be + // flushed. Otherwise, this is a no-op. + av_log(avctx, AV_LOG_WARNING, "Ignoring attempt to flush encoder " + "that doesn't support it\n"); + return; + } + if (avci->in_frame) + av_frame_unref(avci->in_frame); + if (avci->recon_frame) + av_frame_unref(avci->recon_frame); +}