aif2pcm: Fix length reporting. Don't use a MARK chunk if no loop.

The reported sample length in the aif header can differ from the actual length of the SSND chunk. The END marker was being misused to contain the reported length, but this still counts as a loop in aif2agb, even if the START marker is omitted (it defaults to the END value). Now the reported length is in the COMM chunk, which is more correct.
2024-11-23 13:09:40 +00:00 · 2017-01-08 16:06:19 -05:00 · 2017-01-08 16:06:19 -05:00 · 10e5474a65
commit 10e5474a65
parent d8aee3a4a5
434 changed files with 45 additions and 38 deletions
--- a/sound/direct_sound_samples/845AE14.aif
+++ b/sound/direct_sound_samples/845AE14.aif
--- a/sound/direct_sound_samples/845B2B4.aif
+++ b/sound/direct_sound_samples/845B2B4.aif
--- a/sound/direct_sound_samples/845B9A8.aif
+++ b/sound/direct_sound_samples/845B9A8.aif
--- a/sound/direct_sound_samples/845C238.aif
+++ b/sound/direct_sound_samples/845C238.aif
--- a/sound/direct_sound_samples/845DAF0.aif
+++ b/sound/direct_sound_samples/845DAF0.aif
--- a/sound/direct_sound_samples/845FCC8.aif
+++ b/sound/direct_sound_samples/845FCC8.aif
--- a/sound/direct_sound_samples/8461D8C.aif
+++ b/sound/direct_sound_samples/8461D8C.aif
--- a/sound/direct_sound_samples/84622A4.aif
+++ b/sound/direct_sound_samples/84622A4.aif
--- a/sound/direct_sound_samples/8488F44.aif
+++ b/sound/direct_sound_samples/8488F44.aif
--- a/sound/direct_sound_samples/848A8A4.aif
+++ b/sound/direct_sound_samples/848A8A4.aif
--- a/sound/direct_sound_samples/8492D10.aif
+++ b/sound/direct_sound_samples/8492D10.aif
--- a/sound/direct_sound_samples/8639898.aif
+++ b/sound/direct_sound_samples/8639898.aif
--- a/sound/direct_sound_samples/863A3DC.aif
+++ b/sound/direct_sound_samples/863A3DC.aif
--- a/sound/direct_sound_samples/863AD2C.aif
+++ b/sound/direct_sound_samples/863AD2C.aif
--- a/sound/direct_sound_samples/863BABC.aif
+++ b/sound/direct_sound_samples/863BABC.aif
--- a/sound/direct_sound_samples/863C744.aif
+++ b/sound/direct_sound_samples/863C744.aif
--- a/sound/direct_sound_samples/863D0EC.aif
+++ b/sound/direct_sound_samples/863D0EC.aif
--- a/sound/direct_sound_samples/863DED0.aif
+++ b/sound/direct_sound_samples/863DED0.aif
--- a/sound/direct_sound_samples/863EBDC.aif
+++ b/sound/direct_sound_samples/863EBDC.aif
--- a/sound/direct_sound_samples/863F390.aif
+++ b/sound/direct_sound_samples/863F390.aif
--- a/sound/direct_sound_samples/8640330.aif
+++ b/sound/direct_sound_samples/8640330.aif
--- a/sound/direct_sound_samples/8641170.aif
+++ b/sound/direct_sound_samples/8641170.aif
--- a/sound/direct_sound_samples/8641E18.aif
+++ b/sound/direct_sound_samples/8641E18.aif
--- a/sound/direct_sound_samples/864244C.aif
+++ b/sound/direct_sound_samples/864244C.aif
--- a/sound/direct_sound_samples/8643650.aif
+++ b/sound/direct_sound_samples/8643650.aif
--- a/sound/direct_sound_samples/8644154.aif
+++ b/sound/direct_sound_samples/8644154.aif
--- a/sound/direct_sound_samples/8644950.aif
+++ b/sound/direct_sound_samples/8644950.aif
--- a/sound/direct_sound_samples/86452B4.aif
+++ b/sound/direct_sound_samples/86452B4.aif
--- a/sound/direct_sound_samples/8646878.aif
+++ b/sound/direct_sound_samples/8646878.aif
--- a/sound/direct_sound_samples/864734C.aif
+++ b/sound/direct_sound_samples/864734C.aif
--- a/sound/direct_sound_samples/8648808.aif
+++ b/sound/direct_sound_samples/8648808.aif
--- a/sound/direct_sound_samples/8649654.aif
+++ b/sound/direct_sound_samples/8649654.aif
--- a/sound/direct_sound_samples/864B030.aif
+++ b/sound/direct_sound_samples/864B030.aif
--- a/sound/direct_sound_samples/864BBC4.aif
+++ b/sound/direct_sound_samples/864BBC4.aif
--- a/sound/direct_sound_samples/864CBDC.aif
+++ b/sound/direct_sound_samples/864CBDC.aif
--- a/sound/direct_sound_samples/864D6BC.aif
+++ b/sound/direct_sound_samples/864D6BC.aif
--- a/sound/direct_sound_samples/864E410.aif
+++ b/sound/direct_sound_samples/864E410.aif
--- a/sound/direct_sound_samples/864ED4C.aif
+++ b/sound/direct_sound_samples/864ED4C.aif
--- a/sound/direct_sound_samples/864FA6C.aif
+++ b/sound/direct_sound_samples/864FA6C.aif
--- a/sound/direct_sound_samples/86507E0.aif
+++ b/sound/direct_sound_samples/86507E0.aif
--- a/sound/direct_sound_samples/8651148.aif
+++ b/sound/direct_sound_samples/8651148.aif
--- a/sound/direct_sound_samples/8651910.aif
+++ b/sound/direct_sound_samples/8651910.aif
--- a/sound/direct_sound_samples/8652884.aif
+++ b/sound/direct_sound_samples/8652884.aif
--- a/sound/direct_sound_samples/8653040.aif
+++ b/sound/direct_sound_samples/8653040.aif
--- a/sound/direct_sound_samples/8654170.aif
+++ b/sound/direct_sound_samples/8654170.aif
--- a/sound/direct_sound_samples/cry_abra.aif
+++ b/sound/direct_sound_samples/cry_abra.aif
--- a/sound/direct_sound_samples/cry_absol.aif
+++ b/sound/direct_sound_samples/cry_absol.aif
--- a/sound/direct_sound_samples/cry_aerodactyl.aif
+++ b/sound/direct_sound_samples/cry_aerodactyl.aif
--- a/sound/direct_sound_samples/cry_aggron.aif
+++ b/sound/direct_sound_samples/cry_aggron.aif
--- a/sound/direct_sound_samples/cry_aipom.aif
+++ b/sound/direct_sound_samples/cry_aipom.aif
--- a/sound/direct_sound_samples/cry_alakazam.aif
+++ b/sound/direct_sound_samples/cry_alakazam.aif
--- a/sound/direct_sound_samples/cry_altaria.aif
+++ b/sound/direct_sound_samples/cry_altaria.aif
--- a/sound/direct_sound_samples/cry_ampharos.aif
+++ b/sound/direct_sound_samples/cry_ampharos.aif
--- a/sound/direct_sound_samples/cry_anorith.aif
+++ b/sound/direct_sound_samples/cry_anorith.aif
--- a/sound/direct_sound_samples/cry_arbok.aif
+++ b/sound/direct_sound_samples/cry_arbok.aif
--- a/sound/direct_sound_samples/cry_arcanine.aif
+++ b/sound/direct_sound_samples/cry_arcanine.aif
--- a/sound/direct_sound_samples/cry_ariados.aif
+++ b/sound/direct_sound_samples/cry_ariados.aif
--- a/sound/direct_sound_samples/cry_armaldo.aif
+++ b/sound/direct_sound_samples/cry_armaldo.aif
--- a/sound/direct_sound_samples/cry_aron.aif
+++ b/sound/direct_sound_samples/cry_aron.aif
--- a/sound/direct_sound_samples/cry_articuno.aif
+++ b/sound/direct_sound_samples/cry_articuno.aif
--- a/sound/direct_sound_samples/cry_azumarill.aif
+++ b/sound/direct_sound_samples/cry_azumarill.aif
--- a/sound/direct_sound_samples/cry_azurill.aif
+++ b/sound/direct_sound_samples/cry_azurill.aif
--- a/sound/direct_sound_samples/cry_bagon.aif
+++ b/sound/direct_sound_samples/cry_bagon.aif
--- a/sound/direct_sound_samples/cry_baltoy.aif
+++ b/sound/direct_sound_samples/cry_baltoy.aif
--- a/sound/direct_sound_samples/cry_banette.aif
+++ b/sound/direct_sound_samples/cry_banette.aif
--- a/sound/direct_sound_samples/cry_barboach.aif
+++ b/sound/direct_sound_samples/cry_barboach.aif
--- a/sound/direct_sound_samples/cry_bayleef.aif
+++ b/sound/direct_sound_samples/cry_bayleef.aif
--- a/sound/direct_sound_samples/cry_beautifly.aif
+++ b/sound/direct_sound_samples/cry_beautifly.aif
--- a/sound/direct_sound_samples/cry_beedrill.aif
+++ b/sound/direct_sound_samples/cry_beedrill.aif
--- a/sound/direct_sound_samples/cry_beldum.aif
+++ b/sound/direct_sound_samples/cry_beldum.aif
--- a/sound/direct_sound_samples/cry_bellossom.aif
+++ b/sound/direct_sound_samples/cry_bellossom.aif
--- a/sound/direct_sound_samples/cry_bellsprout.aif
+++ b/sound/direct_sound_samples/cry_bellsprout.aif
--- a/sound/direct_sound_samples/cry_blastoise.aif
+++ b/sound/direct_sound_samples/cry_blastoise.aif
--- a/sound/direct_sound_samples/cry_blaziken.aif
+++ b/sound/direct_sound_samples/cry_blaziken.aif
--- a/sound/direct_sound_samples/cry_blissey.aif
+++ b/sound/direct_sound_samples/cry_blissey.aif
--- a/sound/direct_sound_samples/cry_breloom.aif
+++ b/sound/direct_sound_samples/cry_breloom.aif
--- a/sound/direct_sound_samples/cry_bulbasaur.aif
+++ b/sound/direct_sound_samples/cry_bulbasaur.aif
--- a/sound/direct_sound_samples/cry_butterfree.aif
+++ b/sound/direct_sound_samples/cry_butterfree.aif
--- a/sound/direct_sound_samples/cry_cacnea.aif
+++ b/sound/direct_sound_samples/cry_cacnea.aif
--- a/sound/direct_sound_samples/cry_cacturne.aif
+++ b/sound/direct_sound_samples/cry_cacturne.aif
--- a/sound/direct_sound_samples/cry_camerupt.aif
+++ b/sound/direct_sound_samples/cry_camerupt.aif
--- a/sound/direct_sound_samples/cry_carvanha.aif
+++ b/sound/direct_sound_samples/cry_carvanha.aif
--- a/sound/direct_sound_samples/cry_cascoon.aif
+++ b/sound/direct_sound_samples/cry_cascoon.aif
--- a/sound/direct_sound_samples/cry_castform.aif
+++ b/sound/direct_sound_samples/cry_castform.aif
--- a/sound/direct_sound_samples/cry_caterpie.aif
+++ b/sound/direct_sound_samples/cry_caterpie.aif
--- a/sound/direct_sound_samples/cry_celebi.aif
+++ b/sound/direct_sound_samples/cry_celebi.aif
--- a/sound/direct_sound_samples/cry_chansey.aif
+++ b/sound/direct_sound_samples/cry_chansey.aif
--- a/sound/direct_sound_samples/cry_charizard.aif
+++ b/sound/direct_sound_samples/cry_charizard.aif
--- a/sound/direct_sound_samples/cry_charmander.aif
+++ b/sound/direct_sound_samples/cry_charmander.aif
--- a/sound/direct_sound_samples/cry_charmeleon.aif
+++ b/sound/direct_sound_samples/cry_charmeleon.aif
--- a/sound/direct_sound_samples/cry_chikorita.aif
+++ b/sound/direct_sound_samples/cry_chikorita.aif
--- a/sound/direct_sound_samples/cry_chimecho.aif
+++ b/sound/direct_sound_samples/cry_chimecho.aif
--- a/sound/direct_sound_samples/cry_chinchou.aif
+++ b/sound/direct_sound_samples/cry_chinchou.aif
--- a/sound/direct_sound_samples/cry_clamperl.aif
+++ b/sound/direct_sound_samples/cry_clamperl.aif
--- a/sound/direct_sound_samples/cry_claydol.aif
+++ b/sound/direct_sound_samples/cry_claydol.aif
--- a/sound/direct_sound_samples/cry_clefable.aif
+++ b/sound/direct_sound_samples/cry_clefable.aif
--- a/sound/direct_sound_samples/cry_clefairy.aif
+++ b/sound/direct_sound_samples/cry_clefairy.aif
--- a/sound/direct_sound_samples/cry_cleffa.aif
+++ b/sound/direct_sound_samples/cry_cleffa.aif
--- a/sound/direct_sound_samples/cry_cloyster.aif
+++ b/sound/direct_sound_samples/cry_cloyster.aif
--- a/sound/direct_sound_samples/cry_combusken.aif
+++ b/sound/direct_sound_samples/cry_combusken.aif
--- a/Show More
+++ b/Show More