summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioMixer.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Fix AudioMixer MONO muted track handlingAndy Hung2014-08-251-5/+21
| | | | | | | | Incorrect handling caused "stereo" mode to be used. Augmented error handling to print more debug info. Bug: 17208475 Change-Id: I5bcaf0ba5bd5a4f7d4885f8cce43bbf42e5f1e6b
* Remove unused TwoTrack process mode from AudioMixerAndy Hung2014-08-041-103/+0
| | | | | | Legacy code that has not been hooked up. Change-Id: Ic01a4eddfa1020089d5bc42f58b6a4697698c27a
* Add multichannel capability to AudioFlingerAndy Hung2014-07-241-1/+4
| | | | | | But not enabled (kEnableExtendedChannels == false). Change-Id: I62f7e31fbd29ad703a9a02f5d1a280b6972dd423
* Add multichannel capability to AudioMixerAndy Hung2014-07-241-131/+298
| | | | | | | | tests/test-mixer updated to handle multichannel. New mixer path is still disabled (kUseNewMixer = false). Subsequent CL will enable multichannel capability. Change-Id: I71dafa94cc1d9af567c285e0ded7c5c94e3ff926
* Add RemixBufferProvider to AudioMixerAndy Hung2014-07-181-0/+34
| | | | | | | This is used to convert between channel masks for input AudioTrack data. Change-Id: Iedffaeccb99c7053992152e7b1cb6b2d33b12eef
* Update DownmixerBufferProvider to use CopyBufferProviderAndy Hung2014-07-181-144/+143
| | | | Change-Id: I6b1a8755a1e6c29b916662fd376e9509cda5df55
* Add CopyBufferProvider class for AudioMixerAndy Hung2014-07-181-86/+112
| | | | | | | | AudioMixer::ReformatBufferProvider now uses it as a base class. Fix ReformatBufferProvider object leak. Change-Id: If196f844eaaa124a173ffa27afe88098023c2ff9
* Add floating point volume handling to AudioMixerAndy Hung2014-07-081-70/+172
| | | | | | | | | | | | | | | Use floating point volume in AudioMixer mixing when floating point input is used with the new mixer engine. AudioResampler is updated to take floating point volume to match. Both legacy integer and floating point mixer engines work. For now, integer volume is used when the new mixer engine runs in integer input mode, for backward compatibility with the legacy mixer. The new mixer engine will generally run in floating point input mode. When the legacy path is removed, the integer volumes will be removed. Change-Id: I79e80c292ae7c8b8bdd0aa371a1b2c3a1b618290
* Replace int bitDepth with audio_format_t in ResamplerAndy Hung2014-07-071-13/+1
| | | | | | | | Remove mBitDepth from class (not used). Replace with audio_format_t in factory method to distinguish between float and pcm 16-bit. Change-Id: I166860796c68285077ef4458d8758d19b82523f9
* Add new AudioMixer processing hooksAndy Hung2014-06-301-44/+364
| | | | | | | | This change adds new process and thread hooks for multi-format handling. It is enabled by setting kUseNewMixer = true. Change-Id: I262a3d2e4411f8cef7370a497b77a34eb55f1f86
* Change parameter type for volume to float in AudioMixerAndy Hung2014-05-301-6/+14
| | | | Change-Id: I4da1505ce852505f86f8e5b87f60e8edceeb30e0
* Rename UNITY_GAIN to UNITY_GAIN_INT in AudioMixerAndy Hung2014-05-301-5/+5
| | | | Change-Id: Ic040311305026f0b4c4280a5b3bef7a447ac1da3
* Refactor setVolumeRampVariables in AudioMixerAndy Hung2014-05-301-30/+42
| | | | Change-Id: I8fcf3101bcea292de7c65433fa578f1c9cdd0974
* Fix floating point output from mixerAndy Hung2014-05-301-6/+7
| | | | | | | | | A buffer pointer was being erroneously reset to buffer start, potentially causing an audio glitch. The floating point output mode is not enabled at this time, but will be in the future. Change-Id: If8b6414d232f064f3a2e2c5a6da889a91b27fb24
* Avoid resetting BufferProviders in mixer unnecessarilyAndy Hung2014-05-291-0/+3
| | | | Change-Id: Iad85c4dfd21be1dbf89dc11906106b34219376f8
* Add multiple format capability to AudioMixerAndy Hung2014-05-231-26/+167
| | | | | Change-Id: I04ac1cafd90b6ed652f8d51888ad07576678f0bc Signed-off-by: Andy Hung <hunga@google.com>
* Add format parameter to getTrackName() and track_tAndy Hung2014-05-191-2/+7
| | | | | Change-Id: Ia152a839014e235fbfb656104c15d7c1b456d02e Signed-off-by: Andy Hung <hunga@google.com>
* Update AudioMixer::getTrackName to save channelMaskAndy Hung2014-05-161-7/+8
| | | | | Change-Id: I4fb4abbff1b05bdd0f6e21b5f5f4c3f2a57ae28d Signed-off-by: Andy Hung <hunga@google.com>
* Use new channel count functions for audio masksAndy Hung2014-05-161-2/+2
| | | | | Change-Id: Ia658ab4b6320d19fdb50f123c930918724ff0ef3 Signed-off-by: Andy Hung <hunga@google.com>
* Change references of Q19.12 to Q4.27 for clarityAndy Hung2014-04-021-4/+4
| | | | | Change-Id: I5beb7daf6ff9bc123ff3582f7c294edcaf8652f6 Signed-off-by: Andy Hung <hunga@google.com>
* Use LOG_ALWAYS_FATAL instead of LOG_FATALGlenn Kasten2014-03-261-4/+4
| | | | | | | LOG_FATAL is compiled out in most builds, so the assertion checks were not being performed. Change-Id: I774f0985ab9c5ccecd8989a0f1c940386b73fc35
* Rename mSinkFormat to mMixerFormat for AudioMixer::track_tAndy Hung2014-03-011-12/+12
| | | | | | | AudioMixer::SINK_FORMAT also changes to AudioMixer::MIXER_FORMAT Change-Id: Ic3f8be77d2c75c082c4fd140bc907e30c304d285 Signed-off-by: Andy Hung <hunga@google.com>
* Use float_from_q19_12 conversion in AudioMixerAndy Hung2014-02-281-3/+4
| | | | | Change-Id: Idbe84fb9610c7e636a84468f2e2402a913435ca9 Signed-off-by: Andy Hung <hunga@google.com>
* Add Track Sink Format to AudioMixerAndy Hung2014-02-261-22/+68
| | | | | | | | | Track Sink Format now allows both AUDIO_FORMAT_PCM_FLOAT and AUDIO_FORMAT_PCM_16_BIT (default). The float case is not enabled now. Change-Id: Ibee70cab4725c8bc9905e49f1f9a9c2448f76e00 Signed-off-by: Andy Hung <hunga@google.com>
* resolved conflicts for merge of 566be7c3 to masterNarayan Kamath2014-02-111-3/+4
|\ | | | | | | Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
| * Make frameworks/av 64-bit compatibleKévin PETIT2014-02-111-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Contains the necessary changes to make frameworks/av build and work on a 64-bit machine. Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Change-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43
* | Enable new dynamic audio resampler as defaultAndy Hung2014-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | The default may still be overridden by af.resampler.quality in the local or build properties file. For the build properties check the relevant device.mk files. In the absence of being overridden, the 44.1 to 48kHz and 48 to 44.1kHz conversion will use the DYN_MED_QUALITY resamplers and other conversion will use the DYN_LOW_QUALITY resamplers. Change-Id: Icf9a4af5422cddc445e1904eef93984b0abe6a44 Signed-off-by: Andy Hung <hunga@google.com>
* | Merge "Remove warnings in Audio mixer resampler compilation."Andy Hung2014-01-301-7/+7
|\ \
| * | Remove warnings in Audio mixer resampler compilation.Andy Hung2014-01-291-7/+7
| | | | | | | | | | | | | | | Change-Id: Ie68766142796772a54a90afdea188d0a5a78d4ac Signed-off-by: Andy Hung <hunga@google.com>
* | | Merge commit 'adf3f9b9' into manualmergeGlenn Kasten2014-01-291-5/+7
|\ \ \ | |/ / |/| / | |/ Change-Id: Icdef7d075b160eb2a5ced7c57f90c6a6a4b4c64a
| * AudioMixer: Remove tracks from enabledTracks after reseting outTempGaurav Kumar2014-01-291-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If any track goes through AudioMixer::process__genericNoResampling, and its getnextbuffer returns NULL, Then that track is removed by AudioMixer from enabledTracks. Thus if all tracks getnextbuffer return NULL, Then this function doesn't reset outTemp and last buffer in AudioFlinger's mMixBuffer will be repeated and noise is observed. Remove tracks from enabledTracks after reseting outTemp to zero, so that process__genericNoResampling will reset outTemp and noise won't appear. Bug: 12450065 Change-Id: I1ccac7ee4a3bf7fd930254356c072099e11e7c19 Signed-off-by: Gaurav Kumar <gaurav.kumar@broadcom.com> Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
* | Merge "Channel counts are uint32_t"Glenn Kasten2013-11-081-1/+1
|\ \
| * | Channel counts are uint32_tGlenn Kasten2013-11-061-1/+1
| | | | | | | | | | | | Change-Id: I5676b6a291b72d7db6326f7eaf6d17588de51b05
* | | Simplify track 'needs' bitsGlenn Kasten2013-11-061-11/+13
| | | | | | | | | | | | | | | | | | | | | Use more standard coding convention for bit masks, and add a FIXME about max channel count. Change-Id: I856784016703417ee480b92ae73757c472f9cf95
* | | Remove redundant this->Glenn Kasten2013-11-061-2/+2
| | | | | | | | | | | | Change-Id: Id783201e802b6ce294fa92f4bbe492adfb446686
* | | Remove dead codeGlenn Kasten2013-11-061-2/+0
| | | | | | | | | | | | Change-Id: Ide9196aa348cd3846b5c71d51fe6538f38ea8dc2
* | | Fix race condition in initializing downmixGlenn Kasten2013-11-061-25/+26
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code that initializes downmix GUID searches for an effect of the right type. If two or more AudioMixers are created, there is a possibility that the GUID will temporarily have the wrong value. Now the initialization is only done once, regardless of how many AudioMixers there are. Other minor changes: - use naming convention of leading 's' for static member variables - log message for no downmix effect is now a warning instead of an error, since it is not an error until there is actual content to downmix without a downmix effect Change-Id: I33ab0e51cf9d24ecaf8ae868883736b0772178c4
* | Explicit comparison to 0 for integral typesGlenn Kasten2013-08-131-4/+4
| | | | | | | | Change-Id: I2bfe864d1bda719581e297a38d96abfc0e3748b9
* | Use curly braces in 'if' to make it easier to add logsGlenn Kasten2013-08-131-4/+5
|/ | | | Change-Id: I58b33fefdd8bf703647414157a99a3223be3531c
* Make AudioFlinger::instantiate() more resilient when called from separate moduleGlenn Kasten2013-07-191-0/+1
| | | | | Bug: 8834855 Change-Id: I4cd842cdfb09d2aaaaab9df9ac3bec6179709bd3
* media.log cleanupGlenn Kasten2013-03-011-1/+6
| | | | | | | | | | | | | | Remove almost all of the specific logs, but leave the media.log logging infrastructure in place for the next time we need it. Re-apply a few good changes that were reverted earlier: - check logf format vs. argument list compatibility - distinguish potentially modified and actually modified tracks in FastMixer - fix benign bug where sq->end() was called more than once - fix a build warning Bug: 6490974 Change-Id: I02d3e83646c738acaebb415bd0d6b548638b4ef5
* Revert "Logging to investigate a crash"Glenn Kasten2013-02-271-6/+0
| | | | This reverts commit f0ff908da019a44115109f1b4d1b6864b35a8a29.
* A reference cannot be re-boundGlenn Kasten2013-02-191-20/+24
| | | | | | Bug: 8213067 Bug: 6490974 Change-Id: If546215641fbc9a0fb1e8af8b85cc01f0a4b26ab
* Revert "Temporary additional logging to investigate bug"Glenn Kasten2013-02-151-68/+4
| | | | | | This reverts commit 32584a7d672864b20ab8b83a3cb23c1858e908b7 Change-Id: I9dc680578b955b1af462eeb7a49d61a0d45eb81b
* Temporary additional logging to investigate bugGlenn Kasten2013-02-151-4/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug appears related to continuing to use an invalid buffer provider in fast mixer after track destruction, so focus the added logs in that area. Also includes a bug fix: was calling log in an unsafe place near Threads.cpp AudioFlinger::PlaybackThread::createTrack_l line 1250. Details: - include caller pid or client pid where appropriate - increase log buffer size - log mFastIndex when AudioMixer sees an invalid bufferProvider. - log both potentially modified and actually modified tracks in FastMixer. - fix benign bug where sq->end() was called more than once. - log StateQueue push() call and return. - increase StateQueue size from 4 to 8 entries - log mixer->enable(), bufferProvider, and currentTrackMask - log buffer provider addresses - increase fast mixer log buffer again - check logf format vs. argument list compatibility - add logging to AudioMixer - add checking of magic field in AudioMixer to detect overwrites - add bool AudioMixer::enabled() - increase log buffer sizes yet again - enable assertion checking without ALOGV - improve a few log messages - check for corruption in more places - log in all the process hooks - add new mixer APIs so we can check for corruption of mixer state - fix a build warning Bug: 6490974 Change-Id: Ib0c4a73dcf606ef9bd898313b3b40ef61ab42f51
* Revert "Temporary additional logging to investigate bug"Glenn Kasten2013-02-141-43/+3
| | | | | | This reverts commit 639482c24c911b125398b31883ba6d55faebe28b Change-Id: I11f2829072ab11e18b0663024f27bf31192f1d39
* Temporary additional logging to investigate bugGlenn Kasten2013-02-141-3/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | The bug appears related to continuing to use an invalid buffer provider in fast mixer after track destruction, so focus the added logs in that area. Also includes a bug fix: was calling log in an unsafe place near Threads.cpp AudioFlinger::PlaybackThread::createTrack_l line 1250. Details: - include caller pid or client pid where appropriate - increase log buffer size - log mFastIndex when AudioMixer sees an invalid bufferProvider. - log both potentially modified and actually modified tracks in FastMixer. - fix benign bug where sq->end() was called more than once. - log StateQueue push() call and return. - increase StateQueue size from 4 to 8 entries - log mixer->enable(), bufferProvider, and currentTrackMask - log buffer provider addresses - increase fast mixer log buffer again - check logf format vs. argument list compatibility - add logging to AudioMixer - add checking of magic field in AudioMixer to detect overwrites - add bool AudioMixer::enabled() Bug: 6490974 Change-Id: I1f3f18aa62d9fbd35bc32285b669f5ba40efe28e
* Revert "Temporary additional logging to investigate bug"Glenn Kasten2013-02-141-6/+2
| | | | | | This reverts commit 0ddd56316262ac74a95e9edb595697c163136d6d Change-Id: I180a928af6f5a38d15a5efe44cd1fe927b5d961c
* Temporary additional logging to investigate bugGlenn Kasten2013-02-131-2/+6
| | | | | | | | | | | | | | | | | | | The bug appears related to continuing to use an invalid buffer provider in fast mixer after track destruction, so focus the added logs in that area. Also includes a bug fix: was calling log in an unsafe place near Threads.cpp AudioFlinger::PlaybackThread::createTrack_l line 1250. Details: - include caller pid or client pid where appropriate - increase log buffer size - log mFastIndex when AudioMixer sees an invalid bufferProvider. - log both potentially modified and actually modified tracks in FastMixer. - fix benign bug where sq->end() was called more than once. - log StateQueue push() call and return. Bug: 6490974 Change-Id: Iee7c8f40e20b6000cd8286c0ec6a14fff4a37af1
* am 76143093: am f0ff908d: Logging to investigate a crashGlenn Kasten2012-12-101-0/+6
|\ | | | | | | | | * commit '761430930a7335d714af0f7c1d497feb8f9f0a5a': Logging to investigate a crash
generated by cgit v1.1 at 2025-01-21 22:08:06 +0000