Mercurial > hg > simscene-py

diff simScene.m @ 24:2abd1116ae14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add automatic background generation
author Gregoire Lafay <gregoire.lafay@irccyn.ec-nantes.fr>
date Fri, 15 Jan 2016 17:19:09 +0100
parents 8d33767e070a
children 8ce78cacb5cb
line wrap: on
line diff
--- a/simScene.m	Fri Jan 15 15:46:47 2016 +0100
+++ b/simScene.m	Fri Jan 15 17:19:09 2016 +0100
@@ -161,7 +161,7 @@
 
 addpath(genpath('nonExposed'));
 
-[timeMode,ebrMode,instanceAnnotFile,instanceAudioFile,figuresOption,sampleChoice,outputFileName,minSpace,endCut,eventInfoPath,norm,channelsOption]=process_options(varargin,'timeMode','generate','ebrMode','generate','instanceAnnotFile','none','instanceAudioFile','none','figure',0,'sampleChoice','random','outputFileName','simulatedScene','minSpace',-1,'endCut',0,'eventInfoPath','','norm',.75,'channel',0);
+[timeMode,ebrMode,instanceAnnotFile,instanceAudioFile,figuresOption,sampleChoice,outputFileName,minSpace,endCut,eventInfoPath,norm,channelsOption,noiseLevel,noiseFiltMaxFreq,noiseFiltOrder]=process_options(varargin,'timeMode','generate','ebrMode','generate','instanceAnnotFile','none','instanceAudioFile','none','figure',0,'sampleChoice','random','outputFileName','simulatedScene','minSpace',-1,'endCut',0,'eventInfoPath','','norm',.75,'channel',0,'noiseLevel',-24,'noiseFiltMaxFreq',0,'noiseFiltOrder',12);
 
 sr=44100;
 
@@ -190,7 +190,7 @@
     eventInfo(1).query='null';
 end
 
-[sceneSchedule,sceneObjects]=getBackground(inputPath,score,eventInfo,sr);
+[sceneSchedule,sceneObjects,score]=getBackground(inputPath,score,eventInfo,sr,noiseLevel,noiseFiltMaxFreq,noiseFiltOrder);
 [sceneSchedule,sceneObjects]=getEvent(sceneSchedule,sceneObjects,inputPath,score,timeMode,ebrMode,sampleChoice,eventInfo,sr);
 
 %% Manage overlapping