virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-06 06:27:36 +02:00
Code Issues Releases Activity

avcodec: move avcodec_flush_buffers from decode.c to utils.c

Browse Source 
It's not a decoding exclusive function anymore.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2020-05-16 19:17:13 -03:00
parent 26b4509690
commit c7c8f141eb
2 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
libavcodec/decode.c
View File

@ -1961,47 +1961,3 @@ int ff_reget_buffer(AVCodecContext *avctx, AVFrame *frame, int flags)
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
return ret; return ret;
} }
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;
}
// We haven't implemented flushing for frame-threaded encoders.
av_assert0(!(caps & AV_CODEC_CAP_FRAME_THREADS));
}
avci->draining = 0;
avci->draining_done = 0;
avci->nb_draining_errors = 0;
av_frame_unref(avci->buffer_frame);
av_frame_unref(avci->compat_decode_frame);
av_packet_unref(avci->buffer_pkt);
avci->buffer_pkt_valid = 0;
av_packet_unref(avci->ds.in_pkt);
if (HAVE_THREADS && avctx->active_thread_type & FF_THREAD_FRAME)
ff_thread_flush(avctx);
else if (avctx->codec->flush)
avctx->codec->flush(avctx);
avctx->pts_correction_last_pts =
avctx->pts_correction_last_dts = INT64_MIN;
if (av_codec_is_decoder(avctx->codec))
av_bsf_flush(avci->bsf);
if (!avctx->refcounted_frames)
av_frame_unref(avci->to_free);
}

44
libavcodec/utils.c
View File

@ -1055,6 +1055,50 @@ FF_ENABLE_DEPRECATION_WARNINGS
goto end; goto end;
} }
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;
}
// We haven't implemented flushing for frame-threaded encoders.
av_assert0(!(caps & AV_CODEC_CAP_FRAME_THREADS));
}
avci->draining = 0;
avci->draining_done = 0;
avci->nb_draining_errors = 0;
av_frame_unref(avci->buffer_frame);
av_frame_unref(avci->compat_decode_frame);
av_packet_unref(avci->buffer_pkt);
avci->buffer_pkt_valid = 0;
av_packet_unref(avci->ds.in_pkt);
if (HAVE_THREADS && avctx->active_thread_type & FF_THREAD_FRAME)
ff_thread_flush(avctx);
else if (avctx->codec->flush)
avctx->codec->flush(avctx);
avctx->pts_correction_last_pts =
avctx->pts_correction_last_dts = INT64_MIN;
if (av_codec_is_decoder(avctx->codec))
av_bsf_flush(avci->bsf);
if (!avctx->refcounted_frames)
av_frame_unref(avci->to_free);
}
void avsubtitle_free(AVSubtitle *sub) void avsubtitle_free(AVSubtitle *sub)
{ {
int i; int i;