Mercurial > hg > ape
changeset 8:2afd6ff39f08
prepare2listen fixes
| author | Brecht De Man <b.deman@qmul.ac.uk> |
|---|---|
| date | Fri, 28 Nov 2014 00:52:12 +0000 |
| parents | d113f0626fe3 |
| children | ee22af6610a3 |
| files | .hgignore aux/autoalign.m aux/batchResample.m aux/prepare2listen.m |
| diffstat | 4 files changed, 23 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Mon Nov 24 21:00:41 2014 +0000 +++ b/.hgignore Fri Nov 28 00:52:12 2014 +0000 @@ -19,4 +19,17 @@ listeningTest/AUDIO/SR2/E.wav listeningTest/AUDIO/SR2/F.wav listeningTest/AUDIO/SR2/G.wav -listeningTest/AUDIO/SR2/H.wav \ No newline at end of file +listeningTest/AUDIO/SR2/H.wav +listeningTest/_DEMOSCRIPT copy.txt +listeningTest/AUDIO/SR1/W.wav +listeningTest/AUDIO/SR2/pro.wav +listeningTest/responses/Matt.mat +listeningTest/responses/matt2.mat +listeningTest/responses/matt2__SR1test.txt +listeningTest/responses/matt3.mat +listeningTest/responses/matt3__SR1test.txt +listeningTest/responses/Matt__SR1test.txt +listeningTest/responses/myID.mat +listeningTest/responses/myID8.mat +listeningTest/responses/myID8__SR1test.txt +listeningTest/responses/myID__SR1test.txt \ No newline at end of file
--- a/aux/autoalign.m Mon Nov 24 21:00:41 2014 +0000 +++ b/aux/autoalign.m Fri Nov 28 00:52:12 2014 +0000 @@ -25,7 +25,7 @@ masterAudio = sum(masterAudioChannels, 2); % sum to mono % for each other file: - for i = 1:length(list) + for i = 2:length(list) slaveAudioChannels = audioread([foldername '/' list(i).name]); % read file slaveAudio = sum(slaveAudioChannels, 2); % sum to mono
--- a/aux/batchResample.m Mon Nov 24 21:00:41 2014 +0000 +++ b/aux/batchResample.m Fri Nov 28 00:52:12 2014 +0000 @@ -10,11 +10,9 @@ if nargin < 3 bitdepthnew = 24; end - - currentfolder = pwd; - cd(foldername); % go to specified folder + % go over all wav files in this folder - files = dir('*.wav'); + files = dir([foldername '/*.wav']); % remove hidden files from list % see http://www.mathworks.co.uk/matlabcentral/newsreader/view_thread/258220 @@ -26,23 +24,21 @@ end for k=1:length(files) - info = audioinfo(files(k).name); + info = audioinfo([foldername '/' files(k).name]); bitdepth = info.BitsPerSample; fs = info.SampleRate; if fs==fsnew && bitdepth == bitdepthnew disp([files(k).name ' already at ' num2str(fs) ' Hz, ' num2str(bitdepth) ' bit.']); else - [audio,fs] = audioread(files(k).name); % read audio + [audio,fs] = audioread([foldername '/' files(k).name]); % read audio disp([files(k).name ' was ' num2str(fs) ' Hz, ' num2str(bitdepth) ' bit.']); if fs ~= fsnew audio = resample(audio, fsnew, fs); end - audiowrite([files(k).name], audio, fsnew, ... - 'BitsPerSample', bitdepthnew); + audiowrite([foldername '/' files(k).name], audio/max(max(abs(audio))), ... + fsnew, 'BitsPerSample', bitdepthnew); end end - - cd(currentfolder); % go back to original folder end \ No newline at end of file
--- a/aux/prepare2listen.m Mon Nov 24 21:00:41 2014 +0000 +++ b/aux/prepare2listen.m Fri Nov 28 00:52:12 2014 +0000 @@ -15,8 +15,8 @@ newfolder = 'fragments'; fs = 96000; % Hz bitdepth = 24; - starttime = 76; % SR1 88; % seconds - endtime = 152; % SR1 142; % seconds + starttime = 76; % SR1 88; SR2 76 % seconds + endtime = 152; % SR1 142; SR2 152 % seconds fadetime = 1; % seconds format = 'wav'; slash = '/';