Fixed temporal segment alignment of parallel segments while merging.

sritterbusch · Jul 13, 2016 · d08f6bf · d08f6bf
1 parent 21cc049
commit d08f6bf
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/Merge.cpp b/src/Merge.cpp
@@ -83,8 +83,15 @@ Channels Merge::parallel(Channels &a, Channels &b)
 	unifySamplerate(a,b);
 	Channels target(a);
 	for(unsigned i=0;i<a.size();i++)
-		for(unsigned j=0;j<a[i].size();j++)
-			target[i][j]=a[i][j]+b[i][j];
+	{
+		unsigned offset=0;
+		if(a[i].size()>b[i].size())
+			offset=a[i].size()-b[i].size();
+		for(unsigned j=0;j<offset;j++)
+			target[i][j]=a[i][j];
+		for(unsigned j=offset;j<a[i].size();j++)
+			target[i][j]=a[i][j]+b[i][j-offset];
+	}
 
 	return target;
 }