Catch end-of-audio cases for annotationToNoiseList

sonogram.py

@@ -172,8 +172,13 @@ class Sonogram():
                         speakerAtStep[i] = label
         return speakerAtStep, stepTime, speakerHierarchy
     
-    def annotationToNoiseList(self,inAnnotation,stepSize=2,windowSize=90):
+    def annotationToNoiseList(self,inAnnotation,maxTime,stepSize=2,windowSize=90):
         sas, st, sh = self.activeSpeaker(inAnnotation,step=stepSize)
+        exactTimelineMatch = False
+        # Check for magical exact match to end of audio
+        if (st[-1] + stepSize) / maxTime == 1:
+            # If true, we don't have to work as hard
+            exactTimelineMatch = True
         timeStepAggregate = []
         timeStepClass = []
         timeStepMembers = []
@@ -219,7 +224,7 @@ class Sonogram():
         for item in timeStepAggregate:
             timeStepClass.append(max(item, key=item.get))
 
-        
+
         categorySegmentList = []
         for c in categories:
             currList = []
@@ -230,7 +235,7 @@ class Sonogram():
             for stepClass,timeIncrement,members in zip(timeStepClass,st,timeStepMembers):
                 if stepClass == c:
                     if currMembers == members:
-                        duration += stepSize
+                        duration += min(stepSize,maxTime-timeIncrement)
                     else:
                         if tracking:
                             currList.append((currMembers,Segment(start,start+duration)))
@@ -241,7 +246,7 @@ class Sonogram():
                             
                         start = timeIncrement
                         currMembers = members
-                        duration += stepSize
+                        duration += min(stepSize,maxTime-timeIncrement)
                         tracking = True
                 else:
                     if tracking:
@@ -253,6 +258,12 @@ class Sonogram():
             if tracking:
                 currList.append((currMembers,Segment(start,start+duration)))
             categorySegmentList.append(currList)
+        # Check where we left off
+        if not exactTimelineMatch:
+            # Create silence at end if needed
+            if maxTime-st[-1] > stepSize:
+                categorySegmentList[2].append((None,Segment(st[-1] + stepSize,maxTime))
+            
         return categorySegmentList, st
     
     def __call__(self,audioPath):