Skip to content

Commit

Permalink
Semi-oto/vel implementation for FC + some consonant fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@lottev1991
lottev1991 committed Oct 14, 2023
1 parent 651f0cc commit 680eb14
Showing 1 changed file with 20 additions and 3 deletions.
23 changes: 20 additions & 3 deletions KoreanCVVCPlusPhonemizer/KoreanCVVCPlusPhonemizer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -494,10 +494,11 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN

if ((TCLfinal == "M") && (TNLconsonant == "r")) { TNLconsonant = "n"; }

if ((TCLfinal == "T") && (TNLconsonant == "s")) { TCLfinal = ""; TNLconsonant = "ss"; }
if ((TCLfinal == "T") && (TNLconsonant == "s" || TNLconsonant == "ss")) { TCLfinal = ""; TNLconsonant = "ss"; }

if ((TCLfinal == "NG") && (TNLconsonant == "r")) { TNLconsonant = "n"; }

if ((TCLfinal == "L") && (TNLconsonant == "d")) { TNLconsonant = "dd"; }

// Hanja batchim base ㄱ(g)ㄷ(d)ㅂ(b) + ㄹ(l) = ㅇ(ng)ㄴ(n)ㅁ(m) + ㄴ(n)(2)
if ((TCLfinal == "K") && (NLconsonant == 5)) { TCLfinal = "NG"; TCLplainfinal = "NG"; } else if ((TCLfinal == "T") && (NLconsonant == 5)) { TCLfinal = "N"; TCLplainfinal = "N"; } else if ((TCLfinal == "P") && (NLconsonant == 5)) { TCLfinal = "M"; TCLplainfinal = "M"; }
Expand Down Expand Up @@ -737,12 +738,20 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
} else {
ccLength = MsToTick(oto0.Preutter);
}
fcLength = fcLength + ccLength;
}

var nextAttr = nextNeighbour.Value.phonemeAttributes?.FirstOrDefault(attr => attr.index == 0) ?? default;
if ((TCLfinal == "K" || TCLfinal == "T" || TCLfinal == "P") && singer.TryGetMappedOto(CC, nextNeighbour.Value.tone + attr0.toneShift, attr0.voiceColor, out var oto4)) {
if (oto4.Overlap < 0) {
fcLength = MsToTick(oto4.Preutter - oto4.Overlap);
} else {
fcLength = MsToTick(oto4.Preutter);
}
}

// Minimum is 5 tick, maximum is half of note
ccLength = Convert.ToInt32(Math.Min(totalDuration / 2, Math.Max(5, ccLength * (nextAttr.consonantStretchRatio ?? 1))));
fcLength = Convert.ToInt32(Math.Min(totalDuration / 1.5, Math.Max(5, fcLength + (ccLength * (nextAttr.consonantStretchRatio ?? 1)))));

if (singer.TryGetMappedOto(CV, note.tone + attr0.toneShift, attr0.voiceColor, out var oto1) && singer.TryGetMappedOto(FC, note.tone + attr0.toneShift, attr0.voiceColor, out var oto2) && singer.TryGetMappedOto(CC, note.tone + attr0.toneShift, attr0.voiceColor, out var oto3)) {
CV = oto1.Alias;
Expand Down Expand Up @@ -777,11 +786,19 @@ public override Result Process(Note[] notes, Note? prev, Note? next, Note? prevN
} else {
ccLength = MsToTick(oto0.Preutter);
}
fcLength = fcLength + ccLength;
}

var nextAttr = nextNeighbour.Value.phonemeAttributes?.FirstOrDefault(attr => attr.index == 0) ?? default;
if ((TCLfinal == "K" || TCLfinal == "T" || TCLfinal == "P") && singer.TryGetMappedOto(CC, nextNeighbour.Value.tone + attr0.toneShift, attr0.voiceColor, out var oto4)) {
if (oto4.Overlap < 0) {
fcLength = MsToTick(oto4.Preutter - oto4.Overlap);
} else {
fcLength = MsToTick(oto4.Preutter);
}
}

// Minimum is 5 tick, maximum is half of note
fcLength = Convert.ToInt32(Math.Min(totalDuration / 1.5, Math.Max(5, fcLength + (ccLength * (nextAttr.consonantStretchRatio ?? 1)))));
ccLength = Convert.ToInt32(Math.Min(totalDuration / 2, Math.Max(5, ccLength * (nextAttr.consonantStretchRatio ?? 1))));

if (singer.TryGetMappedOto(CV, note.tone + attr0.toneShift, attr0.voiceColor, out var oto1) && singer.TryGetMappedOto(FC, note.tone + attr0.toneShift, attr0.voiceColor, out var oto2) && singer.TryGetMappedOto(CC, note.tone + attr0.toneShift, attr0.voiceColor, out var oto3)) {
Expand Down

0 comments on commit 680eb14

Please sign in to comment.