HANDLE job_sem;
HANDLE done_sem;
int (*func)(AVCodecContext *c, void *arg);
+ int (*func2)(AVCodecContext *c, void *arg, int, int);
void *arg;
int argsize;
int *jobnr;
int *ret;
+ int threadnr;
}ThreadContext;
int ret, jobnr;
//printf("thread_func %X enter wait\n", (int)v); fflush(stdout);
WaitForSingleObject(c->work_sem, INFINITE);
+ // avoid trying to access jobnr if we should quit
+ if (!c->func && !c->func2)
+ break;
WaitForSingleObject(c->job_sem, INFINITE);
jobnr = (*c->jobnr)++;
ReleaseSemaphore(c->job_sem, 1, 0);
if(c->func)
ret= c->func(c->avctx, (uint8_t *)c->arg + jobnr*c->argsize);
else
- return 0;
+ ret= c->func2(c->avctx, c->arg, jobnr, c->threadnr);
if (c->ret)
c->ret[jobnr] = ret;
//printf("thread_func %X signal complete\n", (int)v); fflush(stdout);
for(i=0; i<s->thread_count; i++){
c[i].func= NULL;
+ c[i].func2= NULL;
}
ReleaseSemaphore(c[0].work_sem, s->thread_count, 0);
for(i=0; i<s->thread_count; i++){
av_freep(&s->thread_opaque);
}
-int avcodec_thread_execute(AVCodecContext *s, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size){
+static int avcodec_thread_execute(AVCodecContext *s, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size){
ThreadContext *c= s->thread_opaque;
int i;
int jobnr = 0;
return 0;
}
+static int avcodec_thread_execute2(AVCodecContext *s, int (*func)(AVCodecContext *c2, void *arg2, int, int),void *arg, int *ret, int count){
+ ThreadContext *c= s->thread_opaque;
+ int i;
+ for(i=0; i<s->thread_count; i++)
+ c[i].func2 = func;
+ avcodec_thread_execute(s, NULL, arg, ret, count, 0);
+}
+
int avcodec_thread_init(AVCodecContext *s, int thread_count){
int i;
ThreadContext *c;
s->thread_count= thread_count;
+ if (thread_count <= 1)
+ return 0;
+
assert(!s->thread_opaque);
c= av_mallocz(sizeof(ThreadContext)*thread_count);
s->thread_opaque= c;
c[i].work_sem = c[0].work_sem;
c[i].job_sem = c[0].job_sem;
c[i].done_sem = c[0].done_sem;
+ c[i].threadnr = i;
//printf("create thread %d\n", i); fflush(stdout);
c[i].thread = (HANDLE)_beginthreadex(NULL, 0, thread_func, &c[i], 0, &threadid );
//printf("init done\n"); fflush(stdout);
s->execute= avcodec_thread_execute;
+ s->execute2= avcodec_thread_execute2;
return 0;
fail: