Mercurial > hg > simscene-py

changeset 23:0163f857f13f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix merge stereo
author Gregoire Lafay <gregoire.lafay@irccyn.ec-nantes.fr>
date Fri, 15 Jan 2016 15:46:47 +0100
parents 06e845616cae
children 2abd1116ae14
files nonExposed/generateScene.m
diffstat 1 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/nonExposed/generateScene.m	Thu Jan 14 21:17:11 2016 +0100
+++ b/nonExposed/generateScene.m	Fri Jan 15 15:46:47 2016 +0100
@@ -48,6 +48,10 @@
     id = sceneSchedule(i).classId;
     if (sceneSchedule(i).isBackground)
         waves = audioread([inputPath 'background/' sceneObjects(id).names{1}]);
+        [MinSizeWaves,indMinSizeWaves]=min(size(waves));
+        if MinSizeWaves==2
+            waves=mean(waves,indMinSizeWaves);
+        end
         scale = 1;
         if (i>1)
             scale = adjustScaleForEBR(waves, bg, 1, sceneSchedule(i).ebr, 1, 0.01);
@@ -86,6 +90,10 @@
         objNum = objNum+1;
         inst = sceneSchedule(i).instance;
         waves = audioread([inputPath 'event/' sceneObjects(id).names{inst}]);
+        [MinSizeWaves,indMinSizeWaves]=min(size(waves));
+        if MinSizeWaves==2
+            waves=mean(waves,indMinSizeWaves);
+        end
         pos = max(1,floor(sr*sceneSchedule(i).position));
         
         switch timeMode