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

Added some debug output for unimplemented functionality. Cleaned up a bit,

Browse Source 
but should probably rewritten - I think it's already too complex now to solve
that whole task.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3402 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2003-06-03 02:57:26 +00:00
parent 11b92ae72b
commit 83d0693448
1 changed files with 146 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/media-add-ons/mixer/FillMixBuffer.cpp
+43 -92
View File
@@ -21,9 +21,7 @@ AudioMixer::FillMixBuffer(void *outbuffer, size_t ioSize)
{
case media_raw_audio_format::B_AUDIO_FLOAT:
{
float *outdata = (float*)outbuffer;
memset(outdata, 0, ioSize); // CHANGE_THIS
int sampleCount = int(fOutput.format.u.raw_audio.buffer_size / sizeof(float));
@@ -51,15 +49,13 @@ AudioMixer::FillMixBuffer(void *outbuffer, size_t ioSize)
{
case media_raw_audio_format::B_AUDIO_FLOAT:
{
float *indata = (float *)channel->fData;
if (split)
{ } // ADD_THIS
else if (mix)
{ } // ADD_THIS
else
{
if (split) {
printf("#### FillMixBuffer(): 1.Should split from B_AUDIO_FLOAT!\n");
} else if (mix) {
printf("#### FillMixBuffer(): 1.Should mix from B_AUDIO_FLOAT!\n");
} else {
int baseOffset = channel->fEventOffset / 4;
int maxOffset = int(channel->fDataSize / 4);
@@ -69,7 +65,6 @@ AudioMixer::FillMixBuffer(void *outbuffer, size_t ioSize)
for (int s = 0; s < sampleCount; s++)
{
outdata[s] = indata[inputSample];
indata[inputSample] = 0;
@@ -77,29 +72,23 @@ AudioMixer::FillMixBuffer(void *outbuffer, size_t ioSize)
inputSample = 0;
else
inputSample ++;
}
channel->fEventOffset = (channel->fEventOffset + fOutput.format.u.raw_audio.buffer_size) %
channel->fDataSize;
}
break;
}
case media_raw_audio_format::B_AUDIO_SHORT:
{
int16 *indata = (int16 *)channel->fData;
if (split)
{ }
else if (mix)
{ }
else
{
if (split) {
printf("#### FillMixBuffer(): 2.Should split from B_AUDIO_SHORT!\n");
} else if (mix) {
printf("#### FillMixBuffer(): 2.Should mix from B_AUDIO_SHORT!\n");
} else {
int baseOffset = channel->fEventOffset / 2;
int maxOffset = int(channel->fDataSize / 2);
@@ -109,30 +98,24 @@ AudioMixer::FillMixBuffer(void *outbuffer, size_t ioSize)
for (int s = 0; s < sampleCount; s++)
{
outdata[s] = outdata[s] + (indata[inputSample] / 32768.0); // CHANGE_THIS indata[inputSample] = 0;
outdata[s] = outdata[s] + (indata[inputSample] / 32768.0);
// CHANGE_THIS indata[inputSample] = 0;
if (s == offsetWrap)
inputSample = 0;
else
inputSample ++;
}
channel->fEventOffset = (channel->fEventOffset + fOutput.format.u.raw_audio.buffer_size / 2) %
channel->fDataSize;
}
break;
}
} // input format
} // samplerate
} else
printf("#### sample rate does not match - don't do anything\n");
} // data available
} // channel loop
/*
@@ -151,21 +134,18 @@ AudioMixer::FillMixBuffer(void *outbuffer, size_t ioSize)
// outdata[sample] = 1.0;
// else if (outdata[sample] < -1.0)
// outdata[sample] = -1.0;
}
}
break;
} // cur-case
case media_raw_audio_format::B_AUDIO_SHORT:
{
int16 *outdata = (int16*)outbuffer;
int sampleCount = int(fOutput.format.u.raw_audio.buffer_size / sizeof(int16));
int *clipoffset = new int[sampleCount]; // keep a running tally of +/- clipping so we don't get rollaround distortion
int *clipoffset = new int[sampleCount];
// keep a running tally of +/- clipping so we don't get rollaround distortion
// we only need this for int/char audio types - not float
memset(outdata, 0, ioSize);
@@ -177,14 +157,14 @@ AudioMixer::FillMixBuffer(void *outbuffer, size_t ioSize)
// }
int mixerInputs = fMixerInputs.CountItems();
if (mixerInputs == 0)
printf("#### mixer null\n");
for (int c = 0; c < mixerInputs; c++)
{
mixer_input *channel = (mixer_input *)fMixerInputs.ItemAt(c);
if (channel->enabled == true) // only use if there are buffers waiting (seems to be broken atm...)
{
// if (channel->fProducerDataStatus == B_DATA_AVAILABLE)
// printf("B_DATA_AVAILABLE\n");
// else if (channel->fProducerDataStatus == B_DATA_NOT_AVAILABLE)
@@ -200,15 +180,11 @@ AudioMixer::FillMixBuffer(void *outbuffer, size_t ioSize)
{
switch (channel->fInput.format.u.raw_audio.format)
{
case media_raw_audio_format::B_AUDIO_FLOAT:
{
float *indata = (float *)channel->fData;
if (split)
{
if (split) {
int baseOffset = channel->fEventOffset / 4;
int maxOffset = int(channel->fDataSize / 4);
@@ -218,7 +194,6 @@ AudioMixer::FillMixBuffer(void *outbuffer, size_t ioSize)
for (int s = 0; s < sampleCount; s += 2)
{
if ((outdata[s] + int16(32767 * indata[inputSample])) > 32767)
clipoffset[s] = clipoffset[s] + 1;
else if ((outdata[s] + int16(32767 * indata[inputSample])) < -32768)
@@ -239,12 +214,9 @@ AudioMixer::FillMixBuffer(void *outbuffer, size_t ioSize)
else
inputSample ++;
}
}
else if (mix)
{}
else
{
} else if (mix) {
printf("#### FillMixBuffer(): 3.Should mix from B_AUDIO_FLOAT!\n");
} else {
int baseOffset = channel->fEventOffset / 4;
int maxOffset = int(channel->fDataSize / 4);
@@ -272,32 +244,26 @@ AudioMixer::FillMixBuffer(void *outbuffer, size_t ioSize)
inputSample = 0;
else
inputSample ++;
}
}
channel->fEventOffset += (fOutput.format.u.raw_audio.buffer_size * 2);
if (channel->fEventOffset >= channel->fDataSize)
channel->fEventOffset -= channel->fDataSize;
}
break;
}
case media_raw_audio_format::B_AUDIO_SHORT:
{
int16 *indata = (int16 *)channel->fData;
if (split)
{ }
else if (mix)
{ }
else
{
if (split) {
printf("#### FillMixBuffer(): 4.Should split from B_AUDIO_SHORT!\n");
} else if (mix) {
printf("#### FillMixBuffer(): 4.Should mix from B_AUDIO_SHORT!\n");
} else {
printf("#### FillMixBuffer(): 4.Should copy from B_AUDIO_SHORT!\n");
int baseOffset = channel->fEventOffset / 2;
int maxOffset = int(channel->fDataSize / 2);
@@ -332,20 +298,15 @@ AudioMixer::FillMixBuffer(void *outbuffer, size_t ioSize)
channel->fEventOffset = (channel->fEventOffset + fOutput.format.u.raw_audio.buffer_size);
if (channel->fEventOffset >= channel->fDataSize)
channel->fEventOffset -= channel->fDataSize;
}
break;
}
case media_raw_audio_format::B_AUDIO_INT:
{
int32 *indata = (int32 *)channel->fData;
if (split)
{
if (split) {
int baseOffset = channel->fEventOffset / 4;
int maxOffset = int(channel->fDataSize / 4);
@@ -353,9 +314,7 @@ AudioMixer::FillMixBuffer(void *outbuffer, size_t ioSize)
int inputSample = baseOffset;
for (int s = 0; s < sampleCount; s += 2)
{
for (int s = 0; s < sampleCount; s += 2) {
if ((outdata[s] + (indata[inputSample] / 65536)) > 32767)
clipoffset[s] = clipoffset[s] + 1;
else if ((outdata[s] + (indata[inputSample] / 65536)) < -32768)
@@ -376,13 +335,9 @@ AudioMixer::FillMixBuffer(void *outbuffer, size_t ioSize)
else
inputSample ++;
}
}
else if (mix)
{ }
else
{
} else if (mix) {
printf("#### FillMixBuffer(): 5.Should mix from B_AUDIO_INT!\n");
} else {
int baseOffset = channel->fEventOffset / 4;
int maxOffset = int(channel->fDataSize / 4);
@@ -390,9 +345,7 @@ AudioMixer::FillMixBuffer(void *outbuffer, size_t ioSize)
int inputSample = baseOffset;
for (int s = 0; s < sampleCount; s++)
{
for (int s = 0; s < sampleCount; s++) {
if ((outdata[s] + (indata[inputSample] / 65536)) > 32767)
clipoffset[s] = clipoffset[s] + 1;
else if ((outdata[s] + (indata[inputSample] / 65536)) < -32768)
@@ -405,25 +358,21 @@ AudioMixer::FillMixBuffer(void *outbuffer, size_t ioSize)
inputSample = 0;
else
inputSample ++;
}
}
}
channel->fEventOffset = (channel->fEventOffset + (fOutput.format.u.raw_audio.buffer_size * 2)) %
channel->fDataSize;
channel->fEventOffset = (channel->fEventOffset + (fOutput.format.u.raw_audio.buffer_size * 2))
% channel->fDataSize;
break;
}
}
} else
printf("#### sample rate does not match - don't do anything\n");
}
}
}
// use our clipoffset to determine correct limits
for (int frameStart = 0; frameStart < sampleCount; frameStart += outChannels)
{
for (int channel = 0; channel < outChannels; channel ++)
@@ -442,9 +391,11 @@ AudioMixer::FillMixBuffer(void *outbuffer, size_t ioSize)
}
delete clipoffset;
break;
}
default:
printf("##### oh no, unknown conversion %ld #####\n", fOutput.format.u.raw_audio.format);
}
return B_OK;