/*
- *
* This file is part of Libav.
*
* Libav is free software; you can redistribute it and/or
int nb_threads;
pthread_t *workers;
- action_func *func;
+ avfilter_action_func *func;
- /* per-execute perameters */
+ /* per-execute parameters */
AVFilterContext *ctx;
void *arg;
int *rets;
pthread_cond_t current_job_cond;
pthread_mutex_t current_job_lock;
int current_job;
+ unsigned int current_execute;
int done;
} ThreadContext;
ThreadContext *c = v;
int our_job = c->nb_jobs;
int nb_threads = c->nb_threads;
+ unsigned int last_execute = 0;
int self_id;
pthread_mutex_lock(&c->current_job_lock);
if (c->current_job == nb_threads + c->nb_jobs)
pthread_cond_signal(&c->last_job_cond);
- pthread_cond_wait(&c->current_job_cond, &c->current_job_lock);
+ while (last_execute == c->current_execute && !c->done)
+ pthread_cond_wait(&c->current_job_cond, &c->current_job_lock);
+ last_execute = c->current_execute;
our_job = self_id;
if (c->done) {
static void slice_thread_park_workers(ThreadContext *c)
{
- pthread_cond_wait(&c->last_job_cond, &c->current_job_lock);
+ while (c->current_job != c->nb_threads + c->nb_jobs)
+ pthread_cond_wait(&c->last_job_cond, &c->current_job_lock);
pthread_mutex_unlock(&c->current_job_lock);
}
-static int thread_execute(AVFilterContext *ctx, action_func *func,
+static int thread_execute(AVFilterContext *ctx, avfilter_action_func *func,
void *arg, int *ret, int nb_jobs)
{
ThreadContext *c = ctx->graph->internal->thread;
c->rets = &dummy_ret;
c->nb_rets = 1;
}
+ c->current_execute++;
+
pthread_cond_broadcast(&c->current_job_cond);
slice_thread_park_workers(c);
return 0;
}
-static int thread_init(ThreadContext *c, int nb_threads)
+static int thread_init_internal(ThreadContext *c, int nb_threads)
{
int i, ret;
if (!graph->internal->thread)
return AVERROR(ENOMEM);
- ret = thread_init(graph->internal->thread, graph->nb_threads);
+ ret = thread_init_internal(graph->internal->thread, graph->nb_threads);
if (ret <= 1) {
av_freep(&graph->internal->thread);
graph->thread_type = 0;