virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/decode: flush the internal bsfs instead of constantly reinitalizing them

Browse Source 
Initialize the bsfs once when opening the codec and uninitialize them once when
closing it, instead of at every codec flush/seek.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2018-07-26 20:42:27 -03:00
parent 2954e51393
commit 94fe138de0
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/decode.c
View File

@ -182,7 +182,7 @@ static int unrefcount_frame(AVCodecInternal *avci, AVFrame *frame)
return 0; return 0;
} }
static int bsfs_init(AVCodecContext *avctx) int ff_decode_bsfs_init(AVCodecContext *avctx)
{ {
AVCodecInternal *avci = avctx->internal; AVCodecInternal *avci = avctx->internal;
DecodeFilterContext *s = &avci->filter; DecodeFilterContext *s = &avci->filter;
@ -688,10 +688,6 @@ int attribute_align_arg avcodec_send_packet(AVCodecContext *avctx, const AVPacke
if (avpkt && !avpkt->size && avpkt->data) if (avpkt && !avpkt->size && avpkt->data)
return AVERROR(EINVAL); return AVERROR(EINVAL);
ret = bsfs_init(avctx);
if (ret < 0)
return ret;
av_packet_unref(avci->buffer_pkt); av_packet_unref(avci->buffer_pkt);
if (avpkt && (avpkt->data || avpkt->side_data_elems)) { if (avpkt && (avpkt->data || avpkt->side_data_elems)) {
ret = av_packet_ref(avci->buffer_pkt, avpkt); ret = av_packet_ref(avci->buffer_pkt, avpkt);
@ -751,10 +747,6 @@ int attribute_align_arg avcodec_receive_frame(AVCodecContext *avctx, AVFrame *fr
if (!avcodec_is_open(avctx) || !av_codec_is_decoder(avctx->codec)) if (!avcodec_is_open(avctx) || !av_codec_is_decoder(avctx->codec))
return AVERROR(EINVAL); return AVERROR(EINVAL);
ret = bsfs_init(avctx);
if (ret < 0)
return ret;
if (avci->buffer_frame->buf[0]) { if (avci->buffer_frame->buf[0]) {
av_frame_move_ref(frame, avci->buffer_frame); av_frame_move_ref(frame, avci->buffer_frame);
} else { } else {
@ -1978,6 +1970,14 @@ int ff_reget_buffer(AVCodecContext *avctx, AVFrame *frame)
return ret; return ret;
} }
static void bsfs_flush(AVCodecContext *avctx)
{
DecodeFilterContext *s = &avctx->internal->filter;
for (int i = 0; i < s->nb_bsfs; i++)
av_bsf_flush(s->bsfs[i]);
}
void avcodec_flush_buffers(AVCodecContext *avctx) void avcodec_flush_buffers(AVCodecContext *avctx)
{ {
avctx->internal->draining = 0; avctx->internal->draining = 0;
@ -1998,7 +1998,7 @@ void avcodec_flush_buffers(AVCodecContext *avctx)
avctx->pts_correction_last_pts = avctx->pts_correction_last_pts =
avctx->pts_correction_last_dts = INT64_MIN; avctx->pts_correction_last_dts = INT64_MIN;
ff_decode_bsfs_uninit(avctx); bsfs_flush(avctx);
if (!avctx->refcounted_frames) if (!avctx->refcounted_frames)
av_frame_unref(avctx->internal->to_free); av_frame_unref(avctx->internal->to_free);

2
libavcodec/decode.h
View File

@ -64,6 +64,8 @@ typedef struct FrameDecodeData {
*/ */
int ff_decode_get_packet(AVCodecContext *avctx, AVPacket *pkt); int ff_decode_get_packet(AVCodecContext *avctx, AVPacket *pkt);
int ff_decode_bsfs_init(AVCodecContext *avctx);
void ff_decode_bsfs_uninit(AVCodecContext *avctx); void ff_decode_bsfs_uninit(AVCodecContext *avctx);
/** /**

7
libavcodec/utils.c
View File

@ -727,6 +727,12 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
goto free_and_end; goto free_and_end;
} }
if (av_codec_is_decoder(avctx->codec)) {
ret = ff_decode_bsfs_init(avctx);
if (ret < 0)
goto free_and_end;
}
if (HAVE_THREADS if (HAVE_THREADS
&& !(avctx->internal->frame_thread_encoder && (avctx->active_thread_type&FF_THREAD_FRAME))) { && !(avctx->internal->frame_thread_encoder && (avctx->active_thread_type&FF_THREAD_FRAME))) {
ret = ff_thread_init(avctx); ret = ff_thread_init(avctx);
@ -1032,6 +1038,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
av_packet_free(&avctx->internal->last_pkt_props); av_packet_free(&avctx->internal->last_pkt_props);
av_packet_free(&avctx->internal->ds.in_pkt); av_packet_free(&avctx->internal->ds.in_pkt);
ff_decode_bsfs_uninit(avctx);
av_freep(&avctx->internal->pool); av_freep(&avctx->internal->pool);
} }