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

avcodec/pthread_frame: Factor initializing single thread out

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2021-03-21 05:00:09 +01:00
parent df6dc331dd
commit 24ee151402
1 changed files with 82 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

153
libavcodec/pthread_frame.c
View File

@ -763,6 +763,85 @@ void ff_frame_thread_free(AVCodecContext *avctx, int thread_count)
avctx->codec = NULL; avctx->codec = NULL;
} }
static av_cold int init_thread(PerThreadContext *p,
FrameThreadContext *fctx, AVCodecContext *avctx,
AVCodecContext *src, const AVCodec *codec, int first)
{
AVCodecContext *copy = av_malloc(sizeof(AVCodecContext));
int err;
pthread_mutex_init(&p->mutex, NULL);
pthread_mutex_init(&p->progress_mutex, NULL);
pthread_cond_init(&p->input_cond, NULL);
pthread_cond_init(&p->progress_cond, NULL);
pthread_cond_init(&p->output_cond, NULL);
p->frame = av_frame_alloc();
if (!p->frame) {
av_freep(&copy);
return AVERROR(ENOMEM);
}
p->avpkt = av_packet_alloc();
if (!p->avpkt) {
av_freep(&copy);
return AVERROR(ENOMEM);
}
p->parent = fctx;
p->avctx = copy;
if (!copy) {
return AVERROR(ENOMEM);
}
*copy = *src;
copy->internal = av_malloc(sizeof(AVCodecInternal));
if (!copy->internal) {
copy->priv_data = NULL;
return AVERROR(ENOMEM);
}
*copy->internal = *src->internal;
copy->internal->thread_ctx = p;
copy->internal->last_pkt_props = p->avpkt;
copy->delay = avctx->delay;
if (codec->priv_data_size) {
copy->priv_data = av_mallocz(codec->priv_data_size);
if (!copy->priv_data) {
return AVERROR(ENOMEM);
}
if (codec->priv_class) {
*(const AVClass **)copy->priv_data = codec->priv_class;
err = av_opt_copy(copy->priv_data, src->priv_data);
if (err < 0)
return err;
}
}
if (!first)
copy->internal->is_copy = 1;
if (codec->init)
err = codec->init(copy);
if (err < 0) {
return err;
}
if (first)
update_context_from_thread(avctx, copy, 1);
atomic_init(&p->debug_threads, (copy->debug & FF_DEBUG_THREADS) != 0);
err = AVERROR(pthread_create(&p->thread, NULL, frame_worker_thread, p));
p->thread_init= !err;
if(!p->thread_init)
return err;
return 0;
}
int ff_frame_thread_init(AVCodecContext *avctx) int ff_frame_thread_init(AVCodecContext *avctx)
{ {
int thread_count = avctx->thread_count; int thread_count = avctx->thread_count;
@ -807,83 +886,13 @@ int ff_frame_thread_init(AVCodecContext *avctx)
avctx->delay = src->thread_count - 1; avctx->delay = src->thread_count - 1;
for (i = 0; i < thread_count; i++) { for (i = 0; i < thread_count; i++) {
AVCodecContext *copy = av_malloc(sizeof(AVCodecContext));
PerThreadContext *p = &fctx->threads[i]; PerThreadContext *p = &fctx->threads[i];
int first = !i;
pthread_mutex_init(&p->mutex, NULL); err = init_thread(p, fctx, avctx, src, codec, first);
pthread_mutex_init(&p->progress_mutex, NULL);
pthread_cond_init(&p->input_cond, NULL);
pthread_cond_init(&p->progress_cond, NULL);
pthread_cond_init(&p->output_cond, NULL);
p->frame = av_frame_alloc();
if (!p->frame) {
av_freep(&copy);
err = AVERROR(ENOMEM);
goto error;
}
p->avpkt = av_packet_alloc();
if (!p->avpkt) {
av_freep(&copy);
err = AVERROR(ENOMEM);
goto error;
}
p->parent = fctx;
p->avctx = copy;
if (!copy) {
err = AVERROR(ENOMEM);
goto error;
}
*copy = *src;
copy->internal = av_malloc(sizeof(AVCodecInternal));
if (!copy->internal) {
copy->priv_data = NULL;
err = AVERROR(ENOMEM);
goto error;
}
*copy->internal = *src->internal;
copy->internal->thread_ctx = p;
copy->internal->last_pkt_props = p->avpkt;
copy->delay = avctx->delay;
if (codec->priv_data_size) {
copy->priv_data = av_mallocz(codec->priv_data_size);
if (!copy->priv_data) {
err = AVERROR(ENOMEM);
goto error;
}
if (codec->priv_class) {
*(const AVClass **)copy->priv_data = codec->priv_class;
err = av_opt_copy(copy->priv_data, src->priv_data);
if (err < 0) if (err < 0)
goto error; goto error;
} }
}
if (i)
copy->internal->is_copy = 1;
if (codec->init)
err = codec->init(copy);
if (err) goto error;
if (!i)
update_context_from_thread(avctx, copy, 1);
atomic_init(&p->debug_threads, (copy->debug & FF_DEBUG_THREADS) != 0);
err = AVERROR(pthread_create(&p->thread, NULL, frame_worker_thread, p));
p->thread_init= !err;
if(!p->thread_init)
goto error;
}
return 0; return 0;