Skip to content

Trim and fade for the wave part #1968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maiko3tattun wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Trim and fade for the wave part #1968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 76 additions & 14 deletions OpenUtau.Core/Commands/PartCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,12 @@ public override void Unexecute() {
}
}

public class ResizePartCommand : PartCommand {
public class ResizeVoicePartCommand : PartCommand {
public readonly new UVoicePart part;
readonly int deltaDur;
readonly bool fromStart;
public ResizePartCommand(UProject project, UPart part, int deltaDur, bool fromStart) : base(project, part) {
public ResizeVoicePartCommand(UProject project, UVoicePart part, int deltaDur, bool fromStart) : base(project, part) {
this.part = part;
this.deltaDur = deltaDur;
this.fromStart = fromStart;
}
Expand All @@ -62,12 +64,10 @@ public override void Execute() {
if (fromStart) {
part.position -= deltaDur;
part.Duration += deltaDur;
if (part is UVoicePart voicePart) {
voicePart.notes.ForEach(note => note.position += deltaDur);
foreach (var curve in voicePart.curves) {
for (var i = 0; i < curve.xs.Count; i++) {
curve.xs[i] += deltaDur;
}
part.notes.ForEach(note => note.position += deltaDur);
foreach (var curve in part.curves) {
for (var i = 0; i < curve.xs.Count; i++) {
curve.xs[i] += deltaDur;
}
}
} else {
Expand All @@ -78,12 +78,10 @@ public override void Unexecute() {
if (fromStart) {
part.position += deltaDur;
part.Duration -= deltaDur;
if (part is UVoicePart voicePart) {
voicePart.notes.ForEach(note => note.position -= deltaDur);
foreach (var curve in voicePart.curves) {
for (var i = 0; i < curve.xs.Count; i++) {
curve.xs[i] -= deltaDur;
}
part.notes.ForEach(note => note.position -= deltaDur);
foreach (var curve in part.curves) {
for (var i = 0; i < curve.xs.Count; i++) {
curve.xs[i] -= deltaDur;
}
}
} else {
Expand All @@ -92,6 +90,70 @@ public override void Unexecute() {
}
}

public class ResizeWavePartCommand : PartCommand {
public readonly new UWavePart part;
readonly int deltaDur;
readonly bool fromStart;
public ResizeWavePartCommand(UProject project, UWavePart part, int deltaDur, bool fromStart) : base(project, part) {
this.part = part;
this.deltaDur = deltaDur;
this.fromStart = fromStart;
}
public override string ToString() => "Change parts duration";
public override void Execute() {
if (fromStart) {
part.position -= deltaDur;
part.skip -= deltaDur;
} else {
part.trim -= deltaDur;
}
}
public override void Unexecute() {
if (fromStart) {
part.position += deltaDur;
part.skip += deltaDur;
} else {
part.trim += deltaDur;
}
}
}

public class PartFadeInCommand : PartCommand {
public readonly new UWavePart part;
readonly int fadeTick;
readonly int oldFade;
public PartFadeInCommand(UProject project, UWavePart part, int fadeTick) : base(project, part) {
this.part = part;
this.fadeTick = fadeTick;
this.oldFade = part.fadein;
}
public override string ToString() => "Fade in part";
public override void Execute() {
part.fadein = fadeTick;
}
public override void Unexecute() {
part.fadein = oldFade;
}
}

public class PartFadeOutCommand : PartCommand {
public readonly new UWavePart part;
readonly int fadeTick;
readonly int oldFade;
public PartFadeOutCommand(UProject project, UWavePart part, int fadeTick) : base(project, part) {
this.part = part;
this.fadeTick = fadeTick;
this.oldFade = part.fadeout;
}
public override string ToString() => "Fade out part";
public override void Execute() {
part.fadeout = fadeTick;
}
public override void Unexecute() {
part.fadeout = oldFade;
}
}

public class RenamePartCommand : PartCommand {
readonly string newName, oldName;
public RenamePartCommand(UProject project, UPart part, string name) : base(project, part) {
Expand Down
2 changes: 1 addition & 1 deletion OpenUtau.Core/Editing/NoteBatchEdits.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ public void Run(UProject project, UVoicePart part, List<UNote> selectedNotes, Do
DocManager.Inst.ExecuteCmd(new AddNoteCommand(part, notes));
int minDurTick = part.GetMinDurTick(project);
if (part.Duration < minDurTick) {
DocManager.Inst.ExecuteCmd(new ResizePartCommand(project, part, minDurTick - part.Duration, false));
DocManager.Inst.ExecuteCmd(new ResizeVoicePartCommand(project, part, minDurTick - part.Duration, false));
}
DocManager.Inst.EndUndoGroup();
}
Expand Down
11 changes: 1 addition & 10 deletions OpenUtau.Core/Render/RenderEngine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,7 @@ public Tuple<WaveMix, List<Fader>> RenderMixdown(TaskScheduler uiScheduler, ref
.Where(part => part is UWavePart && part.trackNo == i)
.Select(part => part as UWavePart)
.Where(part => part.Samples != null)
.Select(part => {
double offsetMs = project.timeAxis.TickPosToMsPos(part.position);
double estimatedLengthMs = project.timeAxis.TickPosToMsPos(part.End) - offsetMs;
var waveSource = new WaveSource(
offsetMs,
estimatedLengthMs,
part.skipMs, part.channels);
waveSource.SetSamples(part.Samples);
return (ISignalSource)waveSource;
}));
.Select(part => part.TrimSamples(project)));
var trackMix = new WaveMix(trackSources);
var fader = new Fader(trackMix);
fader.Scale = PlaybackManager.DecibelToVolume(track.Muted ? -24 : track.Volume);
Expand Down
69 changes: 57 additions & 12 deletions OpenUtau.Core/Ustx/UPart.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,10 @@ public string FilePath {

[YamlMember(Order = 100)] public string relativePath;
[YamlMember(Order = 101)] public double fileDurationMs;
[YamlMember(Order = 102)] public double skipMs;
[YamlMember(Order = 103)] public double trimMs;
[YamlMember(Order = 102)] public int skip;
[YamlMember(Order = 103)] public int trim;
[YamlMember(Order = 104)] public int fadein;
[YamlMember(Order = 105)] public int fadeout;

[YamlIgnore]
public override string DisplayName => Missing ? $"[Missing] {name}" : name;
Expand All @@ -315,23 +317,28 @@ public override int Duration {

private int duration;

public double GetSkipMs(UProject project) {
return project.timeAxis.MsBetweenTickPos(position - skip, position);
}

public double GetTrimMs(UProject project) {
return project.timeAxis.MsBetweenTickPos(End, End + trim);
}

public override int GetMinDurTick(UProject project) {
double posMs = project.timeAxis.TickPosToMsPos(position);
int end = project.timeAxis.MsPosToTickPos(posMs + fileDurationMs);
return end - position;
return project.resolution;
}

public override int GetMaxPosiTick(UProject project) {
// TODO
return position;
return End - project.resolution;
}

public override UPart Clone() {
var part = new UWavePart() {
_filePath = _filePath,
relativePath = relativePath,
skipMs = skipMs,
trimMs = trimMs,
skip = skip,
trim = trim,
};
part.Load(DocManager.Inst.Project);
return part;
Expand Down Expand Up @@ -403,9 +410,9 @@ public override void Validate(ValidateOptions options, UProject project, UTrack
}

private void UpdateDuration(UProject project) {
double posMs = project.timeAxis.TickPosToMsPos(position);
int end = project.timeAxis.MsPosToTickPos(posMs + fileDurationMs);
duration = end - position;
double fileStartMs = project.timeAxis.TickPosToMsPos(position - skip);
int fileEnd = project.timeAxis.MsPosToTickPos(fileStartMs + fileDurationMs);
duration = fileEnd - trim - position;
}

public override void BeforeSave(UProject project, UTrack track) {
Expand All @@ -422,5 +429,43 @@ public override void AfterLoad(UProject project, UTrack track) {
}
Load(project);
}

public ISignalSource TrimSamples(UProject project) {
double offsetMs = project.timeAxis.TickPosToMsPos(position);
double estimatedLengthMs = project.timeAxis.TickPosToMsPos(End) - offsetMs;
var waveSource = new WaveSource(
offsetMs,
estimatedLengthMs,
0, channels);
int skipCount = (int)(GetSkipMs(project) * sampleRate / 1000) * channels;
int trimCount = (int)(GetTrimMs(project) * sampleRate / 1000) * channels;
int remainingCount = Samples.Length - skipCount - trimCount;
if (remainingCount <= 0) {
waveSource.SetSamples(new float[0]);
return waveSource;
}
float[] trimmedSamples = new float[remainingCount];
Array.Copy(Samples, skipCount, trimmedSamples, 0, remainingCount);

int fadeinFrames = (int)(project.timeAxis.MsBetweenTickPos(position, position + fadein) * sampleRate / 1000);
for (int i = 0; i < fadeinFrames && i * channels < remainingCount; i++) {
float gain = (float)i / fadeinFrames;
for (int j = 0; j < channels; j++) {
trimmedSamples[i * channels + j] *= gain;
}
}
int fadeoutFrames = (int)(project.timeAxis.MsBetweenTickPos(End - fadeout, End) * sampleRate / 1000);
for (int i = 0; i < fadeoutFrames && i * channels < remainingCount; i++) {
float gain = (float)i / fadeoutFrames;
for (int j = 0; j < channels; j++) {
int targetIdx = remainingCount - 1 - (i * channels + (channels - 1 - j));
if (targetIdx >= 0) {
trimmedSamples[targetIdx] *= gain;
}
}
}
waveSource.SetSamples(trimmedSamples);
return waveSource;
}
}
}
Loading
Loading