Changed how float PCM is converted to 8, 16, and 32bit PCM

Author: JohnDog3112

examples/tests-audio/tests-audio.c

@@ -352,7 +352,7 @@ void internal_test_case(int test, void* extra, bool full, enum CallType typ) {
          float* noise = generate_random_noise(total_len);
          char* noise_char = (char*)malloc(sizeof(char) * total_len);
          for (long i = 0; i < total_len; i++) {
-            noise_char[i] = (char)floor((noise[i] > 0 ? noise[i]/127 : noise[i]/128) + 0.5); //0.5 is added to make it round
+            noise_char[i] = (char)floor(noise[i]/128 + 0.5); //0.5 is added to make it round
          }
          free(noise);
 
@@ -371,7 +371,7 @@ void internal_test_case(int test, void* extra, bool full, enum CallType typ) {
          float* noise = generate_random_noise(total_len);
          short* noise_char = (short*)malloc(sizeof(short) * total_len);
          for (long i = 0; i < total_len; i++) {
-            noise_char[i] = (short)floor((noise[i] > 0 ? noise[i]/32767 : noise[i]/32768) + 0.5); //0.5 is added to make it round
+            noise_char[i] = (short)floor(noise[i]/32768 + 0.5); //0.5 is added to make it round
          }
          free(noise);
 
@@ -390,7 +390,7 @@ void internal_test_case(int test, void* extra, bool full, enum CallType typ) {
          float* noise = generate_random_noise(total_len);
          int* noise_char = (int*)malloc(sizeof(int) * total_len);
          for (long i = 0; i < total_len; i++) {
-            noise_char[i] = (int)floor((noise[i] > 0 ? noise[i]/2147483648 : noise[i]/2147483648) + 0.5); //0.5 is added to make it round
+            noise_char[i] = (int)floor(noise[i]/2147483648 + 0.5); //0.5 is added to make it round
          }
          free(noise);
 

source/twr-ts/twrlibaudio.ts

@@ -107,7 +107,7 @@ export default class twrLibAudio extends twrLibrary {
          for (let i = 0; i < singleChannelDataLen; i++) {
             //convert 8-bit PCM to float
             //data is signed, so it will also need to find the negatives
-            channelBuff[i] = dataBuff[i] > 127 ? (dataBuff[i] - 256)/128 : dataBuff[i]/127;
+            channelBuff[i] = dataBuff[i] > 127 ? (dataBuff[i] - 256)/128 : dataBuff[i]/128;
          }
       }
 
@@ -126,7 +126,7 @@ export default class twrLibAudio extends twrLibrary {
          for (let i = 0; i < singleChannelDataLen*2; i += 2) {
             const val = dataBuff[i]+dataBuff[i+1]*256;
             //convert 16-bit PCM to float
-            channelBuff[i] = val > 32767 ? (val - 65536)/32768 : val/32767;
+            channelBuff[i] = val > 32767 ? (val - 65536)/32768 : val/32768;
          }
       }
 
@@ -144,7 +144,7 @@ export default class twrLibAudio extends twrLibrary {
 
          for (let i = 0; i < singleChannelDataLen; i++) {
             //convert 32-bit PCM to float
-            channelBuff[i] = dataBuff[i] > 2147483647 ? (dataBuff[i] - 4294967296)/2147483648 : dataBuff[i]/2147483647;
+            channelBuff[i] = dataBuff[i] > 2147483647 ? (dataBuff[i] - 4294967296)/2147483648 : dataBuff[i]/2147483648;
          }
       }
 
@@ -224,7 +224,7 @@ export default class twrLibAudio extends twrLibrary {
 
          for (let i = 0; i < buffer.length; i++) {
             //nergative values will automatically be converted to unsigned when assigning to retBuffer
-            retBuffer[i] = Math.round(data[i] < 0 ? data[i] * 128 : data[i] * 127); 
+            retBuffer[i] = Math.round(data[i] * 128); 
          }
       }
    }
@@ -245,7 +245,7 @@ export default class twrLibAudio extends twrLibrary {
 
          for (let i = 0; i < buffer.length; i++) {
 
-            const val = data[i] < 0 ? 65536 + data[i] * 32768 : data[i] * 32767;
+            const val = data[i] < 0 ? 65536 + data[i] * 32768 : data[i] * 32768;
 
             retBuffer[i] = val%256; //byte 1
             retBuffer[i+1] = Math.round(val/256); //byte 2 
@@ -269,7 +269,7 @@ export default class twrLibAudio extends twrLibrary {
 
          for (let i = 0; i < buffer.length; i++) {
             //nergative values will automatically be converted to unsigned when assigning to retBuffer
-            retBuffer[i] = Math.round(data[i] < 0 ? data[i] * 2147483648 : data[i] * 2147483647); 
+            retBuffer[i] = Math.round(data[i] * 2147483648); 
          }
       }
    }