update

src/utils/midi.py

@@ -243,6 +243,51 @@ def normalize_midi(midi_obj, target_ticks_per_beat=500, target_tempo=120):
 
     return output_midi_obj
 
+def merge_and_sort(midi_obj):
+    output_midi_obj = MidiFile(ticks_per_beat=500)
+    output_midi_obj.time_signature_changes = midi_obj.time_signature_changes
+    output_midi_obj.key_signature_changes = midi_obj.key_signature_changes
+
+    output_instrument = Instrument(program=0, is_drum=False, name="Piano")
+    tick_ratio = 500 / midi_obj.ticks_per_beat
+    all_notes = []
+    for instrument in midi_obj.instruments:
+        if not instrument.is_drum:
+            for note in instrument.notes:
+                all_notes.append(
+                    Note(
+                        velocity=note.velocity, 
+                        pitch=note.pitch, 
+                        start=round(note.start * tick_ratio), 
+                        end=round(note.end * tick_ratio)
+                    )
+                )
+    notes_by_pitch = defaultdict(list)
+    for note in all_notes:
+        notes_by_pitch[note.pitch].append(note)
+    merged_notes = []
+    for pitch in sorted(notes_by_pitch.keys()):
+        sorted_notes = sorted(notes_by_pitch[pitch], key=lambda n: n.start)
+        if len(sorted_notes) > 1:
+            for i in range(len(sorted_notes) - 1):
+                current_note = sorted_notes[i]
+                next_note = sorted_notes[i+1]
+                if current_note.end >= next_note.start:
+                    current_note.end = next_note.start
+                    if current_note.start >= current_note.end:
+                         current_note.pitch = -1
+
+        merged_notes.extend([n for n in sorted_notes if n.pitch != -1])
+
+    merged_notes.sort(key=lambda x: (x.start, x.pitch))
+    output_instrument.notes = merged_notes
+    output_midi_obj.instruments.append(output_instrument)
+    for time_signature in output_midi_obj.time_signature_changes:
+        time_signature.time = round(time_signature.time * tick_ratio)
+    for key_signature in output_midi_obj.key_signature_changes:
+        key_signature.time = round(key_signature.time * tick_ratio)
+    return output_midi_obj
+
 def midi_to_ids(config, midi_obj, normalize=True):
     def get_pedal(time_list, ccs, time):
         i = bisect.bisect_right(time_list, time)
@@ -291,7 +336,7 @@ def midi_to_ids(config, midi_obj, normalize=True):
         ids.extend([pitch, interval, velocity, duration, pedal1, pedal2, pedal3, pedal4])
     return ids
 
-def ids_to_midi(config, ids, target_ticks_per_beat = 500, target_tempo = 120):
+def ids_to_midi(config, ids, target_ticks_per_beat = 500, target_tempo = 120, pedal_ratio = 1.0):
     note_list = []
     cc_list = []
     intervals = []
@@ -311,14 +356,26 @@ def ids_to_midi(config, ids, target_ticks_per_beat = 500, target_tempo = 120):
         pedal4 = ids[i+7] - config.pedal_start
         note_list.append(Note(velocity, pitch, last_time + interval, last_time + interval + duration))
         last_time += interval
-        #cc_list.append(ControlChange(64, pedal1, last_time))
-        #cc_list.append(ControlChange(64, pedal2, round(last_time + min(intervals[i // 8 + 1] * 1 / 10, 5))))
-        #cc_list.append(ControlChange(64, pedal3, round(last_time + max(intervals[i // 8 + 1] * 8 / 10, intervals[i // 8 + 1] * 8 / 10 - 10))))
-        #cc_list.append(ControlChange(64, pedal4, round(last_time + max(intervals[i // 8 + 1] * 9 / 10, intervals[i // 8 + 1] * 9 / 10 - 5))))
+        
+        interval_time = intervals[i // 8 + 1]
+        interval_step = intervals[i // 8 + 1] / 4 * pedal_ratio
+
         cc_list.append(ControlChange(64, pedal1, last_time))
-        cc_list.append(ControlChange(64, pedal2, round(last_time + intervals[i // 8 + 1] * 1 / 4)))
-        cc_list.append(ControlChange(64, pedal3, round(last_time + intervals[i // 8 + 1] * 2 / 4)))
-        cc_list.append(ControlChange(64, pedal4, round(last_time + intervals[i // 8 + 1] * 3 / 4)))
+        cc_list.append(ControlChange(64, pedal2, round(last_time + interval_step)))
+        cc_list.append(ControlChange(64, pedal3, round(last_time + interval_time - interval_step * 2)))
+        cc_list.append(ControlChange(64, pedal4, round(last_time + interval_time - interval_step)))
+
+        #cc_list.append(ControlChange(64, pedal1, last_time))
+        #cc_list.append(ControlChange(64, pedal2, round(last_time + intervals[i // 8 + 1] * 1 / 4)))
+        #cc_list.append(ControlChange(64, pedal3, round(last_time + intervals[i // 8 + 1] * 2 / 4)))
+        #cc_list.append(ControlChange(64, pedal4, round(last_time + intervals[i // 8 + 1] * 3 / 4)))
+
+    last_value = 0
+    new_cc_list = []
+    for cc in cc_list:
+        if cc.value != last_value:
+            new_cc_list.append(cc)
+        last_value = cc.value
 
     max_tick = 0
     for note in note_list:
@@ -328,7 +385,7 @@ def ids_to_midi(config, ids, target_ticks_per_beat = 500, target_tempo = 120):
     max_tick = max_tick + 1
 
     output = MidiFile(ticks_per_beat=target_ticks_per_beat)
-    output.instruments.append(Instrument(program=0, is_drum=False, name="Piano", notes=note_list, control_changes=cc_list))
+    output.instruments.append(Instrument(program=0, is_drum=False, name="Piano", notes=note_list, control_changes=new_cc_list))
     output.tempo_changes.append(TempoChange(target_tempo, 0))
     output.max_tick = max_tick