annotate w32thread.c @ 10392:32ee88f14239 libavcodec

Fix w32thread implementation to handle job count > thread_count.
author reimar
date Tue, 13 Oct 2009 13:03:12 +0000
parents 560708e850a4
children 5458953068fc
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1822
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
1 /*
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
2 * Copyright (c) 2004 Michael Niedermayer <michaelni@gmx.at>
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
3 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3036
diff changeset
4 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3036
diff changeset
5 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3036
diff changeset
6 * FFmpeg is free software; you can redistribute it and/or
1822
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
7 * modify it under the terms of the GNU Lesser General Public
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
8 * License as published by the Free Software Foundation; either
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3036
diff changeset
9 * version 2.1 of the License, or (at your option) any later version.
1822
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
10 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3036
diff changeset
11 * FFmpeg is distributed in the hope that it will be useful,
1822
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
14 * Lesser General Public License for more details.
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
15 *
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
16 * You should have received a copy of the GNU Lesser General Public
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3036
diff changeset
17 * License along with FFmpeg; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 2967
diff changeset
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1822
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
19 */
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
20 //#define DEBUG
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
21
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
22 #include "avcodec.h"
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
23
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
24 #define WIN32_LEAN_AND_MEAN
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
25 #include <windows.h>
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
26 #include <process.h>
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
27
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
28 typedef struct ThreadContext{
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
29 AVCodecContext *avctx;
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
30 HANDLE thread;
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
31 HANDLE work_sem;
10392
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
32 HANDLE job_sem;
1822
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
33 HANDLE done_sem;
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
34 int (*func)(AVCodecContext *c, void *arg);
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
35 void *arg;
10392
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
36 int argsize;
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
37 int *jobnr;
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
38 int *ret;
1822
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
39 }ThreadContext;
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
40
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
41
6469
6815571afbcf __stdcall -> WINAPI
ramiro
parents: 5542
diff changeset
42 static unsigned WINAPI attribute_align_arg thread_func(void *v){
1822
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
43 ThreadContext *c= v;
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
44
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
45 for(;;){
10392
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
46 int ret, jobnr;
1822
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
47 //printf("thread_func %X enter wait\n", (int)v); fflush(stdout);
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
48 WaitForSingleObject(c->work_sem, INFINITE);
10392
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
49 WaitForSingleObject(c->job_sem, INFINITE);
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
50 jobnr = (*c->jobnr)++;
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
51 ReleaseSemaphore(c->job_sem, 1, 0);
1822
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
52 //printf("thread_func %X after wait (func=%X)\n", (int)v, (int)c->func); fflush(stdout);
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
53 if(c->func)
10392
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
54 ret= c->func(c->avctx, (uint8_t *)c->arg + jobnr*c->argsize);
1822
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
55 else
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
56 return 0;
10392
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
57 if (c->ret)
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
58 c->ret[jobnr] = ret;
1822
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
59 //printf("thread_func %X signal complete\n", (int)v); fflush(stdout);
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
60 ReleaseSemaphore(c->done_sem, 1, 0);
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
61 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 1822
diff changeset
62
1822
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
63 return 0;
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
64 }
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
65
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
66 /**
5127
4dbe6578f811 misc spelling fixes
diego
parents: 4962
diff changeset
67 * Free what has been allocated by avcodec_thread_init().
4dbe6578f811 misc spelling fixes
diego
parents: 4962
diff changeset
68 * Must be called after decoding has finished, especially do not call while avcodec_thread_execute() is running.
1822
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
69 */
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
70 void avcodec_thread_free(AVCodecContext *s){
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
71 ThreadContext *c= s->thread_opaque;
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
72 int i;
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
73
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
74 for(i=0; i<s->thread_count; i++){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 1822
diff changeset
75
1822
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
76 c[i].func= NULL;
10392
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
77 }
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
78 ReleaseSemaphore(c[0].work_sem, s->thread_count, 0);
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
79 for(i=0; i<s->thread_count; i++){
1822
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
80 WaitForSingleObject(c[i].thread, INFINITE);
10044
560708e850a4 Fix a memleak with win32 threads: the handle returned by _beginthreadex
reimar
parents: 8129
diff changeset
81 if(c[i].thread) CloseHandle(c[i].thread);
1822
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
82 }
10392
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
83 if(c[0].work_sem) CloseHandle(c[0].work_sem);
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
84 if(c[0].job_sem) CloseHandle(c[0].job_sem);
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
85 if(c[0].done_sem) CloseHandle(c[0].done_sem);
1822
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
86
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
87 av_freep(&s->thread_opaque);
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
88 }
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
89
8129
a9734fe0811e Making it easier to send arbitrary structures as work orders to MT workers
romansh
parents: 6469
diff changeset
90 int avcodec_thread_execute(AVCodecContext *s, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size){
1822
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
91 ThreadContext *c= s->thread_opaque;
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
92 int i;
10392
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
93 int jobnr = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 1822
diff changeset
94
1822
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
95 assert(s == c->avctx);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 1822
diff changeset
96
1822
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
97 /* note, we can be certain that this is not called with the same AVCodecContext by different threads at the same time */
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
98
10392
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
99 for(i=0; i<s->thread_count; i++){
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
100 c[i].arg= arg;
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
101 c[i].argsize= size;
1822
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
102 c[i].func= func;
10392
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
103 c[i].ret= ret;
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
104 c[i].jobnr = &jobnr;
1822
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
105 }
10392
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
106 ReleaseSemaphore(c[0].work_sem, count, 0);
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
107 for(i=0; i<count; i++)
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
108 WaitForSingleObject(c[0].done_sem, INFINITE);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 1822
diff changeset
109
1822
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
110 return 0;
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
111 }
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
112
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
113 int avcodec_thread_init(AVCodecContext *s, int thread_count){
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
114 int i;
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
115 ThreadContext *c;
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
116 uint32_t threadid;
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
117
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
118 s->thread_count= thread_count;
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
119
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
120 assert(!s->thread_opaque);
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
121 c= av_mallocz(sizeof(ThreadContext)*thread_count);
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
122 s->thread_opaque= c;
10392
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
123 if(!(c[0].work_sem = CreateSemaphore(NULL, 0, INT_MAX, NULL)))
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
124 goto fail;
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
125 if(!(c[0].job_sem = CreateSemaphore(NULL, 1, 1, NULL)))
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
126 goto fail;
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
127 if(!(c[0].done_sem = CreateSemaphore(NULL, 0, INT_MAX, NULL)))
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
128 goto fail;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 1822
diff changeset
129
1822
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
130 for(i=0; i<thread_count; i++){
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
131 //printf("init semaphors %d\n", i); fflush(stdout);
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
132 c[i].avctx= s;
10392
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
133 c[i].work_sem = c[0].work_sem;
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
134 c[i].job_sem = c[0].job_sem;
32ee88f14239 Fix w32thread implementation to handle job count > thread_count.
reimar
parents: 10044
diff changeset
135 c[i].done_sem = c[0].done_sem;
1822
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
136
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
137 //printf("create thread %d\n", i); fflush(stdout);
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
138 c[i].thread = (HANDLE)_beginthreadex(NULL, 0, thread_func, &c[i], 0, &threadid );
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
139 if( !c[i].thread ) goto fail;
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
140 }
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
141 //printf("init done\n"); fflush(stdout);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 1822
diff changeset
142
1822
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
143 s->execute= avcodec_thread_execute;
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
144
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
145 return 0;
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
146 fail:
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
147 avcodec_thread_free(s);
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
148 return -1;
7366bb5c363f w32threads by (Gildas Bazin <gbazin at altern dot org>)
michael
parents:
diff changeset
149 }