i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed lockup with 8 channel (or more) soundfiles

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5769 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
beveloper
2003-12-27 14:45:57 +00:00
parent 8dad9b1eb2
commit cf706dc774
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/media-add-ons/mixer/MixerUtils.cpp
+20 -1
View File
@@ -1,4 +1,5 @@
#include <MediaDefs.h> #include <MediaDefs.h>
#include <OS.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
@@ -111,8 +112,19 @@ fix_multiaudio_format(media_multi_audio_format *format)
format->matrix_mask = 0; format->matrix_mask = 0;
} }
break; break;
case 8:
if (count_nonzero_bits(format->channel_mask) != 8) {
// XXX not sure if 7.1 is like that:
format->channel_mask = B_CHANNEL_LEFT | B_CHANNEL_RIGHT | B_CHANNEL_REARLEFT | B_CHANNEL_REARRIGHT | B_CHANNEL_CENTER | B_CHANNEL_SUB | B_CHANNEL_SIDE_LEFT | B_CHANNEL_SIDE_RIGHT;
format->matrix_mask = 0;
}
break;
default: default:
if (count_nonzero_bits(format->channel_mask) != (int)format->channel_count) {
format->channel_mask = 0xffffffff;
format->matrix_mask = 0;
}
break; break;
} }
@@ -130,7 +142,14 @@ fix_multiaudio_format(media_multi_audio_format *format)
uint32 uint32
GetChannelMask(int channel, uint32 all_channel_masks) GetChannelMask(int channel, uint32 all_channel_masks)
{ {
ASSERT(channel <= count_nonzero_bits(all_channel_masks)); if (all_channel_masks == 0) {
debugger("Mixer: GetChannelMask: all_channel_masks == 0\n");
return 0;
}
if (channel > count_nonzero_bits(all_channel_masks)) {
debugger("Mixer: GetChannelMask: channel > count_nonzero_bits(all_channel_masks)\n");
return 0;
}
uint32 mask = 1; uint32 mask = 1;
int pos = 0; int pos = 0;