[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) 2014 The Android Open Source Project
|
|
|
|
*
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
|
* You may obtain a copy of the License at
|
|
|
|
*
|
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
*
|
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
* See the License for the specific language governing permissions and
|
|
|
|
* limitations under the License.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#pragma once
|
|
|
|
|
|
|
|
#include <stdint.h>
|
|
|
|
#include <math.h>
|
|
|
|
|
2019-10-23 14:58:31 +08:00
|
|
|
namespace cocos2d {
|
[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
|
|
|
|
|
|
|
// AUDIO_RESAMPLER_DOWN_RATIO_MAX is the maximum ratio between the original
|
|
|
|
// audio sample rate and the target rate when downsampling,
|
|
|
|
// as permitted in the audio framework, e.g. AudioTrack and AudioFlinger.
|
|
|
|
// In practice, it is not recommended to downsample more than 6:1
|
|
|
|
// for best audio quality, even though the audio framework permits a larger
|
|
|
|
// downsampling ratio.
|
|
|
|
// TODO: replace with an API
|
|
|
|
#define AUDIO_RESAMPLER_DOWN_RATIO_MAX 256
|
|
|
|
|
|
|
|
// AUDIO_RESAMPLER_UP_RATIO_MAX is the maximum suggested ratio between the original
|
|
|
|
// audio sample rate and the target rate when upsampling. It is loosely enforced by
|
|
|
|
// the system. One issue with large upsampling ratios is the approximation by
|
|
|
|
// an int32_t of the phase increments, making the resulting sample rate inexact.
|
|
|
|
#define AUDIO_RESAMPLER_UP_RATIO_MAX 65536
|
|
|
|
|
|
|
|
// AUDIO_TIMESTRETCH_SPEED_MIN and AUDIO_TIMESTRETCH_SPEED_MAX define the min and max time stretch
|
|
|
|
// speeds supported by the system. These are enforced by the system and values outside this range
|
|
|
|
// will result in a runtime error.
|
|
|
|
// Depending on the AudioPlaybackRate::mStretchMode, the effective limits might be narrower than
|
|
|
|
// the ones specified here
|
|
|
|
// AUDIO_TIMESTRETCH_SPEED_MIN_DELTA is the minimum absolute speed difference that might trigger a
|
|
|
|
// parameter update
|
|
|
|
#define AUDIO_TIMESTRETCH_SPEED_MIN 0.01f
|
|
|
|
#define AUDIO_TIMESTRETCH_SPEED_MAX 20.0f
|
|
|
|
#define AUDIO_TIMESTRETCH_SPEED_NORMAL 1.0f
|
|
|
|
#define AUDIO_TIMESTRETCH_SPEED_MIN_DELTA 0.0001f
|
|
|
|
|
|
|
|
// AUDIO_TIMESTRETCH_PITCH_MIN and AUDIO_TIMESTRETCH_PITCH_MAX define the min and max time stretch
|
|
|
|
// pitch shifting supported by the system. These are not enforced by the system and values
|
|
|
|
// outside this range might result in a pitch different than the one requested.
|
|
|
|
// Depending on the AudioPlaybackRate::mStretchMode, the effective limits might be narrower than
|
|
|
|
// the ones specified here.
|
|
|
|
// AUDIO_TIMESTRETCH_PITCH_MIN_DELTA is the minimum absolute pitch difference that might trigger a
|
|
|
|
// parameter update
|
|
|
|
#define AUDIO_TIMESTRETCH_PITCH_MIN 0.25f
|
|
|
|
#define AUDIO_TIMESTRETCH_PITCH_MAX 4.0f
|
|
|
|
#define AUDIO_TIMESTRETCH_PITCH_NORMAL 1.0f
|
|
|
|
#define AUDIO_TIMESTRETCH_PITCH_MIN_DELTA 0.0001f
|
|
|
|
|
|
|
|
|
|
|
|
//Determines the current algorithm used for stretching
|
|
|
|
enum AudioTimestretchStretchMode : int32_t {
|
|
|
|
AUDIO_TIMESTRETCH_STRETCH_DEFAULT = 0,
|
|
|
|
AUDIO_TIMESTRETCH_STRETCH_SPEECH = 1,
|
|
|
|
//TODO: add more stretch modes/algorithms
|
|
|
|
};
|
|
|
|
|
|
|
|
//Limits for AUDIO_TIMESTRETCH_STRETCH_SPEECH mode
|
|
|
|
#define TIMESTRETCH_SONIC_SPEED_MIN 0.1f
|
|
|
|
#define TIMESTRETCH_SONIC_SPEED_MAX 6.0f
|
|
|
|
|
|
|
|
//Determines behavior of Timestretch if current algorithm can't perform
|
|
|
|
//with current parameters.
|
|
|
|
// FALLBACK_CUT_REPEAT: (internal only) for speed <1.0 will truncate frames
|
|
|
|
// for speed > 1.0 will repeat frames
|
|
|
|
// FALLBACK_MUTE: will set all processed frames to zero
|
|
|
|
// FALLBACK_FAIL: will stop program execution and log a fatal error
|
|
|
|
enum AudioTimestretchFallbackMode : int32_t {
|
|
|
|
AUDIO_TIMESTRETCH_FALLBACK_CUT_REPEAT = -1,
|
|
|
|
AUDIO_TIMESTRETCH_FALLBACK_DEFAULT = 0,
|
|
|
|
AUDIO_TIMESTRETCH_FALLBACK_MUTE = 1,
|
|
|
|
AUDIO_TIMESTRETCH_FALLBACK_FAIL = 2,
|
|
|
|
};
|
|
|
|
|
|
|
|
struct AudioPlaybackRate {
|
|
|
|
float mSpeed;
|
|
|
|
float mPitch;
|
|
|
|
enum AudioTimestretchStretchMode mStretchMode;
|
|
|
|
enum AudioTimestretchFallbackMode mFallbackMode;
|
|
|
|
};
|
|
|
|
|
|
|
|
static const AudioPlaybackRate AUDIO_PLAYBACK_RATE_DEFAULT = {
|
|
|
|
AUDIO_TIMESTRETCH_SPEED_NORMAL,
|
|
|
|
AUDIO_TIMESTRETCH_PITCH_NORMAL,
|
|
|
|
AUDIO_TIMESTRETCH_STRETCH_DEFAULT,
|
|
|
|
AUDIO_TIMESTRETCH_FALLBACK_DEFAULT
|
|
|
|
};
|
|
|
|
|
|
|
|
static inline bool isAudioPlaybackRateEqual(const AudioPlaybackRate &pr1,
|
|
|
|
const AudioPlaybackRate &pr2) {
|
|
|
|
return fabs(pr1.mSpeed - pr2.mSpeed) < AUDIO_TIMESTRETCH_SPEED_MIN_DELTA &&
|
|
|
|
fabs(pr1.mPitch - pr2.mPitch) < AUDIO_TIMESTRETCH_PITCH_MIN_DELTA &&
|
|
|
|
pr2.mStretchMode == pr2.mStretchMode &&
|
|
|
|
pr2.mFallbackMode == pr2.mFallbackMode;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline bool isAudioPlaybackRateValid(const AudioPlaybackRate &playbackRate) {
|
|
|
|
if (playbackRate.mFallbackMode == AUDIO_TIMESTRETCH_FALLBACK_FAIL &&
|
|
|
|
(playbackRate.mStretchMode == AUDIO_TIMESTRETCH_STRETCH_SPEECH ||
|
|
|
|
playbackRate.mStretchMode == AUDIO_TIMESTRETCH_STRETCH_DEFAULT)) {
|
|
|
|
//test sonic specific constraints
|
|
|
|
return playbackRate.mSpeed >= TIMESTRETCH_SONIC_SPEED_MIN &&
|
|
|
|
playbackRate.mSpeed <= TIMESTRETCH_SONIC_SPEED_MAX &&
|
|
|
|
playbackRate.mPitch >= AUDIO_TIMESTRETCH_PITCH_MIN &&
|
|
|
|
playbackRate.mPitch <= AUDIO_TIMESTRETCH_PITCH_MAX;
|
|
|
|
} else {
|
|
|
|
return playbackRate.mSpeed >= AUDIO_TIMESTRETCH_SPEED_MIN &&
|
|
|
|
playbackRate.mSpeed <= AUDIO_TIMESTRETCH_SPEED_MAX &&
|
|
|
|
playbackRate.mPitch >= AUDIO_TIMESTRETCH_PITCH_MIN &&
|
|
|
|
playbackRate.mPitch <= AUDIO_TIMESTRETCH_PITCH_MAX;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// TODO: Consider putting these inlines into a class scope
|
|
|
|
|
|
|
|
// Returns the source frames needed to resample to destination frames. This is not a precise
|
|
|
|
// value and depends on the resampler (and possibly how it handles rounding internally).
|
|
|
|
// Nevertheless, this should be an upper bound on the requirements of the resampler.
|
|
|
|
// If srcSampleRate and dstSampleRate are equal, then it returns destination frames, which
|
|
|
|
// may not be true if the resampler is asynchronous.
|
|
|
|
static inline size_t sourceFramesNeeded(
|
|
|
|
uint32_t srcSampleRate, size_t dstFramesRequired, uint32_t dstSampleRate) {
|
|
|
|
// +1 for rounding - always do this even if matched ratio (resampler may use phases not ratio)
|
|
|
|
// +1 for additional sample needed for interpolation
|
|
|
|
return srcSampleRate == dstSampleRate ? dstFramesRequired :
|
|
|
|
size_t((uint64_t)dstFramesRequired * srcSampleRate / dstSampleRate + 1 + 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
// An upper bound for the number of destination frames possible from srcFrames
|
|
|
|
// after sample rate conversion. This may be used for buffer sizing.
|
|
|
|
static inline size_t destinationFramesPossible(size_t srcFrames, uint32_t srcSampleRate,
|
|
|
|
uint32_t dstSampleRate) {
|
|
|
|
if (srcSampleRate == dstSampleRate) {
|
|
|
|
return srcFrames;
|
|
|
|
}
|
|
|
|
uint64_t dstFrames = (uint64_t)srcFrames * dstSampleRate / srcSampleRate;
|
|
|
|
return dstFrames > 2 ? dstFrames - 2 : 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline size_t sourceFramesNeededWithTimestretch(
|
|
|
|
uint32_t srcSampleRate, size_t dstFramesRequired, uint32_t dstSampleRate,
|
|
|
|
float speed) {
|
|
|
|
// required is the number of input frames the resampler needs
|
|
|
|
size_t required = sourceFramesNeeded(srcSampleRate, dstFramesRequired, dstSampleRate);
|
|
|
|
// to deliver this, the time stretcher requires:
|
|
|
|
return required * (double)speed + 1 + 1; // accounting for rounding dependencies
|
|
|
|
}
|
|
|
|
|
|
|
|
// Identifies sample rates that we associate with music
|
|
|
|
// and thus eligible for better resampling and fast capture.
|
|
|
|
// This is somewhat less than 44100 to allow for pitch correction
|
|
|
|
// involving resampling as well as asynchronous resampling.
|
|
|
|
#define AUDIO_PROCESSING_MUSIC_RATE 40000
|
|
|
|
|
|
|
|
static inline bool isMusicRate(uint32_t sampleRate) {
|
|
|
|
return sampleRate >= AUDIO_PROCESSING_MUSIC_RATE;
|
|
|
|
}
|
|
|
|
|
2019-10-23 14:58:31 +08:00
|
|
|
} // namespace cocos2d {
|
[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
|
|
|
|
|
|
|
// ---------------------------------------------------------------------------
|