aboutsummaryrefslogtreecommitdiffstats
path: root/Alc/mixer_inc.c
Commit message (Collapse)AuthorAgeFilesLines
* Add a mixing function to blend HRIRsChris Robinson2017-05-031-7/+52
| | | | | | This is a bit more efficient than calling the normal HRTF mixing function twice, and helps solve the problem of the values generated from convolution not being consistent with the new HRIR.
* Write directly to the output for HRTFChris Robinson2017-04-271-51/+26
|
* Store the HRIR coeff pointer and delays directly in MixHrtfParamsChris Robinson2017-03-121-2/+2
|
* Rework HRTF coefficient fadingChris Robinson2017-03-111-68/+13
| | | | | | | | | | | | | | | This improves fading between HRIRs as sources pan around. In particular, it improves the issue with individual coefficients having various rounding errors in the stepping values, as well as issues with interpolating delay values. It does this by doing two mixing passes for each source. First using the last coefficients that fade to silence, and then again using the new coefficients that fade from silence. When added together, it creates a linear fade from one to the other. Additionally, the gain is applied separately so the individual coefficients don't step with rounding errors. Although this does increase CPU cost since it's doing two mixes per source, each mix is a bit cheaper now since the stepping is simplified to a single gain value, and the overall quality is improved.
* Pass the left and right buffers to the hrtf mixers directlyChris Robinson2017-01-171-8/+8
|
* Use ALsizei for sizes and offsets with the mixerChris Robinson2017-01-161-18/+18
| | | | | | Unsigned 32-bit offsets actually have some potential overhead on 64-bit targets for pointer/array accesses due to rules on integer wrapping. No idea how much impact it has in practice, but it's nice to be correct about it.
* Use a more specialized mixer function for B-Format to HRTFChris Robinson2016-08-121-0/+33
|
* Use the real output's left and right channels with HRTFChris Robinson2016-03-111-7/+8
|
* Separate writing to the output buffer from HRTF filteringChris Robinson2016-03-111-31/+58
|
* Update the current HRTF delays if the stepping is not finishedChris Robinson2016-03-111-0/+5
|
* Calculate HRTF stepping params right before mixingChris Robinson2016-02-141-27/+31
| | | | | This means we track the current params and the target params, rather than the target params and the stepping. This closer matches the non-HRTF mixers.
* Define MixHrtf directly instead of through a SUFFIX macroChris Robinson2015-08-151-12/+0
|
* Use a separate method to set initial HRTF coefficientsChris Robinson2014-11-241-6/+4
|
* Partially revert "Use a different method for HRTF mixing"Chris Robinson2014-11-231-8/+40
| | | | | | | | | | | | The sound localization with virtual channel mixing was just too poor, so while it's more costly to do per-source HRTF mixing, it's unavoidable if you want good localization. This is only partially reverted because having the virtual channel is still beneficial, particularly with B-Format rendering and effect mixing which otherwise skip HRTF processing. As before, the number of virtual channels can potentially be customized, specifying more or less channels depending on the system's needs.
* Use a different method for HRTF mixingChris Robinson2014-11-221-43/+11
| | | | | | | | | | | | | | | | | | | | | | | This new method mixes sources normally into a 14-channel buffer with the channels placed all around the listener. HRTF is then applied to the channels given their positions and written to a 2-channel buffer, which gets written out to the device. This method has the benefit that HRTF processing becomes more scalable. The costly HRTF filters are applied to the 14-channel buffer after the mix is done, turning it into a post-process with a fixed overhead. Mixing sources is done with normal non-HRTF methods, so increasing the number of playing sources only incurs normal mixing costs. Another benefit is that it improves B-Format playback since the soundfield gets mixed into speakers covering all three dimensions, which then get filtered based on their locations. The main downside to this is that the spatial resolution of the HRTF dataset does not play a big role anymore. However, the hope is that with ambisonics- based panning, the perceptual position of panned sounds will still be good. It is also an option to increase the number of virtual channels for systems that can handle it, or maybe even decrease it for weaker systems.
* Combine the direct and send mixersChris Robinson2014-06-131-9/+9
|
* Move an HRTF mixer parameter and shorten a couple variable namesChris Robinson2014-05-181-3/+2
|
* Use different parameters for HRTF mixersChris Robinson2014-05-181-10/+4
|
* Pass some DirectParams as function parametersChris Robinson2014-05-181-8/+7
|
* Remove a dead assignmentChris Robinson2014-05-141-1/+0
|
* Better pack HRTF mixing propertiesChris Robinson2014-05-031-32/+27
|
* Use C11 alignas when availableChris Robinson2014-04-191-1/+3
|
* Make HRTF stepping values per-channelChris Robinson2014-04-051-2/+2
|
* Remove the now-unneeded click removal buffers for the deviceChris Robinson2014-03-231-1/+1
| | | | | | They are still there for auxiliary sends. However, they should go away soon enough too, and then we won't have to mess around with calculating extra "predictive" samples in the mixer.
* Don't feed the HRTF mix to the click removal and pending click buffersChris Robinson2014-03-231-40/+3
| | | | | The coefficients (which control the volume and panning) already use stepping to non-abruptly fade the mix.
* Step mixing gains per-sample for non-HRTF mixingChris Robinson2014-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This fades the dry mixing gains using a logarithmic curve, which should produce a smoother transition than a linear one. It functions similarly to a linear fade except that step = (target - current) / numsteps; ... gain += step; becomes step = powf(target / current, 1.0f / numsteps); ... gain *= step; where 'target' and 'current' are clamped to a lower bound that is greater than 0 (which makes no sense on a logarithmic scale). Consequently, the non-HRTF direct mixers do not do not feed into the click removal and pending click buffers, as this per-sample fading would do an adequate job of stopping clicks and pops caused by extreme gain changes. These buffers should be removed shortly.
* Move the step counter and moving flag to DirectParamsChris Robinson2014-03-231-1/+1
|
* Store the HrtfState directly in the DirectParamsChris Robinson2014-03-231-5/+5
|
* Use a union to combine HRTF and non-HRTF mixer paramsChris Robinson2014-03-191-9/+9
|
* Revert "Apply HRTF coefficient stepping separately"Chris Robinson2014-02-231-4/+5
| | | | | | | | | This reverts commit 25b9c3d0c15e959d544f5d0ac7ea507ea5f6d69f. Conflicts: Alc/mixer_neon.c Unfortunately this also undoes the Neon-enhanced ApplyCoeffsStep method.
* Move HRTF macros and function declarations to a separate headerChris Robinson2014-02-231-0/+1
|
* Apply HRTF coefficient stepping separatelyChris Robinson2013-11-101-5/+4
|
* Use C99's inline instead of __inlineChris Robinson2013-05-281-9/+9
|
* Use restrict instead of RESTRICTChris Robinson2013-05-221-15/+15
|
* Put the HRTF DirectParams into an anonymous structChris Robinson2012-10-151-9/+9
|
* Constify the direct and send parameters given to the mixerChris Robinson2012-10-151-5/+5
|
* Remove the unused Device parameterChris Robinson2012-10-141-3/+1
|
* Store the output buffers in the DirectParams structChris Robinson2012-10-141-3/+4
|
* Remove the now-unused Source parameter from the DryMix methodsChris Robinson2012-10-141-2/+1
|
* Store some more HRTF info in the DirectParams structChris Robinson2012-10-141-5/+6
|
* Avoid building redundant mixersChris Robinson2012-09-161-72/+0
|
* Minor cleanups for variable declarationsChris Robinson2012-09-111-25/+13
|
* Use a non-interleaved DryBufferChris Robinson2012-09-111-11/+10
|
* Do the filtering separately from the mixingChris Robinson2012-09-111-34/+11
|
* Update HRTF codeChris Robinson2012-09-111-7/+10
| | | | | | | | | | | This update allows for much more flexibility in the HRTF data. It also allows for HRTF table file names to include "%r" to represent the device's playback rate (e.g. if you set hrtf-%r.mhr, then it will try to use hrtf-44100.mhr or hrtf-48000.mhr depending if the device's output rate is 44100 or 48000, respectively). The makehrtf utility has also been updated to support more options and input file formats, as well as the new mhr format.
* Implement MixDirect_SSE separately from the C and Neon versionsChris Robinson2012-09-091-7/+13
|
* Move the target effect slot to the SendParams structChris Robinson2012-09-081-3/+2
|
* Separate the resampling and mixing stepsChris Robinson2012-09-081-208/+141
|
* Minor cleanups for mixer_incChris Robinson2012-08-291-17/+21
|
* Add an SSE-enhanced path for applying the mixer matrixChris Robinson2012-08-291-7/+15
|