b2eea615c0
lavr: allow setting internal_sample_fmt option by string
2013-02-23 17:07:54 -05:00
50f4337a2f
lavr: Add "resample_cutoff" option as a duplicate of "cutoff"
...
Avoids an option name conflict with libavcodec, which is needed in order
to work properly with avconv.
2013-02-23 17:07:54 -05:00
157542ebc1
lavr: fix mixing matrix reduction when normalization is disabled
...
In some cases when an input contributes fully to the corresponding
output, other inputs may also contribute to the same output. This is the
case, for example, for the default 5.1 to stereo downmix matrix without
normalization.
2013-02-12 13:41:13 -05:00
600b4c973f
lavr: fix matrix reduction for upmixing in certain cases
...
Do not skip an output if the corresponding input contributes to other output
channels.
2013-02-12 13:41:13 -05:00
a3735bb92a
lavr: cosmetics: reindent
2013-02-12 13:41:13 -05:00
1647da89dd
lavr: make sure that the mix function is reset even if no mixing will be done
...
If the matrix reduction ends up with no mixing matrix needed, we need to still
reset the mix function accordingly and log the info to the user.
2013-02-12 13:41:09 -05:00
646831e697
lavr: print out the mix matrix in ff_audio_mix_set_matrix()
...
This will print the new matrix if it is set after initialization.
2013-02-12 13:35:04 -05:00
b90632d596
lavr: always reset mix function names and pointers in mix_function_init()
...
CC: libav-stable@libav.org
2013-01-17 19:27:01 -05:00
f07ef2d9c9
lavr: call mix_function_init() in ff_audio_mix_set_matrix()
...
This is needed if a custom matrix is set by the user after opening the
AVAudioResampleContext because the matrix channel count can change if
different mixing coefficients are used.
CC:libav-stable@libav.org
2013-01-17 19:27:01 -05:00
a6a3164b13
x86: lavr: add SSE2/AVX dither_int_to_float()
2013-01-08 14:52:43 -05:00
1fb8f6a44f
x86: lavr: add SSE2 quantize() for dithering
2013-01-08 14:52:43 -05:00
7ff3fd7ae4
lavr: log channel conversion description for any-to-any functions
2013-01-07 21:49:07 -05:00
4164b0e8d3
lavr: mix: reduce the mixing matrix when possible
...
If the matrix results in an output channel not getting a contribution
from any input channel and the corresponding input channel does not
contribute to any outputs, we can skip the channel during mixing and
silence it after mixing.
If the matrix results in an input channel not contributing to any output
channels and it is not in the output mix, or if the input channel only
contributes fully to the same output channel, we can skip the channel
during mixing.
If the matrix results in an output channel only getting full
contribution from the corresponding input channel and that input channel
does not contribute to any other output channels, we can skip the
channel during mixing.
2013-01-07 21:49:06 -05:00
1ccf82cfd8
lavr: cosmetics: reindent
2013-01-07 21:49:06 -05:00
074a00d192
lavr: add a public function for setting a custom channel map
...
This allows reordering, duplication, and silencing of input channels.
2013-01-07 21:49:06 -05:00
4d68269d58
lavr: typedef internal structs in internal.h
...
Simplifies header dependencies by not including all other internal headers
in internal.h.
2013-01-07 21:49:05 -05:00
95d01c3f1c
x86: lavr: use the x86inc.asm automatic stack alignment in mixing functions
...
CC:libav-stable@libav.org
2013-01-05 16:14:35 -05:00
be6cde3ce8
lavr: fix missing " in header documentation
...
Signed-off-by: Peter Meerwald <p.meerwald@bct-electronic.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-01-04 10:29:55 +02:00
511cf612ac
miscellaneous typo fixes
2012-12-21 00:18:34 +01:00
b2fe6756e3
lavr: add option for dithering during sample format conversion to s16
2012-12-19 18:52:54 -05:00
0cf3505930
avresample: use valid log context in mixing functions
...
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
2012-12-16 19:59:58 -05:00
f1c2915ce1
lavr: remove automatic context close/open for resampling compensation
...
It adds unnecessary complication for insignificant usability improvement.
The user really should know if they'll need resampling compensation before
opening the context.
Note that only the documentation has changed. The current functionality will
still work until the next major bump.
2012-12-16 19:26:17 -05:00
f322b20735
lavr: only save/restore the mixing matrix if mixing is being done
2012-12-16 19:26:17 -05:00
230acdde26
lavr: move AudioMix struct definition to audio_mix.c
2012-12-15 12:26:15 -05:00
42b5688d5e
lavr: fix segfault due to overlooked change needed in 14758e3
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-12-12 09:09:00 +01:00
14758e3211
lavr: temporarily store custom matrix in AVAudioResampleContext
...
This allows AudioMix to be treated the same way as other conversion contexts
and removes the requirement to allocate it at the same time as the
AVAudioResampleContext.
The current matrix get/set functions are split between the public interface
and AudioMix private functions.
2012-12-11 14:00:32 -05:00
887d4c05c9
lavr: clarify documentation for avresample_get/set_matrix()
2012-12-11 14:00:32 -05:00
1d86aa8b0f
lavr: do not pass consumed samples as a parameter to ff_audio_resample()
...
Since the resampler handles buffering of unconsumed samples internally, the
caller does not need this information.
2012-11-27 16:49:19 -05:00
d2f9f8e094
lavr: correct the documentation for the ff_audio_resample() return value
2012-11-27 16:49:18 -05:00
7f534d11ed
lavr: do not pass sample count as a parameter to ff_audio_convert()
...
It will always be the number of samples in the input buffer, so just use that
directly instead of passing it as a separate parameter.
2012-11-27 16:49:18 -05:00
7a9e65acee
x86: lavr: fix stack allocation for 7 and 8 channel downmixing on x86-32
...
Fixes crashes on Win32 and stack overruns on x86-32 in general.
2012-11-17 20:16:04 -05:00
02738792c5
lavr: fix the decision for writing directly to the output buffer
...
If there are any samples remaining in the output fifo from previous conversion
calls, we have to output those samples first instead of doing direct output
of the current samples.
2012-11-17 20:09:40 -05:00
2b479bcab0
build: Drop AVX assembly ifdefs
...
An assembler able to cope with AVX instructions is now required.
2012-11-11 20:43:28 +01:00
a903f8f087
Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
...
Also reorder some other #include when applicable.
2012-11-11 13:35:12 -05:00
4b60fac419
x86: PALIGNR: port to cpuflags
2012-11-09 21:31:31 +01:00
352e18b766
x86: avresample: Add missing colons to assembly labels
...
YASM accepts labels without colons, but NASM issues warnings.
2012-11-06 12:07:35 +01:00
04581c8c77
x86: yasm: Use complete source path for macro helper %includes
...
This is more consistent with the way we handle C #includes and
it simplifies the build system.
2012-10-31 00:37:42 +01:00
6860b4081d
x86: include x86inc.asm in x86util.asm
...
This is necessary to allow refactoring some x86util macros with cpuflags.
2012-10-31 00:37:42 +01:00
dc5793062e
lavr: document upper bound on number of output samples.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2012-10-29 20:05:47 +01:00
01b760190d
lavr: add general API usage doxy
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2012-10-29 20:05:41 +01:00
10e645e9cb
lavr: handle clipping in the float to s32 conversion
...
We cannot clip to INT_MAX because that value cannot be exactly
represented by a float value and ends up overflowing during conversion
anyway. We need to use a slightly smaller float value, which ends up
with slightly inaccurate results for samples which clip or nearly clip,
but it is close enough. Using doubles as intermediates in the conversion
would be more accurate, but it takes about twice as much time.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-10-13 12:34:34 +02:00
006afc7a0b
lavr: bump major to 1 and declare it stable.
2012-10-05 13:50:13 +02:00
e7ba5b1de0
lavr: change the type of the data buffers to uint8_t**.
...
This is more consistent with what the rest of Libav does.
This breaks API.
2012-10-05 13:49:44 +02:00
8ff7857861
ARM: libavresample: NEON optimised generic fltp to s16 conversion
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-09-13 19:15:43 +01:00
d26de339af
ARM: libavresample: NEON optimised stereo fltp to s16 conversion
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-09-13 19:15:43 +01:00
643b5b794f
ARM: libavresample: NEON optimised flat float to s16 conversion
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-09-13 19:15:42 +01:00
b901c30da6
lavr/audio_mix_matrix: acknowledge the existence of LFE2.
...
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
2012-09-12 18:26:53 -04:00
e0c6cce447
x86: Replace checks for CPU extensions and flags by convenience macros
...
This separates code relying on inline from that relying on external
assembly and fixes instances where the coalesced check was incorrect.
2012-09-08 18:18:34 +02:00
c7b610aa0b
avopt: Explicitly store float/double option defaults in .dbl
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-09-04 23:13:51 +03:00
e6153f173a
avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-09-04 23:13:44 +03:00
Justin Ruggles
Peter Meerwald
Diego Biurrun
Hendrik Leppkes
Ronald S. Bultje
Anton Khirnov
Mans Rullgard
Tim Walker
Martin Storsjö