From c1f62a04d79acd1dab8e20829f2dcb9232de5c99 Mon Sep 17 00:00:00 2001 From: Anton Yabchinskiy Date: Thu, 20 Nov 2014 03:11:54 +0300 Subject: Import sources for libao driver (unfinished, based on dummy driver) --- drivers/ao/SCsub | 5 ++ drivers/ao/audio_driver_ao.cpp | 129 +++++++++++++++++++++++++++++++++++++++++ drivers/ao/audio_driver_ao.h | 76 ++++++++++++++++++++++++ 3 files changed, 210 insertions(+) create mode 100644 drivers/ao/SCsub create mode 100644 drivers/ao/audio_driver_ao.cpp create mode 100644 drivers/ao/audio_driver_ao.h diff --git a/drivers/ao/SCsub b/drivers/ao/SCsub new file mode 100644 index 0000000000..9fbb467baa --- /dev/null +++ b/drivers/ao/SCsub @@ -0,0 +1,5 @@ +Import('env') + +env.add_source_files(env.drivers_sources,"*.cpp") + +Export('env') diff --git a/drivers/ao/audio_driver_ao.cpp b/drivers/ao/audio_driver_ao.cpp new file mode 100644 index 0000000000..02e994da6c --- /dev/null +++ b/drivers/ao/audio_driver_ao.cpp @@ -0,0 +1,129 @@ +/*************************************************************************/ +/* audio_driver_ao.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ +#include "audio_driver_ao.h" + +#include "globals.h" +#include "os/os.h" + +Error AudioDriverAO::init() { + + active = false; + thread_exited = false; + exit_thread = false; + pcm_open = false; + samples_in = NULL; + + mix_rate = 44100; + output_format = OUTPUT_STEREO; + channels = 2; + + int latency = GLOBAL_DEF("audio/output_latency",25); + buffer_size = nearest_power_of_2( latency * mix_rate / 1000 ); + + samples_in = memnew_arr(int32_t, buffer_size*channels); + + mutex = Mutex::create(); + thread = Thread::create(AudioDriverAO::thread_func, this); + + return OK; +}; + +void AudioDriverAO::thread_func(void* p_udata) { + + AudioDriverAO* ad = (AudioDriverAO*)p_udata; + + uint64_t usdelay = (ad->buffer_size / float(ad->mix_rate))*1000000; + + while (!ad->exit_thread) { + if (!ad->active) { + + } else { + ad->lock(); + ad->audio_server_process(ad->buffer_size, ad->samples_in); + ad->unlock(); + + }; + + OS::get_singleton()->delay_usec(usdelay); + }; + + ad->thread_exited=true; +}; + +void AudioDriverAO::start() { + active = true; +}; + +int AudioDriverAO::get_mix_rate() const { + return mix_rate; +}; + +AudioDriverSW::OutputFormat AudioDriverAO::get_output_format() const { + return output_format; +}; + +void AudioDriverAO::lock() { + if (!thread || !mutex) + return; + mutex->lock(); +}; + +void AudioDriverAO::unlock() { + if (!thread || !mutex) + return; + mutex->unlock(); +}; + +void AudioDriverAO::finish() { + if (!thread) + return; + + exit_thread = true; + Thread::wait_to_finish(thread); + + if (samples_in) { + memdelete_arr(samples_in); + }; + + memdelete(thread); + if (mutex) + memdelete(mutex); + thread = NULL; +}; + +AudioDriverAO::AudioDriverAO() { + + mutex = NULL; + thread = NULL; + +}; + +AudioDriverAO::~AudioDriverAO() { + +}; diff --git a/drivers/ao/audio_driver_ao.h b/drivers/ao/audio_driver_ao.h new file mode 100644 index 0000000000..d59bb6969c --- /dev/null +++ b/drivers/ao/audio_driver_ao.h @@ -0,0 +1,76 @@ +/*************************************************************************/ +/* audio_driver_ao.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ +#include "servers/audio/audio_server_sw.h" + +#ifdef AO_ENABLED + +#include "core/os/thread.h" +#include "core/os/mutex.h" + +#include + +class AudioDriverAO : public AudioDriverSW { + + Thread* thread; + Mutex* mutex; + + int32_t* samples_in; + + static void thread_func(void* p_udata); + int buffer_size; + + unsigned int mix_rate; + OutputFormat output_format; + + int channels; + + bool active; + bool thread_exited; + mutable bool exit_thread; + bool pcm_open; + +public: + + const char* get_name() const { + return "libao"; + }; + + virtual Error init(); + virtual void start(); + virtual int get_mix_rate() const; + virtual OutputFormat get_output_format() const; + virtual void lock(); + virtual void unlock(); + virtual void finish(); + + AudioDriverAO(); + ~AudioDriverAO(); +}; + +#endif -- cgit v1.2.3 From 05f6c730200e1463b98a7f15dbb06ebb7ed2f15d Mon Sep 17 00:00:00 2001 From: Anton Yabchinskiy Date: Thu, 20 Nov 2014 03:12:29 +0300 Subject: Add 'ao' build option --- SConstruct | 1 + 1 file changed, 1 insertion(+) diff --git a/SConstruct b/SConstruct index fc9c7dca35..4b59d27921 100644 --- a/SConstruct +++ b/SConstruct @@ -111,6 +111,7 @@ opts.Add('pvr','PVR (PowerVR) Texture loader support (yes/no)','yes') opts.Add('builtin_zlib','Use built-in zlib (yes/no)','yes') opts.Add('openssl','Use OpenSSL (yes/no/builtin)','no') opts.Add('musepack','Musepack Audio (yes/no)','yes') +opts.Add('ao', 'Enable libao audio driver (yes/no)', 'no') opts.Add("CXX", "Compiler"); opts.Add("CCFLAGS", "Custom flags for the C++ compiler"); opts.Add("CFLAGS", "Custom flags for the C compiler"); -- cgit v1.2.3 From 540b95f5b0076570b60ed5e6c7815e472225e1b3 Mon Sep 17 00:00:00 2001 From: Anton Yabchinskiy Date: Thu, 20 Nov 2014 03:13:14 +0300 Subject: Add ao/ subdir to drivers/SCsub --- drivers/SCsub | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/SCsub b/drivers/SCsub index bfd35344ea..67fbfeb576 100644 --- a/drivers/SCsub +++ b/drivers/SCsub @@ -7,6 +7,7 @@ Export('env') SConscript('unix/SCsub'); SConscript('alsa/SCsub'); +SConscript('ao/SCsub'); SConscript('windows/SCsub'); SConscript('gles2/SCsub'); SConscript('gles1/SCsub'); -- cgit v1.2.3 From c26a1b9d7b9ad82d782c574087054b4c49b28821 Mon Sep 17 00:00:00 2001 From: Anton Yabchinskiy Date: Thu, 20 Nov 2014 03:15:45 +0300 Subject: Use libao driver on X11 platform --- platform/x11/detect.py | 5 +++++ platform/x11/os_x11.cpp | 4 ++++ platform/x11/os_x11.h | 5 +++++ 3 files changed, 14 insertions(+) diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 1c8d231d4a..d879354f74 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -111,6 +111,11 @@ def configure(env): env.ParseConfig('pkg-config freetype2 --cflags --libs') env.Append(CCFLAGS=['-DFREETYPE_ENABLED']) + + if env['ao'] == 'yes': + env.ParseConfig('pkg-config ao --cflags --libs') + env.Append(CPPFLAGS=['-DAO_ENABLED']) + env.Append(CPPFLAGS=['-DOPENGL_ENABLED','-DGLEW_ENABLED']) env.Append(CPPFLAGS=["-DALSA_ENABLED"]) diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 4c45fcfaaf..b11fd76249 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -1384,6 +1384,10 @@ OS_X11::OS_X11() { AudioDriverManagerSW::add_driver(&driver_alsa); #endif +#ifdef AO_ENABLED + AudioDriverManagerSW::add_driver(&driver_ao); +#endif + minimized = false; xim_style=NULL; mouse_mode=MOUSE_MODE_VISIBLE; diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h index 2ffca0e042..815896bc37 100644 --- a/platform/x11/os_x11.h +++ b/platform/x11/os_x11.h @@ -43,6 +43,7 @@ #include "servers/spatial_sound_2d/spatial_sound_2d_server_sw.h" #include "drivers/rtaudio/audio_driver_rtaudio.h" #include "drivers/alsa/audio_driver_alsa.h" +#include "drivers/ao/audio_driver_ao.h" #include "servers/physics_2d/physics_2d_server_sw.h" #include @@ -129,6 +130,10 @@ class OS_X11 : public OS_Unix { AudioDriverALSA driver_alsa; #endif +#ifdef AO_ENABLED + AudioDriverAO driver_ao; +#endif + enum { JOYSTICKS_MAX = 8, MAX_JOY_AXIS = 32768, // I've no idea -- cgit v1.2.3 From 9fb49e56a4bead2651abb8a86652715902aa493f Mon Sep 17 00:00:00 2001 From: Anton Yabchinskiy Date: Sat, 22 Nov 2014 02:25:12 +0300 Subject: Initialize/shutdown libao --- drivers/ao/audio_driver_ao.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/ao/audio_driver_ao.cpp b/drivers/ao/audio_driver_ao.cpp index 02e994da6c..29c90b5bdf 100644 --- a/drivers/ao/audio_driver_ao.cpp +++ b/drivers/ao/audio_driver_ao.cpp @@ -118,12 +118,12 @@ void AudioDriverAO::finish() { }; AudioDriverAO::AudioDriverAO() { - mutex = NULL; thread = NULL; + ao_initialize(); }; AudioDriverAO::~AudioDriverAO() { - + ao_shutdown(); }; -- cgit v1.2.3 From 2f92e2a67ad3fcd98ccff4482fdb75cd6eb33be3 Mon Sep 17 00:00:00 2001 From: Anton Yabchinskiy Date: Sat, 22 Nov 2014 02:58:32 +0300 Subject: Open/close libao audio device --- drivers/ao/audio_driver_ao.cpp | 15 +++++++++++++++ drivers/ao/audio_driver_ao.h | 2 ++ 2 files changed, 17 insertions(+) diff --git a/drivers/ao/audio_driver_ao.cpp b/drivers/ao/audio_driver_ao.cpp index 29c90b5bdf..d143b4aa6e 100644 --- a/drivers/ao/audio_driver_ao.cpp +++ b/drivers/ao/audio_driver_ao.cpp @@ -43,6 +43,17 @@ Error AudioDriverAO::init() { output_format = OUTPUT_STEREO; channels = 2; + ao_sample_format format; + + format.bits = 16; + format.rate = mix_rate; + format.channels = channels; + format.byte_format = AO_FMT_LITTLE; + format.matrix = "L,R"; + + device = ao_open_live(ao_default_driver_id(), &format, 0); + ERR_FAIL_COND_V(device == 0, ERR_CANT_OPEN); + int latency = GLOBAL_DEF("audio/output_latency",25); buffer_size = nearest_power_of_2( latency * mix_rate / 1000 ); @@ -114,6 +125,10 @@ void AudioDriverAO::finish() { memdelete(thread); if (mutex) memdelete(mutex); + + if (device) + ao_close(device); + thread = NULL; }; diff --git a/drivers/ao/audio_driver_ao.h b/drivers/ao/audio_driver_ao.h index d59bb6969c..b64b8dce9d 100644 --- a/drivers/ao/audio_driver_ao.h +++ b/drivers/ao/audio_driver_ao.h @@ -40,6 +40,8 @@ class AudioDriverAO : public AudioDriverSW { Thread* thread; Mutex* mutex; + ao_device* device; + int32_t* samples_in; static void thread_func(void* p_udata); -- cgit v1.2.3 From 3c2e35ada9f8364355d6fc231e0ca5b6c553233f Mon Sep 17 00:00:00 2001 From: Anton Yabchinskiy Date: Sat, 22 Nov 2014 03:00:21 +0300 Subject: Minor code formatting fixes in ao driver --- drivers/ao/audio_driver_ao.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/ao/audio_driver_ao.cpp b/drivers/ao/audio_driver_ao.cpp index d143b4aa6e..6511122583 100644 --- a/drivers/ao/audio_driver_ao.cpp +++ b/drivers/ao/audio_driver_ao.cpp @@ -54,10 +54,10 @@ Error AudioDriverAO::init() { device = ao_open_live(ao_default_driver_id(), &format, 0); ERR_FAIL_COND_V(device == 0, ERR_CANT_OPEN); - int latency = GLOBAL_DEF("audio/output_latency",25); + int latency = GLOBAL_DEF("audio/output_latency", 25); buffer_size = nearest_power_of_2( latency * mix_rate / 1000 ); - samples_in = memnew_arr(int32_t, buffer_size*channels); + samples_in = memnew_arr(int32_t, buffer_size * channels); mutex = Mutex::create(); thread = Thread::create(AudioDriverAO::thread_func, this); @@ -66,10 +66,9 @@ Error AudioDriverAO::init() { }; void AudioDriverAO::thread_func(void* p_udata) { - AudioDriverAO* ad = (AudioDriverAO*)p_udata; - uint64_t usdelay = (ad->buffer_size / float(ad->mix_rate))*1000000; + uint64_t usdelay = (ad->buffer_size / float(ad->mix_rate)) * 1000000; while (!ad->exit_thread) { if (!ad->active) { @@ -78,13 +77,12 @@ void AudioDriverAO::thread_func(void* p_udata) { ad->lock(); ad->audio_server_process(ad->buffer_size, ad->samples_in); ad->unlock(); - }; OS::get_singleton()->delay_usec(usdelay); }; - ad->thread_exited=true; + ad->thread_exited = true; }; void AudioDriverAO::start() { -- cgit v1.2.3 From 4c8bfecc43886ce2414a96100f56d2ba1a0a4078 Mon Sep 17 00:00:00 2001 From: Anton Yabchinskiy Date: Sat, 22 Nov 2014 03:04:46 +0300 Subject: Change 0 to NULL for ao_open_live() and device It's NULL in other places. --- drivers/ao/audio_driver_ao.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/ao/audio_driver_ao.cpp b/drivers/ao/audio_driver_ao.cpp index 6511122583..c43a3b15ae 100644 --- a/drivers/ao/audio_driver_ao.cpp +++ b/drivers/ao/audio_driver_ao.cpp @@ -51,8 +51,8 @@ Error AudioDriverAO::init() { format.byte_format = AO_FMT_LITTLE; format.matrix = "L,R"; - device = ao_open_live(ao_default_driver_id(), &format, 0); - ERR_FAIL_COND_V(device == 0, ERR_CANT_OPEN); + device = ao_open_live(ao_default_driver_id(), &format, NULL); + ERR_FAIL_COND_V(device == NULL, ERR_CANT_OPEN); int latency = GLOBAL_DEF("audio/output_latency", 25); buffer_size = nearest_power_of_2( latency * mix_rate / 1000 ); -- cgit v1.2.3 From f9db628d172949abb3cccf1eb8185ae011dc9e9f Mon Sep 17 00:00:00 2001 From: Anton Yabchinskiy Date: Sat, 22 Nov 2014 12:59:12 +0300 Subject: Write audio samples to libao device --- drivers/ao/audio_driver_ao.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/ao/audio_driver_ao.cpp b/drivers/ao/audio_driver_ao.cpp index c43a3b15ae..49ce1a8e59 100644 --- a/drivers/ao/audio_driver_ao.cpp +++ b/drivers/ao/audio_driver_ao.cpp @@ -45,7 +45,7 @@ Error AudioDriverAO::init() { ao_sample_format format; - format.bits = 16; + format.bits = 32; format.rate = mix_rate; format.channels = channels; format.byte_format = AO_FMT_LITTLE; @@ -68,18 +68,18 @@ Error AudioDriverAO::init() { void AudioDriverAO::thread_func(void* p_udata) { AudioDriverAO* ad = (AudioDriverAO*)p_udata; - uint64_t usdelay = (ad->buffer_size / float(ad->mix_rate)) * 1000000; - while (!ad->exit_thread) { - if (!ad->active) { - - } else { + if (ad->active) { ad->lock(); ad->audio_server_process(ad->buffer_size, ad->samples_in); ad->unlock(); }; - OS::get_singleton()->delay_usec(usdelay); + if (ad->exit_thread) + break; + + ao_play(ad->device, reinterpret_cast(ad->samples_in), + ad->buffer_size * ad->channels * sizeof(int32_t)); }; ad->thread_exited = true; -- cgit v1.2.3 From ba6d83f3e1323225848c850bff2443568b9c80b8 Mon Sep 17 00:00:00 2001 From: Anton Yabchinskiy Date: Sat, 22 Nov 2014 13:05:28 +0300 Subject: Check return value of ao_play() --- drivers/ao/audio_driver_ao.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/ao/audio_driver_ao.cpp b/drivers/ao/audio_driver_ao.cpp index 49ce1a8e59..d9a6ebd0de 100644 --- a/drivers/ao/audio_driver_ao.cpp +++ b/drivers/ao/audio_driver_ao.cpp @@ -78,8 +78,11 @@ void AudioDriverAO::thread_func(void* p_udata) { if (ad->exit_thread) break; - ao_play(ad->device, reinterpret_cast(ad->samples_in), - ad->buffer_size * ad->channels * sizeof(int32_t)); + if (!ao_play(ad->device, reinterpret_cast(ad->samples_in), + ad->buffer_size * ad->channels * sizeof(int32_t))) + { + ERR_PRINT("ao_play() failed"); + } }; ad->thread_exited = true; -- cgit v1.2.3 From e58731ee0146be1ccc365ff0e6dadafcdacb0c0e Mon Sep 17 00:00:00 2001 From: Anton Yabchinskiy Date: Sat, 22 Nov 2014 17:37:27 +0300 Subject: Set libao sample format to 16 bits Some plugins don't support 32 bit samples. --- drivers/ao/audio_driver_ao.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/ao/audio_driver_ao.cpp b/drivers/ao/audio_driver_ao.cpp index d9a6ebd0de..3c4aa454e7 100644 --- a/drivers/ao/audio_driver_ao.cpp +++ b/drivers/ao/audio_driver_ao.cpp @@ -45,7 +45,7 @@ Error AudioDriverAO::init() { ao_sample_format format; - format.bits = 32; + format.bits = 16; format.rate = mix_rate; format.channels = channels; format.byte_format = AO_FMT_LITTLE; @@ -68,19 +68,27 @@ Error AudioDriverAO::init() { void AudioDriverAO::thread_func(void* p_udata) { AudioDriverAO* ad = (AudioDriverAO*)p_udata; + int16_t* samples_out = samples_in; // Overwrite samples on conversion + unsigned int n_samples = ad->buffer_size * ad->channels; + unsigned int n_bytes = n_samples * sizeof(int16_t); + while (!ad->exit_thread) { if (ad->active) { ad->lock(); ad->audio_server_process(ad->buffer_size, ad->samples_in); ad->unlock(); - }; + + for (unsigned int i = 0; i < n_samples; i++) { + samples_out[i] = ad->samples_in[i] >> 16; + } + } else { + memset(samples_out, 0, n_bytes); + } if (ad->exit_thread) break; - if (!ao_play(ad->device, reinterpret_cast(ad->samples_in), - ad->buffer_size * ad->channels * sizeof(int32_t))) - { + if (!ao_play(ad->device, reinterpret_cast(samples_out), n_bytes) { ERR_PRINT("ao_play() failed"); } }; -- cgit v1.2.3