jamosdev
/
rhubarb-lip-sync
mirror of https://github.com/DanielSWolf/rhubarb-lip-sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Corner case: Preserving short shapes cut in half by timing optimization

This commit is contained in:
Daniel Wolf 2017-01-03 10:43:26 +01:00
parent cbf5c53c32
commit 05a0050d52
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/animation/timingOptimization.cpp
View File

@ -99,7 +99,15 @@ ShapeReduction getNextShapeReduction(const JoiningContinuousTimeline<Shape>& sou
const ShapeReduction extendedReduction(sourceShapes,
{minReduction.sourceShapes.begin()->getStart(), minReduction.sourceShapes.getRange().getEnd()});
return extendedReduction.shape == minReduction.shape ? extendedReduction : minReduction;
// Determine the shape that might be picked *next* if we choose the shortest-possible candidate range now
const ShapeReduction nextReduction(sourceShapes,
getNextMinimalCandidateRange(sourceShapes, targetRange, minReduction.sourceShapes.getRange().getStart()));
const bool minEqualsExtended = minReduction.shape == extendedReduction.shape;
const bool extendedIsSpecial = extendedReduction.shape != minReduction.shape
&& extendedReduction.shape != nextReduction.shape;
return minEqualsExtended || extendedIsSpecial ? extendedReduction : minReduction;
}
// Modifies the timing of the given animation to fit into the specified target time range without jitter.