mirror of https://github.com/axmolengine/axmol.git
15ef80e27d
* 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. |
||
|---|---|---|
| .. | ||
| allocator | ||
| CCAsyncTaskPool.cpp | ||
| CCAsyncTaskPool.h | ||
| CCAutoreleasePool.cpp | ||
| CCAutoreleasePool.h | ||
| CCConfiguration.cpp | ||
| CCConfiguration.h | ||
| CCConsole.cpp | ||
| CCConsole.h | ||
| CCController-android.cpp | ||
| CCController-iOS.mm | ||
| CCController.cpp | ||
| CCController.h | ||
| CCData.cpp | ||
| CCData.h | ||
| CCDataVisitor.cpp | ||
| CCDataVisitor.h | ||
| CCDirector.cpp | ||
| CCDirector.h | ||
| CCEvent.cpp | ||
| CCEvent.h | ||
| CCEventAcceleration.cpp | ||
| CCEventAcceleration.h | ||
| CCEventController.cpp | ||
| CCEventController.h | ||
| CCEventCustom.cpp | ||
| CCEventCustom.h | ||
| CCEventDispatcher.cpp | ||
| CCEventDispatcher.h | ||
| CCEventFocus.cpp | ||
| CCEventFocus.h | ||
| CCEventKeyboard.cpp | ||
| CCEventKeyboard.h | ||
| CCEventListener.cpp | ||
| CCEventListener.h | ||
| CCEventListenerAcceleration.cpp | ||
| CCEventListenerAcceleration.h | ||
| CCEventListenerController.cpp | ||
| CCEventListenerController.h | ||
| CCEventListenerCustom.cpp | ||
| CCEventListenerCustom.h | ||
| CCEventListenerFocus.cpp | ||
| CCEventListenerFocus.h | ||
| CCEventListenerKeyboard.cpp | ||
| CCEventListenerKeyboard.h | ||
| CCEventListenerMouse.cpp | ||
| CCEventListenerMouse.h | ||
| CCEventListenerTouch.cpp | ||
| CCEventListenerTouch.h | ||
| CCEventMouse.cpp | ||
| CCEventMouse.h | ||
| CCEventTouch.cpp | ||
| CCEventTouch.h | ||
| CCEventType.h | ||
| CCGameController.h | ||
| CCIMEDelegate.h | ||
| CCIMEDispatcher.cpp | ||
| CCIMEDispatcher.h | ||
| CCMap.h | ||
| CCNS.cpp | ||
| CCNS.h | ||
| CCNinePatchImageParser.cpp | ||
| CCNinePatchImageParser.h | ||
| CCProfiling.cpp | ||
| CCProfiling.h | ||
| CCProperties.cpp | ||
| CCProperties.h | ||
| CCProtocols.h | ||
| CCRef.cpp | ||
| CCRef.h | ||
| CCRefPtr.h | ||
| CCScheduler.cpp | ||
| CCScheduler.h | ||
| CCScriptSupport.cpp | ||
| CCScriptSupport.h | ||
| CCStencilStateManager.cpp | ||
| CCStencilStateManager.hpp | ||
| CCTouch.cpp | ||
| CCTouch.h | ||
| CCUserDefault-android.cpp | ||
| CCUserDefault-apple.mm | ||
| CCUserDefault-winrt.cpp | ||
| CCUserDefault.cpp | ||
| CCUserDefault.h | ||
| CCValue.cpp | ||
| CCValue.h | ||
| CCVector.h | ||
| CMakeLists.txt | ||
| ObjectFactory.cpp | ||
| ObjectFactory.h | ||
| TGAlib.cpp | ||
| TGAlib.h | ||
| ZipUtils.cpp | ||
| ZipUtils.h | ||
| atitc.cpp | ||
| atitc.h | ||
| base64.cpp | ||
| base64.h | ||
| ccCArray.cpp | ||
| ccCArray.h | ||
| ccConfig.h | ||
| ccFPSImages.c | ||
| ccFPSImages.h | ||
| ccMacros.h | ||
| ccRandom.cpp | ||
| ccRandom.h | ||
| ccTypes.cpp | ||
| ccTypes.h | ||
| ccUTF8.cpp | ||
| ccUTF8.h | ||
| ccUtils.cpp | ||
| ccUtils.h | ||
| etc1.cpp | ||
| etc1.h | ||
| firePngData.h | ||
| pvr.cpp | ||
| pvr.h | ||
| s3tc.cpp | ||
| s3tc.h | ||
| uthash.h | ||
| utlist.h | ||