adjusted wave amplitude limits

Author: silent-cipher

src/contract/notes.cairo

@@ -20,7 +20,7 @@ mod NotesContract {
     #[abi(embed_v0)]
     impl NotesContractImpl of INotesContract<ContractState> {
         fn get_note(self: @ContractState, note: Note) -> ByteArray {
-            let music = Music { notes: array![note].span(), sample_rate: 8000, bit_depth: 32 };
+            let music = Music { notes: array![note].span(), sample_rate: 8000, bit_depth: 16 };
             let wav: WavFile = music.into();
             wav.into()
         }
@@ -42,7 +42,7 @@ mod NotesContract {
                 ]
                     .span(),
                 sample_rate: 8000,
-                bit_depth: 32,
+                bit_depth: 16,
             };
             let wav: WavFile = music.into();
             wav.into()

src/utils.cairo

@@ -5,11 +5,15 @@ const PRECISION: u64 = 1_000_000;
 
 fn get_max_value(bit_depth: u16) -> u64 {
     if bit_depth != 4 && bit_depth != 8 && bit_depth != 16 && bit_depth != 24 && bit_depth != 32 {
-    panic!("Unsupported bit depth");
+        panic!("Unsupported bit depth");
+    } else if bit_depth == 4 {
+        return 15;
+    } else if bit_depth == 8 {
+        return 255;
     }
     let mut n = bit_depth;
     let mut result: u64 = 1;
-    while n > 0 {
+    while n > 1 {
         result *= 2;
         n -= 1;
     };
@@ -18,20 +22,23 @@ fn get_max_value(bit_depth: u16) -> u64 {
 // TODO: Test append to array version for efficiency
 
 // TODO
-fn generate_sine_wave(frequency_hz: u32, duration_ms: u32, sample_rate_hz: u32, bit_depth: u16) -> Array<u32> {
+fn generate_sine_wave(
+    frequency_hz: u32, duration_ms: u32, sample_rate_hz: u32, bit_depth: u16
+) -> Array<u32> {
     let samples = array![];
     samples
 }
 
-fn generate_square_wave(frequency_hz: u32, duration_ms: u32, sample_rate_hz: u32, bit_depth: u16) -> Array<u32> {
+fn generate_square_wave(
+    frequency_hz: u32, duration_ms: u32, sample_rate_hz: u32, bit_depth: u16
+) -> Array<u32> {
     let mut samples: Array<u32> = array![];
     let mut num_samples_left: u64 = ((duration_ms * sample_rate_hz) / 1000).into();
 
     let mega_full: u64 = (PRECISION * sample_rate_hz.into()) / frequency_hz.into();
     let mega_half: u64 = mega_full / 2;
 
     let max_value: u64 = get_max_value(bit_depth);
-
     while num_samples_left > 0 {
         if (num_samples_left * PRECISION) % mega_full < mega_half {
             samples.append(0);
@@ -44,13 +51,14 @@ fn generate_square_wave(frequency_hz: u32, duration_ms: u32, sample_rate_hz: u32
 }
 
 // TODO
-fn generate_sawtooth_wave(frequency_hz: u32, duration_ms: u32, sample_rate_hz: u32, bit_depth: u16) -> Array<u32> {
+fn generate_sawtooth_wave(
+    frequency_hz: u32, duration_ms: u32, sample_rate_hz: u32, bit_depth: u16
+) -> Array<u32> {
     let mut samples: Array<u32> = array![];
     let mut num_samples_left: u64 = ((duration_ms * sample_rate_hz) / 1000).into();
 
     let mega_full: u64 = (PRECISION * sample_rate_hz.into()) / frequency_hz.into();
 
-
     let max_value: u64 = get_max_value(bit_depth);
 
     while num_samples_left > 0 {
@@ -63,15 +71,16 @@ fn generate_sawtooth_wave(frequency_hz: u32, duration_ms: u32, sample_rate_hz: u
     samples
 }
 
-fn generate_triangle_wave(frequency_hz: u32, duration_ms: u32, sample_rate_hz: u32, bit_depth: u16) -> Array<u32> {
+fn generate_triangle_wave(
+    frequency_hz: u32, duration_ms: u32, sample_rate_hz: u32, bit_depth: u16
+) -> Array<u32> {
     let mut samples: Array<u32> = array![];
     let mut num_samples_left: u64 = ((duration_ms * sample_rate_hz) / 1000).into();
 
     let mega_full: u64 = (PRECISION * sample_rate_hz.into()) / frequency_hz.into();
     let mega_half: u64 = mega_full / 2;
 
     let max_value: u64 = get_max_value(bit_depth);
-
     while num_samples_left > 0 {
         let pos = (num_samples_left * PRECISION) % mega_full;
         let value = if pos < mega_half {
@@ -83,4 +92,5 @@ fn generate_triangle_wave(frequency_hz: u32, duration_ms: u32, sample_rate_hz: u
         num_samples_left -= 1;
     };
     samples
-}
+}
+

src/wave.cairo

@@ -19,7 +19,6 @@ struct WavFile {
 }
 
 
-
 impl WavToBytes of Into<WavFile, ByteArray> {
     fn into(self: WavFile) -> ByteArray {
         let mut bytes: ByteArray = "";
@@ -47,17 +46,25 @@ impl WavToBytes of Into<WavFile, ByteArray> {
         // Append data
         let mut count = 0;
         if self.bits_per_sample == 4_u16 {
-            while self.data.len() - count > 1 {
-                bytes.append_byte((*self.data[count]| *self.data[count + 1]).try_into().unwrap());
-                count += 2;
-            };
+            while self.data.len()
+                - count > 1 {
+                    bytes
+                        .append_byte(
+                            (*self.data[count] | *self.data[count + 1]).try_into().unwrap()
+                        );
+                    count += 2;
+                };
         } else {
-            while self.data.len() - count > 0 {
-                bytes.append_word_rev((*self.data[count]).into(), self.bits_per_sample.into() / 8_u32);
-                count += 1;
-            };
+            while self.data.len()
+                - count > 0 {
+                    bytes
+                        .append_word_rev(
+                            (*self.data[count]).into(), self.bits_per_sample.into() / 8_u32
+                        );
+                    count += 1;
+                };
         }
-        
+
         bytes
     }
 }