diff options
| -rw-r--r-- | AUTHORS.md | 8 | ||||
| -rw-r--r-- | DONORS.md | 44 | ||||
| -rw-r--r-- | modules/stb_vorbis/audio_stream_ogg_vorbis.cpp | 72 | ||||
| -rw-r--r-- | modules/stb_vorbis/audio_stream_ogg_vorbis.h | 13 | ||||
| -rw-r--r-- | modules/stb_vorbis/resource_importer_ogg_vorbis.cpp | 9 |
5 files changed, 113 insertions, 33 deletions
diff --git a/AUTHORS.md b/AUTHORS.md index 3fd8227fa7..588ce97322 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -30,16 +30,20 @@ name is available. Alexander Holland (AlexHolly) Alexey Velikiy (jonyrock) Alket Rexhepi (alketii) + Andrea Catania (AndreaCatania) Andreas Haas (Hinsbart) Anton Yabchinskiy (a12n) Aren Villanueva (kurikaesu) Ariel Manzur (punto-) Bastiaan Olij (BastiaanOlij) + Ben Brookshire (sheepandshepherd) + Bernard Liebl (poke1024) Bojidar Marinov (bojidar-bg) Błażej Szczygieł (zaps166) Carl Olsson (not-surt) Dana Olson (adolson) Daniel J. Ramirez (djrm) + Дмитрий Сальников (DmitriySalnikov) Emmanuel Leblond (touilleMan) Fabio Alessandrelli (Faless) Ferenc Arn (tagcup) @@ -54,6 +58,7 @@ name is available. Hiroshi Ogawa (hi-ogawa) Hubert Jarosz (Marqin) Hugo Locurcio (Calinou) + Ian (ianb96) Ignacio Etcheverry (neikeq) Indah Sylvia (ISylvox) J08nY @@ -69,6 +74,8 @@ name is available. Mariano Javier Suligoy (MarianoGnu) Mario Schlack (hurikhan) Masoud BH (masoudbh3) + Matthias Hölzl (hoelzl) + Max Hilbrunner (mhilbrunner) Nathan Warden (NathanWarden) Nuno Donato (nunodonato) Ovnuniarchos @@ -77,6 +84,7 @@ name is available. Pawel Kowal (pkowal1982) Pedro J. Estébanez (RandomShaper) Poommetee Ketson (Noshyaar) + Przemysław Gołąb (n-pigeon) Ralf Hölzemer (rollenrolm) Ramesh Ravone (RameshRavone) Ray Koopa (RayKoopa) @@ -17,32 +17,35 @@ None so far, but your company could be the first! :) ## Gold sponsors Gamblify <https://www.gamblify.com> + GameDev.TV <https://www.gamedev.tv> ## Mini sponsors Andreas Andreas Hirschauer Christian Uldall Pedersen + Christoph Woinke E Hewert Hein-Pieter van Braam Matthieu Huvé Nathan Warden Neal Gompa (Conan Kudo) Olimpiu Metiu + Pascal Julien Ruslan Mustakov Slobodan Milnovic ## Gold donors + 3Dexplorer Alexander Otto + Andy Meier Asdf - Blair Allen cheese65536 Jake Bo Javier Manuele Finocchiaro Officine Pixel S.n.c. - Ranoller Rémi Verschelde Stephan Lanfermann @@ -50,8 +53,10 @@ None so far, but your company could be the first! :) Austen McRae Bernhard Liebl Gerald E Butler + Jahn Johansen Jordan M Lucas Kris Michael + Ranoller BanjoNode2D Chris Serino @@ -63,7 +68,6 @@ None so far, but your company could be the first! :) Henrique Alves Laurence Bannister Leo - mhilbrunner Przemysław Gołąb (n-pigeon) Robert Willes Robin Arys @@ -72,9 +76,12 @@ None so far, but your company could be the first! :) Testus Maximus Thomas Bjarnelöf Xavier Tan + Zaq Poi Amanda Haldy Andreas Haas + Andres Cuevas + Arnaud Verstuyf Bryanna M Chris Brown Cody Parker @@ -82,16 +89,16 @@ None so far, but your company could be the first! :) Ezra Theunissen flesk François Cantin + Giovanni Solimeno Hendrik Mans Jeppe Zapp Justin Arnold Justo Delgado Baudí Leandro Voltolino Lucien Boudy - Myles Noah + Ryan Estes Trent McPheron - x1212 ## Silver donors @@ -102,23 +109,36 @@ None so far, but your company could be the first! :) Avencherus Bastian Böhm Ben Vercammen + Blair Allen Bryan Stevenson Christian Baune Christian Winter Collin Shooltz + Daniel Kaplan + David Cravens + David May + Diego Moreira Guimarães Dominik Wetzel + Eric Martini Fabian Becker fengjiongmax - Fredy Romero Sam + Frank C. Simmons Geequlim Gerrit Großkopf Guldoman + Gustav Dahlström + HardRound hatniX HeartBeast Heribert Hirth Hunter Jones + Jaime Ruiz-Borau Vizárraga + Jeff Hungerford + Jesse Liles + joe513 Jonathon Josh 'Cheeseness' Bush + Juan Negrier JuDelCo Julian Murgia Juraj Móza @@ -127,6 +147,7 @@ None so far, but your company could be the first! :) Kevin Kamper Meejach Petersen Klavdij Voncina Kobi Malul + Linus Lind Lundgren Lisandro Lorea magodev Martin Novák @@ -134,7 +155,9 @@ None so far, but your company could be the first! :) Matthew Valancy Matthias Hölzl Max R.R. Collada + mhilbrunner Michael Gringauz + Michael Tintiuc Mikael Olsson MoM Moritz Laass @@ -142,9 +165,10 @@ None so far, but your company could be the first! :) Neil Blakey-Milner Nik Lee Niko Leopold - nvgrod + Oleg Tyshchenko Pablo Seibelt Pan Ip + Pat LaBine Patrick Nafarrete Paul Mason Paweł Kowal @@ -153,17 +177,15 @@ None so far, but your company could be the first! :) rayos Richman Stewart Roger Smith - Ryan Estes + Roman Tinkov Sam Van Campenhout - Sam Vila Sasori Olkof Scott D. Yelich Sootstone - Tavo Tell TheHappieCat Theo Cranmore + Thomas Norman Tom Larrow - Troy Bonneau UltyX Wout Standaert Xananax & karroffel diff --git a/modules/stb_vorbis/audio_stream_ogg_vorbis.cpp b/modules/stb_vorbis/audio_stream_ogg_vorbis.cpp index 5c252bda86..951fc002b7 100644 --- a/modules/stb_vorbis/audio_stream_ogg_vorbis.cpp +++ b/modules/stb_vorbis/audio_stream_ogg_vorbis.cpp @@ -36,36 +36,54 @@ #include "thirdparty/misc/stb_vorbis.c" #pragma GCC diagnostic pop +#ifndef CLAMP +#define CLAMP(m_a, m_min, m_max) (((m_a) < (m_min)) ? (m_min) : (((m_a) > (m_max)) ? m_max : m_a)) +#endif + void AudioStreamPlaybackOGGVorbis::_mix_internal(AudioFrame *p_buffer, int p_frames) { ERR_FAIL_COND(!active); int todo = p_frames; - while (todo && active) { + int start_buffer = 0; - int mixed = stb_vorbis_get_samples_float_interleaved(ogg_stream, 2, (float *)p_buffer, todo * 2); + while (todo > 0 && active) { + float *buffer = (float *)p_buffer; + if (start_buffer > 0) { + buffer = (buffer + start_buffer * 2); + } + int mixed = stb_vorbis_get_samples_float_interleaved(ogg_stream, 2, buffer, todo * 2); if (vorbis_stream->channels == 1 && mixed > 0) { //mix mono to stereo - for (int i = 0; i < mixed; i++) { + for (int i = start_buffer; i < mixed; i++) { p_buffer[i].r = p_buffer[i].l; } } todo -= mixed; frames_mixed += mixed; - if (todo) { + if (todo > 0) { //end of file! if (vorbis_stream->loop) { - //loop - seek(vorbis_stream->loop_offset); + //loop to the loop_beginning + seek(vorbis_stream->loop_begin); loops++; + // we still have buffer to fill, start from this element in the next iteration. + start_buffer = p_frames - todo; } else { - for (int i = mixed; i < p_frames; i++) { + for (int i = p_frames - todo; i < p_frames; i++) { p_buffer[i] = AudioFrame(0, 0); } active = false; + todo = 0; } + } else if (vorbis_stream->loop && frames_mixed >= vorbis_stream->loop_end_frames) { + // We reached loop_end. Loop to loop_begin plus whatever extra length we already mixed + uint32_t frames_to_advance = uint32_t(frames_mixed - vorbis_stream->loop_end_frames); + float start_loop = vorbis_stream->loop_begin + (float(frames_to_advance) / vorbis_stream->sample_rate); + seek(start_loop); + loops++; } } } @@ -199,6 +217,9 @@ void AudioStreamOGGVorbis::set_data(const PoolVector<uint8_t> &p_data) { //print_line("succeeded "+itos(ogg_alloc.alloc_buffer_length_in_bytes)+" setup "+itos(info.setup_memory_required)+" setup temp "+itos(info.setup_temp_memory_required)+" temp "+itos(info.temp_memory_required)+" maxframe"+itos(info.max_frame_size)); length = stb_vorbis_stream_length_in_seconds(ogg_stream); + if (loop_end == 0) { + set_loop_end(length); + } stb_vorbis_close(ogg_stream); data = AudioServer::get_singleton()->audio_data_alloc(src_data_len, src_datar.ptr()); @@ -233,12 +254,24 @@ bool AudioStreamOGGVorbis::has_loop() const { return loop; } -void AudioStreamOGGVorbis::set_loop_offset(float p_seconds) { - loop_offset = p_seconds; +void AudioStreamOGGVorbis::set_loop_begin(float p_seconds) { + p_seconds = CLAMP(p_seconds, 0, length); + loop_begin = p_seconds; + loop_begin_frames = uint32_t(sample_rate * p_seconds); +} + +float AudioStreamOGGVorbis::get_loop_begin() const { + return loop_begin; +} + +void AudioStreamOGGVorbis::set_loop_end(float p_seconds) { + p_seconds = CLAMP(p_seconds, 0, length); + loop_end = p_seconds; + loop_end_frames = uint32_t(sample_rate * p_seconds); } -float AudioStreamOGGVorbis::get_loop_offset() const { - return loop_offset; +float AudioStreamOGGVorbis::get_loop_end() const { + return loop_end; } void AudioStreamOGGVorbis::_bind_methods() { @@ -249,12 +282,16 @@ void AudioStreamOGGVorbis::_bind_methods() { ClassDB::bind_method(D_METHOD("set_loop", "enable"), &AudioStreamOGGVorbis::set_loop); ClassDB::bind_method(D_METHOD("has_loop"), &AudioStreamOGGVorbis::has_loop); - ClassDB::bind_method(D_METHOD("set_loop_offset", "seconds"), &AudioStreamOGGVorbis::set_loop_offset); - ClassDB::bind_method(D_METHOD("get_loop_offset"), &AudioStreamOGGVorbis::get_loop_offset); + ClassDB::bind_method(D_METHOD("set_loop_begin", "seconds"), &AudioStreamOGGVorbis::set_loop_begin); + ClassDB::bind_method(D_METHOD("get_loop_begin"), &AudioStreamOGGVorbis::get_loop_begin); + + ClassDB::bind_method(D_METHOD("set_loop_end", "seconds"), &AudioStreamOGGVorbis::set_loop_end); + ClassDB::bind_method(D_METHOD("get_loop_end"), &AudioStreamOGGVorbis::get_loop_end); ADD_PROPERTY(PropertyInfo(Variant::POOL_BYTE_ARRAY, "data", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_data", "get_data"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "loop", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_loop", "has_loop"); - ADD_PROPERTY(PropertyInfo(Variant::REAL, "loop_offset", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_loop_offset", "get_loop_offset"); + ADD_PROPERTY(PropertyInfo(Variant::REAL, "loop_begin", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_loop_begin", "get_loop_begin"); + ADD_PROPERTY(PropertyInfo(Variant::REAL, "loop_end", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_loop_end", "get_loop_end"); } AudioStreamOGGVorbis::AudioStreamOGGVorbis() { @@ -263,7 +300,10 @@ AudioStreamOGGVorbis::AudioStreamOGGVorbis() { length = 0; sample_rate = 1; channels = 1; - loop_offset = 0; + loop_begin = 0; + loop_end = 0; + loop_begin_frames = 0; + loop_end_frames = 0; decode_mem_size = 0; - loop = false; + loop = true; } diff --git a/modules/stb_vorbis/audio_stream_ogg_vorbis.h b/modules/stb_vorbis/audio_stream_ogg_vorbis.h index f4d381897b..9297d2246b 100644 --- a/modules/stb_vorbis/audio_stream_ogg_vorbis.h +++ b/modules/stb_vorbis/audio_stream_ogg_vorbis.h @@ -92,7 +92,11 @@ class AudioStreamOGGVorbis : public AudioStream { int channels; float length; bool loop; - float loop_offset; + float loop_begin; + float loop_end; + + uint32_t loop_begin_frames; + uint32_t loop_end_frames; protected: static void _bind_methods(); @@ -101,8 +105,11 @@ public: void set_loop(bool p_enable); bool has_loop() const; - void set_loop_offset(float p_seconds); - float get_loop_offset() const; + void set_loop_begin(float p_seconds); + float get_loop_begin() const; + + void set_loop_end(float p_seconds); + float get_loop_end() const; virtual Ref<AudioStreamPlayback> instance_playback(); virtual String get_stream_name() const; diff --git a/modules/stb_vorbis/resource_importer_ogg_vorbis.cpp b/modules/stb_vorbis/resource_importer_ogg_vorbis.cpp index 4d28dc027b..b7949e381c 100644 --- a/modules/stb_vorbis/resource_importer_ogg_vorbis.cpp +++ b/modules/stb_vorbis/resource_importer_ogg_vorbis.cpp @@ -72,13 +72,15 @@ String ResourceImporterOGGVorbis::get_preset_name(int p_idx) const { void ResourceImporterOGGVorbis::get_import_options(List<ImportOption> *r_options, int p_preset) const { r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "loop"), true)); - r_options->push_back(ImportOption(PropertyInfo(Variant::REAL, "loop_offset"), 0)); + r_options->push_back(ImportOption(PropertyInfo(Variant::REAL, "loop_begin"), 0)); + r_options->push_back(ImportOption(PropertyInfo(Variant::REAL, "loop_end"), 0)); } Error ResourceImporterOGGVorbis::import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files) { bool loop = p_options["loop"]; - float loop_offset = p_options["loop_offset"]; + float loop_begin = p_options["loop_begin"]; + float loop_end = p_options["loop_end"]; FileAccess *f = FileAccess::open(p_source_file, FileAccess::READ); if (!f) { @@ -100,7 +102,8 @@ Error ResourceImporterOGGVorbis::import(const String &p_source_file, const Strin ogg_stream->set_data(data); ogg_stream->set_loop(loop); - ogg_stream->set_loop_offset(loop_offset); + ogg_stream->set_loop_begin(loop_begin); + if (loop_end > 0) ogg_stream->set_loop_end(loop_end); return ResourceSaver::save(p_save_path + ".oggstr", ogg_stream); } |