# HG changeset patch # User Gregoire Lafay # Date 1452869207 -3600 # Node ID 0163f857f13f46b4842e61f1eb19dc7694a02874 # Parent 06e845616cae4245da2ab2b00db30d105d9bcd23 fix merge stereo diff -r 06e845616cae -r 0163f857f13f nonExposed/generateScene.m --- 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