Fix formatting issues
This commit is contained in:
Sam Ellicott
parent
36ef604baf
commit
08eb40a900
|
|
@ -10,24 +10,25 @@
|
|||
|
||||
#ifndef CCEMBEDDED
|
||||
|
||||
void DoDFT( float * outbins, float * frequencies, int bins, float * databuffer, int place_in_data_buffer, int size_of_data_buffer, float q )
|
||||
void DoDFT( float *outbins, float *frequencies, int bins, float *databuffer,
|
||||
int place_in_data_buffer, int size_of_data_buffer, float q )
|
||||
{
|
||||
int i, j;
|
||||
for( i = 0; i < bins; i++ )
|
||||
for ( i = 0; i < bins; i++ )
|
||||
{
|
||||
float freq = frequencies[i];
|
||||
float freq = frequencies[ i ];
|
||||
float phi = 0;
|
||||
int sampleplace = place_in_data_buffer;
|
||||
float advance = 3.14159*2.0/freq;
|
||||
float advance = 3.14159 * 2.0 / freq;
|
||||
|
||||
float binqtys = 0;
|
||||
float binqtyc = 0;
|
||||
|
||||
for( j = 0; j <= freq * q; j++ )
|
||||
for ( j = 0; j <= freq * q; j++ )
|
||||
{
|
||||
float sample = databuffer[sampleplace];
|
||||
sampleplace = (sampleplace-1+size_of_data_buffer)%size_of_data_buffer;
|
||||
//printf( "%d\n", sampleplace );
|
||||
float sample = databuffer[ sampleplace ];
|
||||
sampleplace = ( sampleplace - 1 + size_of_data_buffer ) % size_of_data_buffer;
|
||||
// printf( "%d\n", sampleplace );
|
||||
float sv = sin( phi ) * sample;
|
||||
float cv = cos( phi ) * sample;
|
||||
|
||||
|
|
@ -38,36 +39,37 @@ void DoDFT( float * outbins, float * frequencies, int bins, float * databuffer,
|
|||
}
|
||||
|
||||
float amp = sqrtf( binqtys * binqtys + binqtyc * binqtyc );
|
||||
outbins[i] = amp / freq / q;
|
||||
outbins[ i ] = amp / freq / q;
|
||||
}
|
||||
}
|
||||
|
||||
void DoDFTQuick( float * outbins, float * frequencies, int bins, const float * databuffer, int place_in_data_buffer, int size_of_data_buffer, float q, float speedup )
|
||||
void DoDFTQuick( float *outbins, float *frequencies, int bins, const float *databuffer,
|
||||
int place_in_data_buffer, int size_of_data_buffer, float q, float speedup )
|
||||
{
|
||||
int i, j;
|
||||
|
||||
for( i = 0; i < bins; i++ )
|
||||
for ( i = 0; i < bins; i++ )
|
||||
{
|
||||
int flirts = 0;
|
||||
|
||||
float freq = frequencies[i];
|
||||
float freq = frequencies[ i ];
|
||||
float phi = 0;
|
||||
int ftq = freq * q;
|
||||
int sampleplace = place_in_data_buffer;
|
||||
float advance = 3.14159*2.0/freq;
|
||||
float advance = 3.14159 * 2.0 / freq;
|
||||
|
||||
float binqtys = 0;
|
||||
float binqtyc = 0;
|
||||
|
||||
int skip = floor( ftq / speedup );
|
||||
if( skip == 0 ) skip = 1;
|
||||
if ( skip == 0 ) skip = 1;
|
||||
advance *= skip;
|
||||
|
||||
for( j = 0; j <= ftq; j += skip )
|
||||
for ( j = 0; j <= ftq; j += skip )
|
||||
{
|
||||
float sample = databuffer[sampleplace];
|
||||
sampleplace = (sampleplace-skip+size_of_data_buffer)%size_of_data_buffer;
|
||||
//printf( "%d\n", sampleplace );
|
||||
float sample = databuffer[ sampleplace ];
|
||||
sampleplace = ( sampleplace - skip + size_of_data_buffer ) % size_of_data_buffer;
|
||||
// printf( "%d\n", sampleplace );
|
||||
float sv = sinf( phi ) * sample;
|
||||
float cv = cosf( phi ) * sample;
|
||||
|
||||
|
|
@ -79,25 +81,24 @@ void DoDFTQuick( float * outbins, float * frequencies, int bins, const float * d
|
|||
}
|
||||
|
||||
float amp = sqrtf( binqtys * binqtys + binqtyc * binqtyc );
|
||||
outbins[i] = amp / freq / q * skip;
|
||||
outbins[ i ] = amp / freq / q * skip;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
////////////////////////////DFT Progressive is for embedded systems, primarily.
|
||||
|
||||
|
||||
static float * gbinqtys;
|
||||
static float * gbinqtyc;
|
||||
static float * phis;
|
||||
static float * gfrequencies;
|
||||
static float * lastbins;
|
||||
static float * advances;
|
||||
static float * goutbins;
|
||||
static int gbins;
|
||||
static float gq;
|
||||
static float gspeedup;
|
||||
static float *gbinqtys;
|
||||
static float *gbinqtyc;
|
||||
static float *phis;
|
||||
static float *gfrequencies;
|
||||
static float *lastbins;
|
||||
static float *advances;
|
||||
static float *goutbins;
|
||||
static int gbins;
|
||||
static float gq;
|
||||
static float gspeedup;
|
||||
|
||||
#define PROGIIR .005
|
||||
|
||||
|
|
@ -105,53 +106,53 @@ void HandleProgressive( float sample )
|
|||
{
|
||||
int i;
|
||||
|
||||
for( i = 0; i < gbins; i++ )
|
||||
for ( i = 0; i < gbins; i++ )
|
||||
{
|
||||
float thiss = sinf( phis[i] ) * sample;
|
||||
float thisc = cosf( phis[i] ) * sample;
|
||||
float thiss = sinf( phis[ i ] ) * sample;
|
||||
float thisc = cosf( phis[ i ] ) * sample;
|
||||
|
||||
float s = gbinqtys[i] = gbinqtys[i] * (1.-PROGIIR) + thiss * PROGIIR;
|
||||
float c = gbinqtyc[i] = gbinqtyc[i] * (1.-PROGIIR) + thisc * PROGIIR;
|
||||
float s = gbinqtys[ i ] = gbinqtys[ i ] * ( 1. - PROGIIR ) + thiss * PROGIIR;
|
||||
float c = gbinqtyc[ i ] = gbinqtyc[ i ] * ( 1. - PROGIIR ) + thisc * PROGIIR;
|
||||
|
||||
phis[i] += advances[i];
|
||||
if( phis[i] > 6.283 ) phis[i]-=6.283;
|
||||
phis[ i ] += advances[ i ];
|
||||
if ( phis[ i ] > 6.283 ) phis[ i ] -= 6.283;
|
||||
|
||||
goutbins[i] = sqrtf( s * s + c * c );
|
||||
goutbins[ i ] = sqrtf( s * s + c * c );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void DoDFTProgressive( float * outbins, float * frequencies, int bins, const float * databuffer, int place_in_data_buffer, int size_of_data_buffer, float q, float speedup )
|
||||
void DoDFTProgressive( float *outbins, float *frequencies, int bins, const float *databuffer,
|
||||
int place_in_data_buffer, int size_of_data_buffer, float q, float speedup )
|
||||
{
|
||||
int i;
|
||||
static int last_place;
|
||||
|
||||
if( gbins != bins )
|
||||
if ( gbins != bins )
|
||||
{
|
||||
if( gbinqtys ) free( gbinqtys );
|
||||
if( gbinqtyc ) free( gbinqtyc );
|
||||
if( phis ) free( phis );
|
||||
if( lastbins ) free( lastbins );
|
||||
if( advances ) free( advances );
|
||||
if ( gbinqtys ) free( gbinqtys );
|
||||
if ( gbinqtyc ) free( gbinqtyc );
|
||||
if ( phis ) free( phis );
|
||||
if ( lastbins ) free( lastbins );
|
||||
if ( advances ) free( advances );
|
||||
|
||||
gbinqtys = malloc( sizeof(float)*bins );
|
||||
gbinqtyc = malloc( sizeof(float)*bins );
|
||||
phis = malloc( sizeof(float)*bins );
|
||||
lastbins = malloc( sizeof(float)*bins );
|
||||
advances = malloc( sizeof(float)*bins );
|
||||
|
||||
memset( gbinqtys, 0, sizeof(float)*bins );
|
||||
memset( gbinqtyc, 0, sizeof(float)*bins );
|
||||
memset( phis, 0, sizeof(float)*bins );
|
||||
memset( lastbins, 0, sizeof(float)*bins );
|
||||
gbinqtys = malloc( sizeof( float ) * bins );
|
||||
gbinqtyc = malloc( sizeof( float ) * bins );
|
||||
phis = malloc( sizeof( float ) * bins );
|
||||
lastbins = malloc( sizeof( float ) * bins );
|
||||
advances = malloc( sizeof( float ) * bins );
|
||||
|
||||
memset( gbinqtys, 0, sizeof( float ) * bins );
|
||||
memset( gbinqtyc, 0, sizeof( float ) * bins );
|
||||
memset( phis, 0, sizeof( float ) * bins );
|
||||
memset( lastbins, 0, sizeof( float ) * bins );
|
||||
}
|
||||
memcpy( outbins, lastbins, sizeof(float)*bins );
|
||||
memcpy( outbins, lastbins, sizeof( float ) * bins );
|
||||
|
||||
for( i = 0; i < bins; i++ )
|
||||
for ( i = 0; i < bins; i++ )
|
||||
{
|
||||
float freq = frequencies[i];
|
||||
advances[i] = 3.14159*2.0/freq;
|
||||
float freq = frequencies[ i ];
|
||||
advances[ i ] = 3.14159 * 2.0 / freq;
|
||||
}
|
||||
|
||||
gbins = bins;
|
||||
|
|
@ -160,36 +161,28 @@ void DoDFTProgressive( float * outbins, float * frequencies, int bins, const flo
|
|||
gspeedup = speedup;
|
||||
gq = q;
|
||||
|
||||
place_in_data_buffer = (place_in_data_buffer+1)%size_of_data_buffer;
|
||||
place_in_data_buffer = ( place_in_data_buffer + 1 ) % size_of_data_buffer;
|
||||
|
||||
int didrun = 0;
|
||||
for( i = last_place; i != place_in_data_buffer; i = (i+1)%size_of_data_buffer )
|
||||
for ( i = last_place; i != place_in_data_buffer; i = ( i + 1 ) % size_of_data_buffer )
|
||||
{
|
||||
float fin = ((float)((int)(databuffer[i] * 127))) / 127.0; //simulate 8-bit input (it looks FINE!)
|
||||
float fin = ( (float)( (int)( databuffer[ i ] * 127 ) ) ) /
|
||||
127.0; // simulate 8-bit input (it looks FINE!)
|
||||
HandleProgressive( fin );
|
||||
didrun = 1;
|
||||
}
|
||||
last_place = place_in_data_buffer;
|
||||
|
||||
if( didrun )
|
||||
{
|
||||
memcpy( lastbins, outbins, sizeof(float)*bins );
|
||||
}
|
||||
|
||||
/* for( i = 0; i < bins; i++ )
|
||||
{
|
||||
printf( "%0.2f ", outbins[i]*100 );
|
||||
}
|
||||
printf( "\n" );*/
|
||||
if ( didrun ) { memcpy( lastbins, outbins, sizeof( float ) * bins ); }
|
||||
|
||||
/* for( i = 0; i < bins; i++ )
|
||||
{
|
||||
printf( "%0.2f ", outbins[i]*100 );
|
||||
}
|
||||
printf( "\n" );*/
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/////////////////////////////INTEGER DFT
|
||||
|
||||
|
||||
|
|
@ -223,111 +216,111 @@ void HandleProgressiveInt( int8_t sample1, int8_t sample2 )
|
|||
|
||||
//Estimated 78 minimum instructions... So for two pairs each... just over 4ksps, theoretical.
|
||||
//Running overall at ~2kHz. With GCC: YUCK! 102 cycles!!!
|
||||
for( i = 0; i < gbins; i++ ) //Loop, fixed size = 3 + 2 cycles N/A
|
||||
for( i = 0; i < gbins; i++ ) //Loop, fixed size = 3 + 2 cycles N/A
|
||||
{
|
||||
//12 cycles MIN
|
||||
adv = *(ds++); //Read, indirect from RAM (and increment) 2+2 cycles 4
|
||||
ipl = *(ds++); //Read, indirect from RAM (and increment) 2+2 cycles 4
|
||||
adv = *(ds++); //Read, indirect from RAM (and increment) 2+2 cycles 4
|
||||
ipl = *(ds++); //Read, indirect from RAM (and increment) 2+2 cycles 4
|
||||
|
||||
//13 cycles MIN
|
||||
ipl += adv; //Advance, 16bit += 16bit, 1 + 1 cycles 2
|
||||
localipl = (ipl>>8)<<1; //Select upper 8 bits 1 cycles 1 *** AS/IS: 4
|
||||
ipl += adv; //Advance, 16bit += 16bit, 1 + 1 cycles 2
|
||||
localipl = (ipl>>8)<<1; //Select upper 8 bits, 1 cycle 1 *** AS/IS: 4
|
||||
|
||||
st = &sintable[localipl];
|
||||
s1 = *(st++); //Read s1 component out of table. 2+2 cycles 2
|
||||
c1 = *st; //Read c1 component out of table. 2 cycles 2 *** AS/IS: 4
|
||||
s1 = *(st++); //Read s1 component out of table. 2+2 cycles 2
|
||||
c1 = *st; //Read c1 component out of table. 2 cycles 2 *** AS/IS: 4
|
||||
|
||||
ts = (s1 * sample1); // 8 x 8 multiply signed + copy R1 out. zero MSB ts 2 ->Deferred
|
||||
tc = (c1 * sample1); // 8 x 8 multiply signed + copy R1 out. zero MSB tc 2 ->Deferred
|
||||
ts = (s1 * sample1); // 8 x 8 multiply signed + copy R1 out. zero MSB ts 2 ->Deferred
|
||||
tc = (c1 * sample1); // 8 x 8 multiply signed + copy R1 out. zero MSB tc 2 ->Deferred
|
||||
|
||||
|
||||
//15 cycles MIN
|
||||
ipl += adv; //Advance, 16bit += 16bit, 1 + 1 cycles 2
|
||||
localipl = (ipl>>8)<<1; //Select upper 8 bits 1 cycles 1 *** AS/IS: 4
|
||||
ipl += adv; //Advance, 16bit += 16bit, 1 + 1 cycles 2
|
||||
localipl = (ipl>>8)<<1; //Select upper 8 bits 1 cycles 1 *** AS/IS: 4
|
||||
|
||||
// need to load Z with 'sintable' and add localipl 2
|
||||
// need to load Z with 'sintable' and add localipl 2
|
||||
st = &sintable[localipl];
|
||||
s1 = *(st++); //Read s1 component out of table. 2 cycles 2
|
||||
c1 = *st; //Read c1 component out of table. 2 cycles 2 *** AS/IS: 4
|
||||
s1 = *(st++); //Read s1 component out of table. 2 cycles 2
|
||||
c1 = *st; //Read c1 component out of table. 2 cycles 2 *** AS/IS: 4
|
||||
|
||||
ts += (s1 * sample2); // 8 x 8 multiply signed + add R1 out. 3 ->Deferred
|
||||
tc += (c1 * sample2); // 8 x 8 multiply signed + add R1 out. 3 ->Deferred
|
||||
ts += ( s1 * sample2 ); // 8 x 8 multiply signed + add R1 out. 3 ->Deferred
|
||||
tc += ( c1 * sample2 ); // 8 x 8 multiply signed + add R1 out. 3 ->Deferred
|
||||
|
||||
|
||||
//Add TS and TC to the datspace stuff. (24 instructions)
|
||||
tmp1 = (*ds); //Read out, sin component. 4 Accurate.
|
||||
tmp1 -= tmp1>>7; //Subtract from the MSB (with carry) 2 -> 6 AS/IS: 7+7 = 14
|
||||
tmp1 += ts>>7; //Add MSBs with carry 2 -> 6 AS/IS: 6
|
||||
// Add TS and TC to the datspace stuff. (24 instructions)
|
||||
tmp1 = ( *ds ); // Read out, sin component. 4 Accurate
|
||||
tmp1 -= tmp1 >> 7; // Subtract from the MSB (with carry) 2 -> 6 AS/IS: 7+7 = 14
|
||||
tmp1 += ts >> 7; // Add MSBs with carry 2 -> 6 AS/IS: 6
|
||||
|
||||
*(ds++) = tmp1; //Store values back 4
|
||||
*( ds++ ) = tmp1; // Store values back 4
|
||||
|
||||
tmp1 = *ds; //Read out, sin component. 4
|
||||
tmp1 -= tmp1>>7; //Subtract from the MSB (with carry) 2 -> 6 AS/IS: 7+7 = 14
|
||||
tmp1 += tc>>7; //Add MSBs with carry 2 -> 6 AS/IS: 6
|
||||
tmp1 = *ds; // Read out, sin component. 4
|
||||
tmp1 -= tmp1 >> 7; // Subtract from the MSB (with carry) 2 -> 6 AS/IS: 7+7 = 14
|
||||
tmp1 += tc >> 7; // Add MSBs with carry 2 -> 6 AS/IS: 6
|
||||
|
||||
*ds++ = tmp1; //Store values back 4
|
||||
*ds++ = tmp1; // Store values back 4
|
||||
|
||||
*(ds-3) = ipl; //Store values back 4 AS/IS: 6
|
||||
*( ds - 3 ) = ipl; // Store values back 4 AS/IS: 6
|
||||
|
||||
//AS-IS: 8 loop overhead.
|
||||
}
|
||||
}
|
||||
|
||||
void DoDFTProgressiveInteger( float * outbins, float * frequencies, int bins, const float * databuffer, int place_in_data_buffer, int size_of_data_buffer, float q, float speedup )
|
||||
void DoDFTProgressiveInteger( float *outbins, float *frequencies, int bins, const float *databuffer,
|
||||
int place_in_data_buffer, int size_of_data_buffer, float q, float speedup )
|
||||
{
|
||||
int i;
|
||||
static int last_place;
|
||||
|
||||
if( !donefirstrun )
|
||||
if ( !donefirstrun )
|
||||
{
|
||||
donefirstrun = 1;
|
||||
for( i = 0; i < 256; i++ )
|
||||
for ( i = 0; i < 256; i++ )
|
||||
{
|
||||
sintable[i*2+0] = (int8_t)((sinf( i / 256.0 * 6.283 ) * 127.0));
|
||||
sintable[i*2+1] = (int8_t)((cosf( i / 256.0 * 6.283 ) * 127.0));
|
||||
sintable[ i * 2 + 0 ] = ( int8_t )( ( sinf( i / 256.0 * 6.283 ) * 127.0 ) );
|
||||
sintable[ i * 2 + 1 ] = ( int8_t )( ( cosf( i / 256.0 * 6.283 ) * 127.0 ) );
|
||||
}
|
||||
}
|
||||
|
||||
if( gbins != bins )
|
||||
if ( gbins != bins )
|
||||
{
|
||||
gbins = bins;
|
||||
if( datspace ) free( datspace );
|
||||
if ( datspace ) free( datspace );
|
||||
datspace = malloc( bins * 2 * 4 );
|
||||
}
|
||||
|
||||
|
||||
for( i = 0; i < bins; i++ )
|
||||
for ( i = 0; i < bins; i++ )
|
||||
{
|
||||
float freq = frequencies[i];
|
||||
datspace[i*4] = 65536.0/freq;
|
||||
float freq = frequencies[ i ];
|
||||
datspace[ i * 4 ] = 65536.0 / freq;
|
||||
}
|
||||
|
||||
|
||||
for( i = last_place; i != ( place_in_data_buffer&0xffffe ); i = (i+2)%size_of_data_buffer )
|
||||
for ( i = last_place; i != ( place_in_data_buffer & 0xffffe );
|
||||
i = ( i + 2 ) % size_of_data_buffer )
|
||||
{
|
||||
int8_t ifr1 = (int8_t)( ((databuffer[i+0]) ) * 127 );
|
||||
int8_t ifr2 = (int8_t)( ((databuffer[i+1]) ) * 127 );
|
||||
// printf( "%d %d\n", i, place_in_data_buffer&0xffffe );
|
||||
int8_t ifr1 = ( int8_t )( ( ( databuffer[ i + 0 ] ) ) * 127 );
|
||||
int8_t ifr2 = ( int8_t )( ( ( databuffer[ i + 1 ] ) ) * 127 );
|
||||
// printf( "%d %d\n", i, place_in_data_buffer&0xffffe );
|
||||
HandleProgressiveInt( ifr1, ifr2 );
|
||||
}
|
||||
|
||||
last_place = place_in_data_buffer&0xfffe;
|
||||
last_place = place_in_data_buffer & 0xfffe;
|
||||
|
||||
//Extract bins.
|
||||
for( i = 0; i < bins; i++ )
|
||||
// Extract bins.
|
||||
for ( i = 0; i < bins; i++ )
|
||||
{
|
||||
int16_t isps = datspace[i*4+2];
|
||||
int16_t ispc = datspace[i*4+3];
|
||||
int16_t mux = ( (isps/256) * (isps/256)) + ((ispc/256) * (ispc/256));
|
||||
// printf( "%d (%d %d)\n", mux, isps, ispc );
|
||||
outbins[i] = sqrt( mux )/100.0;
|
||||
int16_t isps = datspace[ i * 4 + 2 ];
|
||||
int16_t ispc = datspace[ i * 4 + 3 ];
|
||||
int16_t mux = ( ( isps / 256 ) * ( isps / 256 ) ) + ( ( ispc / 256 ) * ( ispc / 256 ) );
|
||||
// printf( "%d (%d %d)\n", mux, isps, ispc );
|
||||
outbins[ i ] = sqrt( mux ) / 100.0;
|
||||
}
|
||||
// printf( "\n");
|
||||
// printf( "\n");
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -216,7 +216,7 @@ void HandleMotion( int x, int y, int mask )
|
|||
|
||||
void SoundCB( struct CNFADriver *sd, short *out, short *in, int framesp, int framesr )
|
||||
{
|
||||
int channelin = sd->channelsRec;
|
||||
int channelin = sd->channelsRec;
|
||||
int channelout = sd->channelsPlay;
|
||||
|
||||
// Load the samples into a ring buffer. Split the channels from interleved to one per buffer.
|
||||
|
|
@ -237,14 +237,14 @@ void SoundCB( struct CNFADriver *sd, short *out, short *in, int framesp, int fra
|
|||
}
|
||||
fo /= channelin;
|
||||
sound[ soundhead ] = fo * in_amplitude;
|
||||
soundhead = ( soundhead + 1 ) % SOUNDCBSIZE;
|
||||
soundhead = ( soundhead + 1 ) % SOUNDCBSIZE;
|
||||
}
|
||||
else
|
||||
{
|
||||
float f = in[ i * channelin + sample_channel ] / 32767.;
|
||||
if ( f > 1 || f < -1 ) f = ( f > 0 ) ? 1 : -1;
|
||||
sound[ soundhead ] = f * in_amplitude;
|
||||
soundhead = ( soundhead + 1 ) % SOUNDCBSIZE;
|
||||
soundhead = ( soundhead + 1 ) % SOUNDCBSIZE;
|
||||
}
|
||||
}
|
||||
SoundEventHappened( framesr, in, 0, channelin );
|
||||
|
|
@ -253,7 +253,7 @@ void SoundCB( struct CNFADriver *sd, short *out, short *in, int framesp, int fra
|
|||
|
||||
if ( out )
|
||||
{
|
||||
memset(out, 0, framesp * channelout);
|
||||
memset( out, 0, framesp * channelout );
|
||||
SoundEventHappened( framesp, out, 1, channelout );
|
||||
}
|
||||
}
|
||||
|
|
@ -329,7 +329,7 @@ int main( int argc, char **argv )
|
|||
WSADATA wsaData;
|
||||
WSAStartup( 0x202, &wsaData );
|
||||
#elif defined( ANDROID )
|
||||
int hasperm = AndroidHasPermissions( "READ_EXTERNAL_STORAGE" );
|
||||
int hasperm = AndroidHasPermissions( "READ_EXTERNAL_STORAGE" );
|
||||
int haspermInternet = AndroidHasPermissions( "INTERNET" );
|
||||
if ( !hasperm ) AndroidRequestAppPermissions( "READ_EXTERNAL_STORAGE" );
|
||||
if ( !haspermInternet ) AndroidRequestAppPermissions( "INTERNET" );
|
||||
|
|
@ -346,10 +346,10 @@ int main( int argc, char **argv )
|
|||
int frames = 0;
|
||||
double ThisTime;
|
||||
double SecToWait;
|
||||
double LastFPSTime = OGGetAbsoluteTime();
|
||||
double LastFPSTime = OGGetAbsoluteTime();
|
||||
double LastFrameTime = OGGetAbsoluteTime();
|
||||
CNFGBGColor = 0x800000;
|
||||
CNFGDialogColor = 0x444444;
|
||||
CNFGBGColor = 0x800000;
|
||||
CNFGDialogColor = 0x444444;
|
||||
|
||||
// Generate the window title
|
||||
char title[ 1024 ];
|
||||
|
|
@ -390,8 +390,7 @@ int main( int argc, char **argv )
|
|||
free( OutDriverNames );
|
||||
|
||||
|
||||
do
|
||||
{
|
||||
do {
|
||||
// Initialize Sound
|
||||
sd = CNFAInit( sound_source, "colorchord", &SoundCB, GetParameterI( "samplerate", 44100 ),
|
||||
GetParameterI( "samplerate", 44100 ), GetParameterI( "channels", 2 ),
|
||||
|
|
@ -453,9 +452,9 @@ int main( int argc, char **argv )
|
|||
if ( !headless )
|
||||
{
|
||||
// Handle outputs.
|
||||
int freqbins = nf->freqbins;
|
||||
int freqbins = nf->freqbins;
|
||||
int note_peaks = freqbins / 2;
|
||||
int freqs = freqbins * nf->octaves;
|
||||
int freqs = freqbins * nf->octaves;
|
||||
|
||||
// Do a bunch of debugging.
|
||||
if ( show_debug_basic && !is_suspended )
|
||||
|
|
@ -473,11 +472,11 @@ int main( int argc, char **argv )
|
|||
// Draw the folded bins
|
||||
for ( int bin = 0; bin < freqbins; bin++ )
|
||||
{
|
||||
const float x0 = bin / ( float )freqbins * ( float )screenx;
|
||||
const float x1 = ( bin + 1 ) / ( float )freqbins * ( float )screenx;
|
||||
const float amp = nf->folded_bins[ bin ] * 250.0;
|
||||
const float note = ( float )( bin + 0.5 ) / freqbins;
|
||||
CNFGDialogColor = CCtoHEX( note, 1.0, 1.0 );
|
||||
const float x0 = bin / (float)freqbins * (float)screenx;
|
||||
const float x1 = ( bin + 1 ) / (float)freqbins * (float)screenx;
|
||||
const float amp = nf->folded_bins[ bin ] * 250.0;
|
||||
const float note = (float)( bin + 0.5 ) / freqbins;
|
||||
CNFGDialogColor = CCtoHEX( note, 1.0, 1.0 );
|
||||
CNFGDrawBox( x0, 400 - amp, x1, 400 );
|
||||
}
|
||||
CNFGDialogColor = 0xf0f000;
|
||||
|
|
@ -486,15 +485,15 @@ int main( int argc, char **argv )
|
|||
for ( int peak = 0; peak < note_peaks; peak++ )
|
||||
{
|
||||
if ( nf->note_amplitudes_out[ peak ] < 0 ) continue;
|
||||
float note = ( float )nf->note_positions[ peak ] / freqbins;
|
||||
float note = (float)nf->note_positions[ peak ] / freqbins;
|
||||
CNFGDialogColor = CCtoHEX( note, 1.0, 1.0 );
|
||||
const int x1 = ( ( float )peak / note_peaks ) * screenx;
|
||||
const int x2 = ( ( float )( peak + 1 ) / note_peaks ) * screenx;
|
||||
const int y1 = 480 - nf->note_amplitudes_out[ peak ] * 100;
|
||||
const int y2 = 480;
|
||||
const int x1 = ( (float)peak / note_peaks ) * screenx;
|
||||
const int x2 = ( (float)( peak + 1 ) / note_peaks ) * screenx;
|
||||
const int y1 = 480 - nf->note_amplitudes_out[ peak ] * 100;
|
||||
const int y2 = 480;
|
||||
CNFGDrawBox( x1, y1, x2, y2 );
|
||||
|
||||
CNFGPenX = ( ( float )( peak + .4 ) / note_peaks ) * screenx;
|
||||
CNFGPenX = ( (float)( peak + .4 ) / note_peaks ) * screenx;
|
||||
CNFGPenY = screeny - 30;
|
||||
sprintf( stt, "%d\n%0.0f", nf->enduring_note_id[ peak ],
|
||||
nf->note_amplitudes2[ peak ] * 1000.0 );
|
||||
|
|
@ -503,16 +502,16 @@ int main( int argc, char **argv )
|
|||
|
||||
// Let's draw the o-scope.
|
||||
int thissoundhead = soundhead;
|
||||
thissoundhead = ( thissoundhead - 1 + SOUNDCBSIZE ) % SOUNDCBSIZE;
|
||||
int lasty = sound[ thissoundhead ] * 128 + 128;
|
||||
thissoundhead = ( thissoundhead - 1 + SOUNDCBSIZE ) % SOUNDCBSIZE;
|
||||
int thisy = sound[ thissoundhead ] * 128 + 128;
|
||||
thissoundhead = ( thissoundhead - 1 + SOUNDCBSIZE ) % SOUNDCBSIZE;
|
||||
thissoundhead = ( thissoundhead - 1 + SOUNDCBSIZE ) % SOUNDCBSIZE;
|
||||
int lasty = sound[ thissoundhead ] * 128 + 128;
|
||||
thissoundhead = ( thissoundhead - 1 + SOUNDCBSIZE ) % SOUNDCBSIZE;
|
||||
int thisy = sound[ thissoundhead ] * 128 + 128;
|
||||
thissoundhead = ( thissoundhead - 1 + SOUNDCBSIZE ) % SOUNDCBSIZE;
|
||||
for ( int i = 0; i < screenx; i++ )
|
||||
{
|
||||
CNFGTackSegment( i, lasty, i + 1, thisy );
|
||||
lasty = thisy;
|
||||
thisy = sound[ thissoundhead ] * 128 + 128;
|
||||
lasty = thisy;
|
||||
thisy = sound[ thissoundhead ] * 128 + 128;
|
||||
thissoundhead = ( thissoundhead - 1 + SOUNDCBSIZE ) % SOUNDCBSIZE;
|
||||
}
|
||||
}
|
||||
|
|
@ -527,7 +526,7 @@ int main( int argc, char **argv )
|
|||
for ( int x_val = -1; x_val < screenx; x_val++ )
|
||||
{
|
||||
// Calculate the value of the histogram at the current screen position
|
||||
float hist_point = ( float )x_val / ( float )screenx * freqbins - 0.5;
|
||||
float hist_point = (float)x_val / (float)screenx * freqbins - 0.5;
|
||||
float thishistval =
|
||||
CalcHistAt( hist_point, nf->freqbins, nf->dists, nf->dists_count );
|
||||
|
||||
|
|
@ -542,10 +541,10 @@ int main( int argc, char **argv )
|
|||
// Draw the bins
|
||||
for ( int bin = 0; bin < freqs; bin++ )
|
||||
{
|
||||
float x0 = bin / ( float )freqs * ( float )screenx;
|
||||
float x1 = ( bin + 1 ) / ( float )freqs * ( float )screenx;
|
||||
float amp = nf->outbins[ bin ] * 250.0;
|
||||
float note = ( float )bin / freqbins;
|
||||
float x0 = bin / (float)freqs * (float)screenx;
|
||||
float x1 = ( bin + 1 ) / (float)freqs * (float)screenx;
|
||||
float amp = nf->outbins[ bin ] * 250.0;
|
||||
float note = (float)bin / freqbins;
|
||||
CNFGDialogColor = CCtoHEX( note, 1.0, 1.0 );
|
||||
CNFGDrawBox( x0, 0, x1, amp );
|
||||
}
|
||||
|
|
@ -606,7 +605,7 @@ int main( int argc, char **argv )
|
|||
printf( "FPS: %d\n", frames );
|
||||
#endif
|
||||
lastfps = frames;
|
||||
frames = 0;
|
||||
frames = 0;
|
||||
LastFPSTime += 1;
|
||||
}
|
||||
|
||||
|
|
@ -615,7 +614,7 @@ int main( int argc, char **argv )
|
|||
SecToWait = cpu_autolimit_interval - ( ThisTime - LastFrameTime );
|
||||
LastFrameTime += cpu_autolimit_interval;
|
||||
if ( SecToWait < -.1 ) LastFrameTime = ThisTime - .1;
|
||||
if ( SecToWait > 0 ) OGUSleep( ( int )( SecToWait * 1000000 ) );
|
||||
if ( SecToWait > 0 ) OGUSleep( (int)( SecToWait * 1000000 ) );
|
||||
}
|
||||
|
||||
if ( !is_suspended ) SetEnvValues( 0 );
|
||||
|
|
|
|||
Loading…
Reference in a new issue