har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/decode: split ProgressFrame allocator into two functions

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2024-08-28 10:46:12 -03:00
parent a48eba0021
commit dbbf9a5ff7
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/decode.c
View File

@ -1725,7 +1725,7 @@ static void check_progress_consistency(const ProgressFrame *f)
av_assert1(!f->progress || f->progress->f == f->f); av_assert1(!f->progress || f->progress->f == f->f);
} }
static int progress_frame_get(AVCodecContext *avctx, ProgressFrame *f) int ff_progress_frame_alloc(AVCodecContext *avctx, ProgressFrame *f)
{ {
FFRefStructPool *pool = avctx->internal->progress_frame_pool; FFRefStructPool *pool = avctx->internal->progress_frame_pool;
@ -1743,9 +1743,12 @@ int ff_progress_frame_get_buffer(AVCodecContext *avctx, ProgressFrame *f, int fl
{ {
int ret; int ret;
ret = progress_frame_get(avctx, f); check_progress_consistency(f);
if (ret < 0) if (!f->f) {
return ret; ret = ff_progress_frame_alloc(avctx, f);
if (ret < 0)
return ret;
}
ret = ff_thread_get_buffer(avctx, f->progress->f, flags); ret = ff_thread_get_buffer(avctx, f->progress->f, flags);
if (ret < 0) { if (ret < 0) {

16
libavcodec/progressframe.h
View File

@ -102,12 +102,24 @@ void ff_progress_frame_report(ProgressFrame *f, int progress);
void ff_progress_frame_await(const ProgressFrame *f, int progress); void ff_progress_frame_await(const ProgressFrame *f, int progress);
/** /**
* This function sets up the ProgressFrame, i.e. gets ProgressFrame.f * This function allocates ProgressFrame.f
* and also calls ff_thread_get_buffer() on the frame. * May be called before ff_progress_frame_get_buffer() in the cases where the
* AVFrame needs to be accessed before the ff_thread_get_buffer() call in
* ff_progress_frame_alloc().
* *
* @note: This must only be called by codecs with the * @note: This must only be called by codecs with the
* FF_CODEC_CAP_USES_PROGRESSFRAMES internal cap. * FF_CODEC_CAP_USES_PROGRESSFRAMES internal cap.
*/ */
int ff_progress_frame_alloc(struct AVCodecContext *avctx, ProgressFrame *f);
/**
* This function sets up the ProgressFrame, i.e. allocates ProgressFrame.f
* if needed, and also calls ff_thread_get_buffer() on the frame.
*
* @note: This must only be called by codecs with the
* FF_CODEC_CAP_USES_PROGRESSFRAMES internal cap.
* @see ff_progress_frame_alloc
*/
int ff_progress_frame_get_buffer(struct AVCodecContext *avctx, int ff_progress_frame_get_buffer(struct AVCodecContext *avctx,
ProgressFrame *f, int flags); ProgressFrame *f, int flags);