[big refactoring] Audio latency fix for Android. Support to preload effects on Android now. (#15875)
* Audio latency fix for Android. Support preload effects on Android now.
Squashed commits:
[b6d80fe] log fix
[a0a918e] Fixes assetFd didn't be released while PcmData is returned from cache.
[4b956ba] Potential crash fix for PcmAudioPlayer while pause / resume.
[398ab8c] Updates LOG_TAG position in AudioEngine-inl.cpp
[e3634e7] include stdlib.h for posix_memalign
[9004074] fixes setVolume logical error.
[c96df46] Don't use another thread for mixing, enqueue is in a seperated thread, therefore doing mixing in another thread will waste more time.
[0a4c1a8] Adds setLoop, setVolume, setPostion support for Track
[c35fb20] Fixed include.
[cdd9d32] Do mixing by ourself. (TO BE POLISHED)
[6447025] µ -> u since µ could not be shown on some android devices.
[97be0c6] Don't send a silence clip.
[c1607ed] Make linter.py happy.
[0898b54] Puts enqueue & SetPlayState in PcmAudioPlayer::play to thread pool.
[b79fc01] Adds getDuration, getPosition support for PcmAudioPlayer
[80fa2ab] minor fix of the code position of resetting state to State::INITIALIZED
[d9c62f1] underrun fix for PcmAudioPlayer.
[9c2212a] UrlAudioPlayer, playOverMutex should be static, and should be used in update method.
[1519d2e] static variables
[19da936] _pcmAudioPlayer Null pointer check in AudioPlayerProvider.
[e6b0d14] Updates audio performance test.
[fc01dd4] Registers foreground & background event in AudioEngine-inl.cpp(android), the callback should invoke `provider`'s pause & resume method.
[e00a886] TBD: Pause & resume support for PcmAudioPlayerPool.
Since OpenSLES audio resources are expensive and device shared, we should delete all unused PcmAudioPlayers in pool while pause and re-create them while resume.
But this commit isn't finished yet, I don't find a better way to register pause&resume event in AudioEngine module.
[9e42ea3] Interleave mono audio to stereo audio. PcmAudioPlayerPool only contains PcmAudioPlayers with 2 channels.
[3f18d05] Adds a strategy for checking small size of different file formats.
[753ff49] Adds performance test for AudioEngine.
[09d3045] Releases an extra PcmAudioPlayer for UrlAudioPlayer while allocating PcmAudioPlayer fails.
[9dd4477] Using std::move for PcmData move constructor & move assignment.
[6ca3bcb] some fixes:
1) new -> new (std::nothrow)
2) break if allocate PcmAudioPlayer fails
3) renames 'initForPlayPcmData' to 'init'
4) PcmAudioPlayer destructor deadlock if 'init' failed
[54675b6] include path fix.
[a1903ca] More refactorings.
[19b9498] Makes linter.py happy. :)
[923c530] Fixes:
1) Avoid getFileInfo to be invoked twice
2) A critical bug fix for UrlAudioPlayer and adds detailed comments
3) __clang__ compiler option fix for AudioResamplerSinc.cpp.
[5ec4faf] minor fix.
[faaa0f3] output a log in the destructor of UrlAudioPlayer.
[9c20355] NewAudioEngineTest,TestControll crash fix.
[f114464] fixes an unused import.
[1dc5dab] Better algorithm for allocating PcmAudioPlayer.
[331a213] minor fix.
[e54084a] null -> nullptr
[f9a0389] Support uncache.
[89a364f] Removes unused update, and TODO uncache functionality.
[1732bf9] Supports AudioEngineImpl::setFinishCallback for android.
[43d1596] UrlAudioPlayer::stop fix.
[e2ee941] Test case fix in NewAudioEngineTest/AudioIssue11143Test
[5c5ba01] More fixes for making cpp-tests/New Audio Engine Test happy.
[8b554a3] Adds log while remove player from map.
[ed71322] If original file is larger than 30k bytes, consider it's a large audio file.
[fb1845a] Updates project.properties
[6f3839f] minor log output fix in AudioEngine-inl.cpp
[c68bc6c] Don't resample if the sample rate of the decoded pcm data matchs the device's.
[43ca45f] PcmAudioPlayers also need to be removed while they play over, but should not be deleted since their lifecycle is managed by PcmAudioPlayerPool.
[f5e63c9] Audio latency fix for Android. Support preload effects on Android now.
* Supports to loading audio files asynchronously.
* Crash fix for stop audio right after play2d.
* Minor fix for logic in AudioMixerController.cpp
* Adds missing files (CCThreadPool.h/.cpp).
* Minor fix for including.
* Minor fix for missing include <functional> in Track.h
* update license information in audio.h
* Don't use std::future/std::promise anymore since ndk counldn't support it well in armeabi arch.
* isSmallFile postion updated, fixes large audio file goto the checking logic of cache.
* std::atomic<int> isn't supported by ndk-r10e while compiling with `armeabi` arch, using a int with a mutex instead.
* fixes __isnanf & posix_memalign doesn't exist on low api (<=16) devices.
* namespace updated: cocos2d -> cocos2d::experimental
* Removes commented code in AudioMixerController.h/.cpp
* Removes unused code again, and fixes a memory leak of `Track` instance.
* Oops, namespace changed.
* Only outputs log in debug mode.
* Uses ALOGV for outputing logs in AudioEngine-inl.cpp
* const PcmData& -> PcmData for Track
* Fixes a protential crash in NewAudioEngineTest
* Adds `COCOS` prefix in header #ifndef COCOS_BALABALA #define COCOS_BALABALA
* Uses _ prefix for cocos code style instead of `m` prefix.
* Deletes AudioResamplerSinc related files.
* Bug fix from @minggo's reply on github.
* Don't need to invoke pause after in UrlAudioPlayer::prepare.
* Updates ThreadPool class, uses enum class and adds const keyword.
2016-07-18 10:22:40 +08:00
|
|
|
/****************************************************************************
|
|
|
|
Copyright (c) 2016 Chukong Technologies Inc.
|
|
|
|
|
|
|
|
http://www.cocos2d-x.org
|
|
|
|
|
|
|
|
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.
|
|
|
|
****************************************************************************/
|
|
|
|
|
|
|
|
#define LOG_TAG "UrlAudioPlayer"
|
|
|
|
|
|
|
|
#include "audio/android/UrlAudioPlayer.h"
|
|
|
|
#include "audio/android/ICallerThreadUtils.h"
|
|
|
|
|
|
|
|
#include <math.h>
|
|
|
|
#include <algorithm> // for std::find
|
|
|
|
|
|
|
|
namespace {
|
|
|
|
|
|
|
|
std::mutex __playerContainerMutex;
|
|
|
|
std::vector<cocos2d::experimental::UrlAudioPlayer*> __playerContainer;
|
|
|
|
std::once_flag __onceFlag;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
namespace cocos2d { namespace experimental {
|
|
|
|
|
|
|
|
class SLUrlAudioPlayerCallbackProxy
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
static void playEventCallback(SLPlayItf caller, void *context, SLuint32 playEvent)
|
|
|
|
{
|
|
|
|
UrlAudioPlayer *thiz = (UrlAudioPlayer *) context;
|
|
|
|
// We must use a mutex for the whole block of the following function invocation.
|
|
|
|
std::lock_guard<std::mutex> lk(__playerContainerMutex);
|
|
|
|
auto iter = std::find(__playerContainer.begin(), __playerContainer.end(), thiz);
|
|
|
|
if (iter != __playerContainer.end())
|
|
|
|
{
|
|
|
|
thiz->playEventCallback(caller, playEvent);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
UrlAudioPlayer::UrlAudioPlayer(SLEngineItf engineItf, SLObjectItf outputMixObject, ICallerThreadUtils* callerThreadUtils)
|
|
|
|
: _engineItf(engineItf), _outputMixObj(outputMixObject),
|
|
|
|
_callerThreadUtils(callerThreadUtils), _id(-1), _assetFd(nullptr),
|
|
|
|
_playObj(nullptr), _playItf(nullptr), _seekItf(nullptr), _volumeItf(nullptr),
|
|
|
|
_volume(0.0f), _duration(0.0f), _isLoop(false), _state(State::INVALID),
|
|
|
|
_playEventCallback(nullptr), _isDestroyed(std::make_shared<bool>(false))
|
|
|
|
{
|
|
|
|
std::call_once(__onceFlag, [](){
|
|
|
|
__playerContainer.reserve(10);
|
|
|
|
});
|
|
|
|
|
|
|
|
__playerContainerMutex.lock();
|
|
|
|
__playerContainer.push_back(this);
|
|
|
|
ALOGV("Current UrlAudioPlayer instance count: %d", __playerContainer.size());
|
|
|
|
__playerContainerMutex.unlock();
|
|
|
|
|
|
|
|
_callerThreadId = callerThreadUtils->getCallerThreadId();
|
|
|
|
}
|
|
|
|
|
|
|
|
UrlAudioPlayer::~UrlAudioPlayer()
|
|
|
|
{
|
|
|
|
ALOGV("~UrlAudioPlayer(): %p", this);
|
|
|
|
|
|
|
|
__playerContainerMutex.lock();
|
|
|
|
|
|
|
|
auto iter = std::find(__playerContainer.begin(), __playerContainer.end(), this);
|
|
|
|
if (iter != __playerContainer.end())
|
|
|
|
{
|
|
|
|
__playerContainer.erase(iter);
|
|
|
|
}
|
|
|
|
|
|
|
|
__playerContainerMutex.unlock();
|
|
|
|
}
|
|
|
|
|
|
|
|
void UrlAudioPlayer::playEventCallback(SLPlayItf caller, SLuint32 playEvent)
|
|
|
|
{
|
|
|
|
// Note that it's on sub thread, please don't invoke OpenSLES API on sub thread
|
|
|
|
if (playEvent == SL_PLAYEVENT_HEADATEND)
|
|
|
|
{
|
|
|
|
std::shared_ptr<bool> isDestroyed = _isDestroyed;
|
|
|
|
|
|
|
|
auto func = [this, isDestroyed](){
|
|
|
|
// If it was destroyed, just return.
|
|
|
|
if (*isDestroyed)
|
|
|
|
{
|
|
|
|
ALOGV("The UrlAudioPlayer (%p) was destroyed!", this);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
//Note that It's in the caller's thread (Cocos Thread)
|
|
|
|
// If state is already stopped, ignore the play over event.
|
|
|
|
|
|
|
|
if (_state == State::STOPPED)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
//fix issue#8965:AudioEngine can't looping audio on Android 2.3.x
|
|
|
|
if (isLoop())
|
|
|
|
{
|
|
|
|
play();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
setState(State::OVER);
|
|
|
|
if (_playEventCallback != nullptr)
|
|
|
|
{
|
|
|
|
_playEventCallback(State::OVER);
|
|
|
|
}
|
|
|
|
|
|
|
|
ALOGV("UrlAudioPlayer (%p) played over, destroy self ...", this);
|
|
|
|
destroy();
|
|
|
|
delete this;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
if (_callerThreadId == std::this_thread::get_id())
|
|
|
|
{
|
|
|
|
func();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
_callerThreadUtils->performFunctionInCallerThread(func);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void UrlAudioPlayer::setPlayEventCallback(const PlayEventCallback &playEventCallback)
|
|
|
|
{
|
|
|
|
_playEventCallback = playEventCallback;
|
|
|
|
}
|
|
|
|
|
|
|
|
void UrlAudioPlayer::stop()
|
|
|
|
{
|
|
|
|
ALOGV("UrlAudioPlayer::stop (%p, %d)", this, getId());
|
|
|
|
SLresult r = (*_playItf)->SetPlayState(_playItf, SL_PLAYSTATE_STOPPED);
|
|
|
|
SL_RETURN_IF_FAILED(r, "UrlAudioPlayer::stop failed");
|
|
|
|
|
|
|
|
if (_state == State::PLAYING || _state == State::PAUSED)
|
|
|
|
{
|
|
|
|
setLoop(false);
|
|
|
|
setState(State::STOPPED);
|
|
|
|
|
|
|
|
if (_playEventCallback != nullptr)
|
|
|
|
{
|
|
|
|
_playEventCallback(State::STOPPED);
|
|
|
|
}
|
|
|
|
|
|
|
|
destroy();
|
|
|
|
delete this;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ALOGW("UrlAudioPlayer (%p, state:%d) isn't playing or paused, could not invoke stop!", this, _state);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void UrlAudioPlayer::pause()
|
|
|
|
{
|
|
|
|
if (_state == State::PLAYING)
|
|
|
|
{
|
|
|
|
SLresult r = (*_playItf)->SetPlayState(_playItf, SL_PLAYSTATE_PAUSED);
|
|
|
|
SL_RETURN_IF_FAILED(r, "UrlAudioPlayer::pause failed");
|
|
|
|
setState(State::PAUSED);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ALOGW("UrlAudioPlayer (%p, state:%d) isn't playing, could not invoke pause!", this, _state);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void UrlAudioPlayer::resume()
|
|
|
|
{
|
|
|
|
if (_state == State::PAUSED)
|
|
|
|
{
|
|
|
|
SLresult r = (*_playItf)->SetPlayState(_playItf, SL_PLAYSTATE_PLAYING);
|
|
|
|
SL_RETURN_IF_FAILED(r, "UrlAudioPlayer::resume failed");
|
|
|
|
setState(State::PLAYING);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ALOGW("UrlAudioPlayer (%p, state:%d) isn't paused, could not invoke resume!", this, _state);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void UrlAudioPlayer::play()
|
|
|
|
{
|
|
|
|
if (_state == State::INITIALIZED || _state == State::PAUSED)
|
|
|
|
{
|
|
|
|
SLresult r = (*_playItf)->SetPlayState(_playItf, SL_PLAYSTATE_PLAYING);
|
|
|
|
SL_RETURN_IF_FAILED(r, "UrlAudioPlayer::play failed");
|
|
|
|
setState(State::PLAYING);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ALOGW("UrlAudioPlayer (%p, state:%d) isn't paused or initialized, could not invoke play!", this, _state);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void UrlAudioPlayer::setVolume(float volume)
|
|
|
|
{
|
|
|
|
_volume = volume;
|
|
|
|
int dbVolume = 2000 * log10(volume);
|
|
|
|
if (dbVolume < SL_MILLIBEL_MIN)
|
|
|
|
{
|
|
|
|
dbVolume = SL_MILLIBEL_MIN;
|
|
|
|
}
|
|
|
|
SLresult r = (*_volumeItf)->SetVolumeLevel(_volumeItf, dbVolume);
|
|
|
|
SL_RETURN_IF_FAILED(r, "UrlAudioPlayer::setVolume %d failed", dbVolume);
|
|
|
|
}
|
|
|
|
|
|
|
|
float UrlAudioPlayer::getDuration() const
|
|
|
|
{
|
|
|
|
if (_duration > 0)
|
|
|
|
{
|
|
|
|
return _duration;
|
|
|
|
}
|
|
|
|
|
|
|
|
SLmillisecond duration;
|
|
|
|
SLresult r = (*_playItf)->GetDuration(_playItf, &duration);
|
|
|
|
SL_RETURN_VAL_IF_FAILED(r, 0.0f, "UrlAudioPlayer::getDuration failed");
|
|
|
|
|
|
|
|
if (duration == SL_TIME_UNKNOWN)
|
|
|
|
{
|
|
|
|
return -1.0f;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
const_cast<UrlAudioPlayer *>(this)->_duration = duration / 1000.0f;
|
|
|
|
|
|
|
|
if (_duration <= 0)
|
|
|
|
{
|
|
|
|
return -1.0f;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return _duration;
|
|
|
|
}
|
|
|
|
|
|
|
|
float UrlAudioPlayer::getPosition() const
|
|
|
|
{
|
|
|
|
SLmillisecond millisecond;
|
|
|
|
SLresult r = (*_playItf)->GetPosition(_playItf, &millisecond);
|
|
|
|
SL_RETURN_VAL_IF_FAILED(r, 0.0f, "UrlAudioPlayer::getPosition failed");
|
|
|
|
return millisecond / 1000.0f;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool UrlAudioPlayer::setPosition(float pos)
|
|
|
|
{
|
|
|
|
SLmillisecond millisecond = 1000.0f * pos;
|
|
|
|
SLresult r = (*_seekItf)->SetPosition(_seekItf, millisecond, SL_SEEKMODE_ACCURATE);
|
|
|
|
SL_RETURN_VAL_IF_FAILED(r, false, "UrlAudioPlayer::setPosition %f failed", pos);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool UrlAudioPlayer::prepare(const std::string &url, SLuint32 locatorType, std::shared_ptr<AssetFd> assetFd, int start,
|
|
|
|
int length)
|
|
|
|
{
|
|
|
|
_url = url;
|
|
|
|
_assetFd = assetFd;
|
|
|
|
|
2016-09-06 09:41:53 +08:00
|
|
|
const char* locatorTypeStr= "UNKNOWN";
|
|
|
|
if (locatorType == SL_DATALOCATOR_ANDROIDFD)
|
|
|
|
locatorTypeStr = "SL_DATALOCATOR_ANDROIDFD";
|
|
|
|
else if (locatorType == SL_DATALOCATOR_URI)
|
|
|
|
locatorTypeStr = "SL_DATALOCATOR_URI";
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ALOGE("Oops, invalid locatorType: %d", (int)locatorType);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
ALOGV("UrlAudioPlayer::prepare: %s, %s, %d, %d, %d", _url.c_str(), locatorTypeStr, _assetFd->getFd(), start,
|
[big refactoring] Audio latency fix for Android. Support to preload effects on Android now. (#15875)
* Audio latency fix for Android. Support preload effects on Android now.
Squashed commits:
[b6d80fe] log fix
[a0a918e] Fixes assetFd didn't be released while PcmData is returned from cache.
[4b956ba] Potential crash fix for PcmAudioPlayer while pause / resume.
[398ab8c] Updates LOG_TAG position in AudioEngine-inl.cpp
[e3634e7] include stdlib.h for posix_memalign
[9004074] fixes setVolume logical error.
[c96df46] Don't use another thread for mixing, enqueue is in a seperated thread, therefore doing mixing in another thread will waste more time.
[0a4c1a8] Adds setLoop, setVolume, setPostion support for Track
[c35fb20] Fixed include.
[cdd9d32] Do mixing by ourself. (TO BE POLISHED)
[6447025] µ -> u since µ could not be shown on some android devices.
[97be0c6] Don't send a silence clip.
[c1607ed] Make linter.py happy.
[0898b54] Puts enqueue & SetPlayState in PcmAudioPlayer::play to thread pool.
[b79fc01] Adds getDuration, getPosition support for PcmAudioPlayer
[80fa2ab] minor fix of the code position of resetting state to State::INITIALIZED
[d9c62f1] underrun fix for PcmAudioPlayer.
[9c2212a] UrlAudioPlayer, playOverMutex should be static, and should be used in update method.
[1519d2e] static variables
[19da936] _pcmAudioPlayer Null pointer check in AudioPlayerProvider.
[e6b0d14] Updates audio performance test.
[fc01dd4] Registers foreground & background event in AudioEngine-inl.cpp(android), the callback should invoke `provider`'s pause & resume method.
[e00a886] TBD: Pause & resume support for PcmAudioPlayerPool.
Since OpenSLES audio resources are expensive and device shared, we should delete all unused PcmAudioPlayers in pool while pause and re-create them while resume.
But this commit isn't finished yet, I don't find a better way to register pause&resume event in AudioEngine module.
[9e42ea3] Interleave mono audio to stereo audio. PcmAudioPlayerPool only contains PcmAudioPlayers with 2 channels.
[3f18d05] Adds a strategy for checking small size of different file formats.
[753ff49] Adds performance test for AudioEngine.
[09d3045] Releases an extra PcmAudioPlayer for UrlAudioPlayer while allocating PcmAudioPlayer fails.
[9dd4477] Using std::move for PcmData move constructor & move assignment.
[6ca3bcb] some fixes:
1) new -> new (std::nothrow)
2) break if allocate PcmAudioPlayer fails
3) renames 'initForPlayPcmData' to 'init'
4) PcmAudioPlayer destructor deadlock if 'init' failed
[54675b6] include path fix.
[a1903ca] More refactorings.
[19b9498] Makes linter.py happy. :)
[923c530] Fixes:
1) Avoid getFileInfo to be invoked twice
2) A critical bug fix for UrlAudioPlayer and adds detailed comments
3) __clang__ compiler option fix for AudioResamplerSinc.cpp.
[5ec4faf] minor fix.
[faaa0f3] output a log in the destructor of UrlAudioPlayer.
[9c20355] NewAudioEngineTest,TestControll crash fix.
[f114464] fixes an unused import.
[1dc5dab] Better algorithm for allocating PcmAudioPlayer.
[331a213] minor fix.
[e54084a] null -> nullptr
[f9a0389] Support uncache.
[89a364f] Removes unused update, and TODO uncache functionality.
[1732bf9] Supports AudioEngineImpl::setFinishCallback for android.
[43d1596] UrlAudioPlayer::stop fix.
[e2ee941] Test case fix in NewAudioEngineTest/AudioIssue11143Test
[5c5ba01] More fixes for making cpp-tests/New Audio Engine Test happy.
[8b554a3] Adds log while remove player from map.
[ed71322] If original file is larger than 30k bytes, consider it's a large audio file.
[fb1845a] Updates project.properties
[6f3839f] minor log output fix in AudioEngine-inl.cpp
[c68bc6c] Don't resample if the sample rate of the decoded pcm data matchs the device's.
[43ca45f] PcmAudioPlayers also need to be removed while they play over, but should not be deleted since their lifecycle is managed by PcmAudioPlayerPool.
[f5e63c9] Audio latency fix for Android. Support preload effects on Android now.
* Supports to loading audio files asynchronously.
* Crash fix for stop audio right after play2d.
* Minor fix for logic in AudioMixerController.cpp
* Adds missing files (CCThreadPool.h/.cpp).
* Minor fix for including.
* Minor fix for missing include <functional> in Track.h
* update license information in audio.h
* Don't use std::future/std::promise anymore since ndk counldn't support it well in armeabi arch.
* isSmallFile postion updated, fixes large audio file goto the checking logic of cache.
* std::atomic<int> isn't supported by ndk-r10e while compiling with `armeabi` arch, using a int with a mutex instead.
* fixes __isnanf & posix_memalign doesn't exist on low api (<=16) devices.
* namespace updated: cocos2d -> cocos2d::experimental
* Removes commented code in AudioMixerController.h/.cpp
* Removes unused code again, and fixes a memory leak of `Track` instance.
* Oops, namespace changed.
* Only outputs log in debug mode.
* Uses ALOGV for outputing logs in AudioEngine-inl.cpp
* const PcmData& -> PcmData for Track
* Fixes a protential crash in NewAudioEngineTest
* Adds `COCOS` prefix in header #ifndef COCOS_BALABALA #define COCOS_BALABALA
* Uses _ prefix for cocos code style instead of `m` prefix.
* Deletes AudioResamplerSinc related files.
* Bug fix from @minggo's reply on github.
* Don't need to invoke pause after in UrlAudioPlayer::prepare.
* Updates ThreadPool class, uses enum class and adds const keyword.
2016-07-18 10:22:40 +08:00
|
|
|
length);
|
|
|
|
SLDataSource audioSrc;
|
|
|
|
|
|
|
|
SLDataFormat_MIME formatMime = {SL_DATAFORMAT_MIME, nullptr, SL_CONTAINERTYPE_UNSPECIFIED};
|
|
|
|
audioSrc.pFormat = &formatMime;
|
|
|
|
|
|
|
|
//Note: locFd & locUri should be outside of the following if/else block
|
|
|
|
// Although locFd & locUri are only used inside if/else block, its lifecycle
|
|
|
|
// will be destroyed right after '}' block. And since we pass a pointer to
|
|
|
|
// 'audioSrc.pLocator=&locFd/&locUri', pLocator will point to an invalid address
|
2016-07-22 01:05:19 +08:00
|
|
|
// while invoking Engine::createAudioPlayer interface. So be care of change the position
|
[big refactoring] Audio latency fix for Android. Support to preload effects on Android now. (#15875)
* Audio latency fix for Android. Support preload effects on Android now.
Squashed commits:
[b6d80fe] log fix
[a0a918e] Fixes assetFd didn't be released while PcmData is returned from cache.
[4b956ba] Potential crash fix for PcmAudioPlayer while pause / resume.
[398ab8c] Updates LOG_TAG position in AudioEngine-inl.cpp
[e3634e7] include stdlib.h for posix_memalign
[9004074] fixes setVolume logical error.
[c96df46] Don't use another thread for mixing, enqueue is in a seperated thread, therefore doing mixing in another thread will waste more time.
[0a4c1a8] Adds setLoop, setVolume, setPostion support for Track
[c35fb20] Fixed include.
[cdd9d32] Do mixing by ourself. (TO BE POLISHED)
[6447025] µ -> u since µ could not be shown on some android devices.
[97be0c6] Don't send a silence clip.
[c1607ed] Make linter.py happy.
[0898b54] Puts enqueue & SetPlayState in PcmAudioPlayer::play to thread pool.
[b79fc01] Adds getDuration, getPosition support for PcmAudioPlayer
[80fa2ab] minor fix of the code position of resetting state to State::INITIALIZED
[d9c62f1] underrun fix for PcmAudioPlayer.
[9c2212a] UrlAudioPlayer, playOverMutex should be static, and should be used in update method.
[1519d2e] static variables
[19da936] _pcmAudioPlayer Null pointer check in AudioPlayerProvider.
[e6b0d14] Updates audio performance test.
[fc01dd4] Registers foreground & background event in AudioEngine-inl.cpp(android), the callback should invoke `provider`'s pause & resume method.
[e00a886] TBD: Pause & resume support for PcmAudioPlayerPool.
Since OpenSLES audio resources are expensive and device shared, we should delete all unused PcmAudioPlayers in pool while pause and re-create them while resume.
But this commit isn't finished yet, I don't find a better way to register pause&resume event in AudioEngine module.
[9e42ea3] Interleave mono audio to stereo audio. PcmAudioPlayerPool only contains PcmAudioPlayers with 2 channels.
[3f18d05] Adds a strategy for checking small size of different file formats.
[753ff49] Adds performance test for AudioEngine.
[09d3045] Releases an extra PcmAudioPlayer for UrlAudioPlayer while allocating PcmAudioPlayer fails.
[9dd4477] Using std::move for PcmData move constructor & move assignment.
[6ca3bcb] some fixes:
1) new -> new (std::nothrow)
2) break if allocate PcmAudioPlayer fails
3) renames 'initForPlayPcmData' to 'init'
4) PcmAudioPlayer destructor deadlock if 'init' failed
[54675b6] include path fix.
[a1903ca] More refactorings.
[19b9498] Makes linter.py happy. :)
[923c530] Fixes:
1) Avoid getFileInfo to be invoked twice
2) A critical bug fix for UrlAudioPlayer and adds detailed comments
3) __clang__ compiler option fix for AudioResamplerSinc.cpp.
[5ec4faf] minor fix.
[faaa0f3] output a log in the destructor of UrlAudioPlayer.
[9c20355] NewAudioEngineTest,TestControll crash fix.
[f114464] fixes an unused import.
[1dc5dab] Better algorithm for allocating PcmAudioPlayer.
[331a213] minor fix.
[e54084a] null -> nullptr
[f9a0389] Support uncache.
[89a364f] Removes unused update, and TODO uncache functionality.
[1732bf9] Supports AudioEngineImpl::setFinishCallback for android.
[43d1596] UrlAudioPlayer::stop fix.
[e2ee941] Test case fix in NewAudioEngineTest/AudioIssue11143Test
[5c5ba01] More fixes for making cpp-tests/New Audio Engine Test happy.
[8b554a3] Adds log while remove player from map.
[ed71322] If original file is larger than 30k bytes, consider it's a large audio file.
[fb1845a] Updates project.properties
[6f3839f] minor log output fix in AudioEngine-inl.cpp
[c68bc6c] Don't resample if the sample rate of the decoded pcm data matchs the device's.
[43ca45f] PcmAudioPlayers also need to be removed while they play over, but should not be deleted since their lifecycle is managed by PcmAudioPlayerPool.
[f5e63c9] Audio latency fix for Android. Support preload effects on Android now.
* Supports to loading audio files asynchronously.
* Crash fix for stop audio right after play2d.
* Minor fix for logic in AudioMixerController.cpp
* Adds missing files (CCThreadPool.h/.cpp).
* Minor fix for including.
* Minor fix for missing include <functional> in Track.h
* update license information in audio.h
* Don't use std::future/std::promise anymore since ndk counldn't support it well in armeabi arch.
* isSmallFile postion updated, fixes large audio file goto the checking logic of cache.
* std::atomic<int> isn't supported by ndk-r10e while compiling with `armeabi` arch, using a int with a mutex instead.
* fixes __isnanf & posix_memalign doesn't exist on low api (<=16) devices.
* namespace updated: cocos2d -> cocos2d::experimental
* Removes commented code in AudioMixerController.h/.cpp
* Removes unused code again, and fixes a memory leak of `Track` instance.
* Oops, namespace changed.
* Only outputs log in debug mode.
* Uses ALOGV for outputing logs in AudioEngine-inl.cpp
* const PcmData& -> PcmData for Track
* Fixes a protential crash in NewAudioEngineTest
* Adds `COCOS` prefix in header #ifndef COCOS_BALABALA #define COCOS_BALABALA
* Uses _ prefix for cocos code style instead of `m` prefix.
* Deletes AudioResamplerSinc related files.
* Bug fix from @minggo's reply on github.
* Don't need to invoke pause after in UrlAudioPlayer::prepare.
* Updates ThreadPool class, uses enum class and adds const keyword.
2016-07-18 10:22:40 +08:00
|
|
|
// of these two variables.
|
|
|
|
SLDataLocator_AndroidFD locFd;
|
|
|
|
SLDataLocator_URI locUri;
|
|
|
|
|
|
|
|
if (locatorType == SL_DATALOCATOR_ANDROIDFD)
|
|
|
|
{
|
|
|
|
locFd = {locatorType, _assetFd->getFd(), start, length};
|
|
|
|
audioSrc.pLocator = &locFd;
|
|
|
|
}
|
|
|
|
else if (locatorType == SL_DATALOCATOR_URI)
|
|
|
|
{
|
|
|
|
locUri = {locatorType, (SLchar *) _url.c_str()};
|
|
|
|
audioSrc.pLocator = &locUri;
|
|
|
|
ALOGV("locUri: locatorType: %d", (int)locUri.locatorType);
|
|
|
|
}
|
|
|
|
|
|
|
|
// configure audio sink
|
|
|
|
SLDataLocator_OutputMix locOutmix = {SL_DATALOCATOR_OUTPUTMIX, _outputMixObj};
|
|
|
|
SLDataSink audioSnk = {&locOutmix, nullptr};
|
|
|
|
|
|
|
|
// create audio player
|
|
|
|
const SLInterfaceID ids[3] = {SL_IID_SEEK, SL_IID_PREFETCHSTATUS, SL_IID_VOLUME};
|
|
|
|
const SLboolean req[3] = {SL_BOOLEAN_TRUE, SL_BOOLEAN_TRUE, SL_BOOLEAN_TRUE};
|
|
|
|
|
|
|
|
SLresult result = (*_engineItf)->CreateAudioPlayer(_engineItf, &_playObj, &audioSrc, &audioSnk,
|
|
|
|
3, ids, req);
|
|
|
|
SL_RETURN_VAL_IF_FAILED(result, false, "CreateAudioPlayer failed");
|
|
|
|
|
|
|
|
// realize the player
|
|
|
|
result = (*_playObj)->Realize(_playObj, SL_BOOLEAN_FALSE);
|
|
|
|
SL_RETURN_VAL_IF_FAILED(result, false, "Realize failed");
|
|
|
|
|
|
|
|
// get the play interface
|
|
|
|
result = (*_playObj)->GetInterface(_playObj, SL_IID_PLAY, &_playItf);
|
|
|
|
SL_RETURN_VAL_IF_FAILED(result, false, "GetInterface SL_IID_PLAY failed");
|
|
|
|
|
|
|
|
// get the seek interface
|
|
|
|
result = (*_playObj)->GetInterface(_playObj, SL_IID_SEEK, &_seekItf);
|
|
|
|
SL_RETURN_VAL_IF_FAILED(result, false, "GetInterface SL_IID_SEEK failed");
|
|
|
|
|
|
|
|
// get the volume interface
|
|
|
|
result = (*_playObj)->GetInterface(_playObj, SL_IID_VOLUME, &_volumeItf);
|
|
|
|
SL_RETURN_VAL_IF_FAILED(result, false, "GetInterface SL_IID_VOLUME failed");
|
|
|
|
|
|
|
|
result = (*_playItf)->RegisterCallback(_playItf,
|
|
|
|
SLUrlAudioPlayerCallbackProxy::playEventCallback, this);
|
|
|
|
SL_RETURN_VAL_IF_FAILED(result, false, "RegisterCallback failed");
|
|
|
|
|
|
|
|
result = (*_playItf)->SetCallbackEventsMask(_playItf, SL_PLAYEVENT_HEADATEND);
|
|
|
|
SL_RETURN_VAL_IF_FAILED(result, false, "SetCallbackEventsMask SL_PLAYEVENT_HEADATEND failed");
|
|
|
|
|
|
|
|
setState(State::INITIALIZED);
|
|
|
|
|
|
|
|
setVolume(1.0f);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void UrlAudioPlayer::rewind()
|
|
|
|
{
|
|
|
|
// Not supported currently. since cocos audio engine will new -> prepare -> play again.
|
|
|
|
}
|
|
|
|
|
|
|
|
float UrlAudioPlayer::getVolume() const
|
|
|
|
{
|
|
|
|
return _volume;
|
|
|
|
}
|
|
|
|
|
|
|
|
void UrlAudioPlayer::setLoop(bool isLoop)
|
|
|
|
{
|
|
|
|
_isLoop = isLoop;
|
|
|
|
|
|
|
|
SLboolean loopEnable = _isLoop ? SL_BOOLEAN_TRUE : SL_BOOLEAN_FALSE;
|
|
|
|
SLresult r = (*_seekItf)->SetLoop(_seekItf, loopEnable, 0, SL_TIME_UNKNOWN);
|
|
|
|
SL_RETURN_IF_FAILED(r, "UrlAudioPlayer::setLoop %d failed", _isLoop ? 1 : 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool UrlAudioPlayer::isLoop() const
|
|
|
|
{
|
|
|
|
return _isLoop;
|
|
|
|
}
|
|
|
|
|
|
|
|
void UrlAudioPlayer::stopAll()
|
|
|
|
{
|
|
|
|
// To avoid break the for loop, we need to copy a new map
|
|
|
|
__playerContainerMutex.lock();
|
|
|
|
auto temp = __playerContainer;
|
|
|
|
__playerContainerMutex.unlock();
|
|
|
|
|
|
|
|
for (auto&& player : temp)
|
|
|
|
{
|
|
|
|
player->stop();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void UrlAudioPlayer::destroy()
|
|
|
|
{
|
|
|
|
if (!*_isDestroyed)
|
|
|
|
{
|
|
|
|
*_isDestroyed = true;
|
|
|
|
ALOGV("UrlAudioPlayer::destroy() %p", this);
|
|
|
|
SL_DESTROY_OBJ(_playObj);
|
|
|
|
ALOGV("UrlAudioPlayer::destroy end");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}} // namespace cocos2d { namespace experimental {
|