griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Sequencer: multi-threaded histogram calculation

Browse Source 
This gives some percentage of speedup, which compensates slowdown
caused by converting image buffer into display space.

Used OpenMP for this. Still feel skeptic about this, discussed with
Brecht and we decided this approach actually could be used since
seems all the platforms has got OpenMP issues solved.

Waveform and vector scopes are still single-threaded since they're
a bit tricker to be done multi-threaded and probably not so commonly
used.
This commit is contained in:
Sergey Sharybin
2012-09-05 11:43:11 +00:00
parent 54cf098492
commit c6599979c7
1 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
source/blender/editors/space_sequencer/sequencer_scopes.c
View File

@@ -460,12 +460,28 @@ static ImBuf *make_histogram_view_from_ibuf_byte(ImBuf *ibuf)
memset(bins, 0, sizeof(bins));
#pragma omp parallel for shared(bins, src, ibuf) private(x, y) if (ibuf->y >= 256)
for (y = 0; y < ibuf->y; y++) {
unsigned int cur_bins[3][512];
memset(cur_bins, 0, sizeof(cur_bins));
for (x = 0; x < ibuf->x; x++) {
bins[0][*src++]++;
bins[1][*src++]++;
bins[2][*src++]++;
src++;
unsigned char *pixel = src + (y * ibuf->x + x) * 4;
cur_bins[0][pixel[0]]++;
cur_bins[1][pixel[1]]++;
cur_bins[2][pixel[2]]++;
}
#pragma omp critical
{
int i;
for (i = 0; i < 512; i++) {
bins[0][i] += cur_bins[0][i];
bins[1][i] += cur_bins[1][i];
bins[2][i] += cur_bins[2][i];
}
}
}
@@ -490,7 +506,7 @@ static ImBuf *make_histogram_view_from_ibuf_byte(ImBuf *ibuf)
return rval;
}
static int get_bin_float(float f)
BLI_INLINE int get_bin_float(float f)
{
if (f < -0.25f) {
return 0;
@@ -512,12 +528,28 @@ static ImBuf *make_histogram_view_from_ibuf_float(ImBuf *ibuf)
memset(bins, 0, sizeof(bins));
#pragma omp parallel for shared(bins, src, ibuf) private(x, y) if (ibuf->y >= 256)
for (y = 0; y < ibuf->y; y++) {
unsigned int cur_bins[3][512];
memset(cur_bins, 0, sizeof(cur_bins));
for (x = 0; x < ibuf->x; x++) {
bins[0][get_bin_float(*src++)]++;
bins[1][get_bin_float(*src++)]++;
bins[2][get_bin_float(*src++)]++;
src++;
float *pixel = src + (y * ibuf->x + x) * 4;
cur_bins[0][get_bin_float(pixel[0])]++;
cur_bins[1][get_bin_float(pixel[1])]++;
cur_bins[2][get_bin_float(pixel[2])]++;
}
#pragma omp critical
{
int i;
for (i = 0; i < 512; i++) {
bins[0][i] += cur_bins[0][i];
bins[1][i] += cur_bins[1][i];
bins[2][i] += cur_bins[2][i];
}
}
}