From 30257c767be211b39d2576ddce89c7473092bf74 Mon Sep 17 00:00:00 2001 From: hmzh Date: Thu, 18 Aug 2022 20:44:21 +0000 Subject: [PATCH] Fix the command sample size given to trackOutput. Remove the manual overwriting of Note ON events that have 0 velocity with Note OFF. JSyn handles this already. - The implementation of "running status" means that the amount of bytes read from the file differ from the size of the sample that ends up in the decoder. The decoder sample contains the applied running status (status of previous event), which the file bytes don't contain. PiperOrigin-RevId: 468537659 --- .../extractordumps/midi/Twinkle.mid.0.dump | 28 +++++++++---------- .../midi/Twinkle.mid.unknown_length.dump | 28 +++++++++---------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/libraries/test_data/src/test/assets/extractordumps/midi/Twinkle.mid.0.dump b/libraries/test_data/src/test/assets/extractordumps/midi/Twinkle.mid.0.dump index 0e660017e4..013f97a05c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/midi/Twinkle.mid.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/midi/Twinkle.mid.0.dump @@ -41,7 +41,7 @@ track 0: sample 7: time = 500000 flags = 1 - data = length 3, hash FFFE9B23 + data = length 3, hash FFFED733 sample 8: time = 500000 flags = 1 @@ -65,7 +65,7 @@ track 0: sample 13: time = 1000000 flags = 1 - data = length 3, hash FFFE9B23 + data = length 3, hash FFFED733 sample 14: time = 1000000 flags = 1 @@ -89,7 +89,7 @@ track 0: sample 19: time = 1500000 flags = 1 - data = length 3, hash FFFE9BFC + data = length 3, hash FFFED80C sample 20: time = 1500000 flags = 1 @@ -113,7 +113,7 @@ track 0: sample 25: time = 2000000 flags = 1 - data = length 3, hash FFFE9BFC + data = length 3, hash FFFED80C sample 26: time = 2000000 flags = 1 @@ -137,7 +137,7 @@ track 0: sample 31: time = 2500000 flags = 1 - data = length 3, hash FFFE9C3A + data = length 3, hash FFFED84A sample 32: time = 2500000 flags = 1 @@ -161,7 +161,7 @@ track 0: sample 37: time = 3000000 flags = 1 - data = length 3, hash FFFE9C3A + data = length 3, hash FFFED84A sample 38: time = 3000000 flags = 1 @@ -205,7 +205,7 @@ track 0: sample 48: time = 4000000 flags = 1 - data = length 3, hash FFFE9BFC + data = length 3, hash FFFED80C sample 49: time = 4000000 flags = 1 @@ -229,7 +229,7 @@ track 0: sample 54: time = 4500000 flags = 1 - data = length 3, hash FFFE9BBE + data = length 3, hash FFFED7CE sample 55: time = 4500000 flags = 1 @@ -253,7 +253,7 @@ track 0: sample 60: time = 5000000 flags = 1 - data = length 3, hash FFFE9BBE + data = length 3, hash FFFED7CE sample 61: time = 5000000 flags = 1 @@ -269,7 +269,7 @@ track 0: sample 64: time = 5250000 flags = 1 - data = length 3, hash FFFE9B9F + data = length 3, hash FFFED7AF sample 65: time = 5350000 flags = 1 @@ -293,7 +293,7 @@ track 0: sample 70: time = 5750000 flags = 1 - data = length 3, hash FFFE9B9F + data = length 3, hash FFFED7AF sample 71: time = 5850000 flags = 1 @@ -317,7 +317,7 @@ track 0: sample 76: time = 6250000 flags = 1 - data = length 3, hash FFFE9B61 + data = length 3, hash FFFED771 sample 77: time = 6350000 flags = 1 @@ -341,7 +341,7 @@ track 0: sample 82: time = 6750000 flags = 1 - data = length 3, hash FFFE9B61 + data = length 3, hash FFFED771 sample 83: time = 6850000 flags = 1 @@ -393,5 +393,5 @@ track 0: sample 95: time = 8000000 flags = 1 - data = length 3, hash FFFE9B23 + data = length 3, hash FFFED733 tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/midi/Twinkle.mid.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/midi/Twinkle.mid.unknown_length.dump index 0e660017e4..013f97a05c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/midi/Twinkle.mid.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/midi/Twinkle.mid.unknown_length.dump @@ -41,7 +41,7 @@ track 0: sample 7: time = 500000 flags = 1 - data = length 3, hash FFFE9B23 + data = length 3, hash FFFED733 sample 8: time = 500000 flags = 1 @@ -65,7 +65,7 @@ track 0: sample 13: time = 1000000 flags = 1 - data = length 3, hash FFFE9B23 + data = length 3, hash FFFED733 sample 14: time = 1000000 flags = 1 @@ -89,7 +89,7 @@ track 0: sample 19: time = 1500000 flags = 1 - data = length 3, hash FFFE9BFC + data = length 3, hash FFFED80C sample 20: time = 1500000 flags = 1 @@ -113,7 +113,7 @@ track 0: sample 25: time = 2000000 flags = 1 - data = length 3, hash FFFE9BFC + data = length 3, hash FFFED80C sample 26: time = 2000000 flags = 1 @@ -137,7 +137,7 @@ track 0: sample 31: time = 2500000 flags = 1 - data = length 3, hash FFFE9C3A + data = length 3, hash FFFED84A sample 32: time = 2500000 flags = 1 @@ -161,7 +161,7 @@ track 0: sample 37: time = 3000000 flags = 1 - data = length 3, hash FFFE9C3A + data = length 3, hash FFFED84A sample 38: time = 3000000 flags = 1 @@ -205,7 +205,7 @@ track 0: sample 48: time = 4000000 flags = 1 - data = length 3, hash FFFE9BFC + data = length 3, hash FFFED80C sample 49: time = 4000000 flags = 1 @@ -229,7 +229,7 @@ track 0: sample 54: time = 4500000 flags = 1 - data = length 3, hash FFFE9BBE + data = length 3, hash FFFED7CE sample 55: time = 4500000 flags = 1 @@ -253,7 +253,7 @@ track 0: sample 60: time = 5000000 flags = 1 - data = length 3, hash FFFE9BBE + data = length 3, hash FFFED7CE sample 61: time = 5000000 flags = 1 @@ -269,7 +269,7 @@ track 0: sample 64: time = 5250000 flags = 1 - data = length 3, hash FFFE9B9F + data = length 3, hash FFFED7AF sample 65: time = 5350000 flags = 1 @@ -293,7 +293,7 @@ track 0: sample 70: time = 5750000 flags = 1 - data = length 3, hash FFFE9B9F + data = length 3, hash FFFED7AF sample 71: time = 5850000 flags = 1 @@ -317,7 +317,7 @@ track 0: sample 76: time = 6250000 flags = 1 - data = length 3, hash FFFE9B61 + data = length 3, hash FFFED771 sample 77: time = 6350000 flags = 1 @@ -341,7 +341,7 @@ track 0: sample 82: time = 6750000 flags = 1 - data = length 3, hash FFFE9B61 + data = length 3, hash FFFED771 sample 83: time = 6850000 flags = 1 @@ -393,5 +393,5 @@ track 0: sample 95: time = 8000000 flags = 1 - data = length 3, hash FFFE9B23 + data = length 3, hash FFFED733 tracksEnded = true