diff --git a/src/question/ADSR.png b/src/question/ADSR.png index 95e70bf34fb65ff50173bc9babb9b2d783ccdbeb..94f84b3569029a1b9cf27200ee17f4eff7190a75 100644 Binary files a/src/question/ADSR.png and b/src/question/ADSR.png differ diff --git a/src/question/comp_fft_theorie_delay.png b/src/question/comp_fft_theorie_delay.png index f1d624a7f3d3dbfdbfb041f2f813123bdfc5c1a9..690db6e8c4fecbe8dd2af14455c683db24de8ecc 100644 Binary files a/src/question/comp_fft_theorie_delay.png and b/src/question/comp_fft_theorie_delay.png differ diff --git a/src/question/question1_1.m b/src/question/question1_1.m index 00b20fcee8167730df47ff887198b2d321edacc7..da1afa210f4f830e41319856a1d671e6bda5fe57 100644 --- a/src/question/question1_1.m +++ b/src/question/question1_1.m @@ -1,6 +1,6 @@ %% this is a simple example to read and play a wave file with matlab % set a string variable to a wave filename we want to open: -note = "wav/single_tone_trumpet-a3.wav"; +note = '../wav/single_tone_trumpet-a3.wav'; % read the content of the wave file: [data,fe] = audioread(note); % data is a matrix with 2 columns if the sound is stereo; keep the mono to ease further processing diff --git a/src/question/question1_2.m b/src/question/question1_2.m index 01528c5929467eaa7a8598a5cb7f25b8554bc447..a7adbfc5b9c63165a9a52e43bc489997cdc6e71b 100644 --- a/src/question/question1_2.m +++ b/src/question/question1_2.m @@ -1,6 +1,6 @@ % Fichiers audio -piano1 = "single_tone_piano1.wav"; -piano2 = "wav/single_tone_piano2.wav"; +piano1 = "../wav/single_tone_piano1.wav"; +piano2 = "../wav/single_tone_piano2.wav"; % Lecture des sons [x1, Fe1] = audioread(piano1); [x2, Fe2] = audioread(piano2); diff --git a/src/question/question1_3.m b/src/question/question1_3.m index 56a3d1bdf5ccce21b3bc7a0a1afd73aad96ddab4..ae6c9d379ba85d0fb9c5b454e78b539687abafd0 100644 --- a/src/question/question1_3.m +++ b/src/question/question1_3.m @@ -1,5 +1,5 @@ % Chargement du son piano1 -[x, Fe] = audioread("single_tone_piano1.wav"); +[x, Fe] = audioread("../wav/single_tone_piano1.wav"); x = x(:,1); % Passage en mono si besoin % Calcul de la FFT N = length(x); diff --git a/src/question/question3_18.m b/src/question/question3_18.m index bddf45e88a3baf5517877791ad85fb77fddc4423..665ed0736d4fac065c338813d36c2e4685e95474 100644 --- a/src/question/question3_18.m +++ b/src/question/question3_18.m @@ -2,7 +2,7 @@ clear; clc; % Charger le signal audio -[x, Fe] = audioread('single_tone_piano1.wav'); +[x, Fe] = audioread('../wav/single_tone_piano1.wav'); x = x(:,1); % ne garder qu'un canal si stéréo % Paramètres imposés diff --git a/src/question/question3_5.m b/src/question/question3_5.m index 36d9bba7c0ba074e0603ade6acbad5ded3468a83..dfacbef1f5edbd96a3deaf68a1aae6d72b851633 100644 --- a/src/question/question3_5.m +++ b/src/question/question3_5.m @@ -2,7 +2,7 @@ clear; clc; close all; % 1. Charger un signal audio à traiter -[x, fe] = audioread("single_tone_guitar_nylon_string_a2.wav"); % fichier .wav à définir +[x, fe] = audioread("../wav/single_tone_guitar_nylon_string_a2.wav"); % fichier .wav à définir x = x(:,1); % Ne garder qu'un canal si le signal est stéréo % 2. Charger ou générer la réponse impulsionnelle h diff --git a/src/question/question3_6.m b/src/question/question3_6.m index 7620daca3708c5bbe76788d3118ede8b315e3125..3388ce1ccba5c103d4c8411d1c0d062f37c7ae01 100644 --- a/src/question/question3_6.m +++ b/src/question/question3_6.m @@ -2,7 +2,7 @@ clear; clc; close all; % 1. Charger un signal audio à traiter -[x, fe] = audioread("single_tone_guitar_nylon_string_a2.wav"); % fichier .wav à définir +[x, fe] = audioread("../wav/single_tone_guitar_nylon_string_a2.wav"); % fichier .wav à définir x = x(:,1); % Ne garder qu'un canal si le signal est stéréo % 2. Charger ou générer la réponse impulsionnelle h diff --git a/src/question/question3_7.m b/src/question/question3_7.m index 4c3f8b82bacb3f442876a647caa99b8387bed4b2..ed1977da47a9ab45a6adb2f537d5e72d3a94be0d 100644 --- a/src/question/question3_7.m +++ b/src/question/question3_7.m @@ -2,7 +2,7 @@ clear; clc; close all; % 1. Charger le signal audio -[x, fe] = audioread("single_tone_guitar_nylon_string_a2.wav"); +[x, fe] = audioread("../wav/single_tone_guitar_nylon_string_a2.wav"); x = x(:,1); % un seul canal si stéréo % 2. Charger la réponse impulsionnelle simulée diff --git a/src/question/reponse_freq_delay_filtre.png b/src/question/reponse_freq_delay_filtre.png index d1097feeecb3b861368128c7809cc0452013d785..224cd60c5132b3e0399cb2a8bec00b057f99ad8e 100644 Binary files a/src/question/reponse_freq_delay_filtre.png and b/src/question/reponse_freq_delay_filtre.png differ diff --git a/src/question/reverb_fft_guitare.png b/src/question/reverb_fft_guitare.png index 30ac757b6f917c70538bf71570f87d2705b3c6eb..952bccdae012bf4bd82cde443471bc27ac71f9f0 100644 Binary files a/src/question/reverb_fft_guitare.png and b/src/question/reverb_fft_guitare.png differ diff --git a/src/question/reverbationnnnnn.png b/src/question/reverbationnnnnn.png index 149bf9629105e0c34580447a48a602f7431a6008..1988abcd2f5d912cea4097e56a6252d933ebe488 100644 Binary files a/src/question/reverbationnnnnn.png and b/src/question/reverbationnnnnn.png differ diff --git a/src/question/signal_delay_filtre.png b/src/question/signal_delay_filtre.png index 8c2075adb9a17fd84fc61751c073e8e9a1506a7b..35754ca928ca9cb300cafe65738a4698218aaccb 100644 Binary files a/src/question/signal_delay_filtre.png and b/src/question/signal_delay_filtre.png differ diff --git a/src/question/signal_original_filtre_test.png b/src/question/signal_original_filtre_test.png index 0c0bb94da339a119d56c01878f67bfb067b466d0..dec41ddfa184c7ea9d8dc32412da34049df4dc5c 100644 Binary files a/src/question/signal_original_filtre_test.png and b/src/question/signal_original_filtre_test.png differ diff --git a/src/question/single_tone_guitar_nylon_string_a2.wav b/src/question/single_tone_guitar_nylon_string_a2.wav deleted file mode 100644 index b36d25495e30cebbaac2cb248e629bddf8bdb2bc..0000000000000000000000000000000000000000 Binary files a/src/question/single_tone_guitar_nylon_string_a2.wav and /dev/null differ diff --git a/src/question/single_tone_piano1.wav b/src/question/single_tone_piano1.wav deleted file mode 100644 index af184b832ca44b0a28441e62e7ade80f617c00e5..0000000000000000000000000000000000000000 Binary files a/src/question/single_tone_piano1.wav and /dev/null differ