generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
49,747 Commits 24 Branches 241 Tags
Commit Graph

13 Commits

Author SHA1 Message Date
Anton Khirnov
481e55eba7 audio_mix: fix channel order in mix_1_to_2_fltp_flt_c 
CC:libav-stable@libav.org
(cherry picked from commit df6737a55f5dc7c0ae5272bc5fa6182836d5481c)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2014-01-05 17:21:24 -05:00
Justin Ruggles
d7e7e12abc 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
(cherry picked from commit f07ef2d9c9e9d1e84c532e9102594834e88a5c83)

Conflicts:

	libavresample/audio_mix.c
 2013-01-24 12:00:08 +01:00
Hendrik Leppkes
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
Justin Ruggles
230acdde26 lavr: move AudioMix struct definition to audio_mix.c 2012-12-15 12:26:15 -05:00
Justin Ruggles
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
Martin Storsjö
1d9c2dc89a Don't include common.h from avutil.h 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-08-15 22:32:06 +03:00
John Stebbins
4cf4028331 libavresample: add mix level normalization option 
Provides an option to disable mix level normalization

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-08-14 23:36:56 +02:00
Justin Ruggles
8821ae649e lavr: fix handling of custom mix matrices 
Adds some validation for changing parameters after setting the matrix and
fixes a bug in the conversion path setup.
 2012-08-04 10:28:22 -04:00
Justin Ruggles
db0e7bd0bd lavr: mix: validate internal sample format in ff_audio_mix_init() 2012-07-08 15:22:11 -04:00
John Stebbins
3971be0eb5 Add Dolby/DPLII downmix support to libavresample 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-06-18 10:55:00 -04:00
Justin Ruggles
8dfc122719 lavr: add C functions for mixing 2 to 1 channels with s16p format 2012-05-29 15:16:20 -04:00
Justin Ruggles
4010d724e1 lavr: use 8.8 instead of 10.6 as the 16-bit fixed-point mixing coeff type 2012-05-01 13:52:59 -04:00
Justin Ruggles
c8af852b97 Add libavresample 
This is a new library for audio sample format, channel layout, and sample rate
conversion.
 2012-04-24 21:28:27 -04:00