summaryrefslogtreecommitdiff
path: root/libavresample
Commit message (Collapse)AuthorAge
* Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'Michael Niedermayer2013-03-28
|\ | | | | | | | | | | | | | | | | | | * commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa': cosmetics: Remove unnecessary extern keywords from function declarations Conflicts: libswscale/x86/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Remove unnecessary extern keywords from function declarationsDiego Biurrun2013-03-27
| |
* | Merge commit '45235ac488363e3360bf2f2275102d1ec66eba0f'Michael Niedermayer2013-02-24
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '45235ac488363e3360bf2f2275102d1ec66eba0f': configure: Move x11grab option to a more suitable place in the help output lavr: allow setting internal_sample_fmt option by string lavr: Add "resample_cutoff" option as a duplicate of "cutoff" Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: allow setting internal_sample_fmt option by stringJustin Ruggles2013-02-23
| |
| * lavr: Add "resample_cutoff" option as a duplicate of "cutoff"Justin Ruggles2013-02-23
| | | | | | | | | | Avoids an option name conflict with libavcodec, which is needed in order to work properly with avconv.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-13
|\| | | | | | | | | | | | | | | | | * qatar/master: lavr: fix mixing matrix reduction when normalization is disabled lavr: fix matrix reduction for upmixing in certain cases lavr: cosmetics: reindent Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: fix mixing matrix reduction when normalization is disabledJustin Ruggles2013-02-12
| | | | | | | | | | | | | | 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.
| * lavr: fix matrix reduction for upmixing in certain casesJustin Ruggles2013-02-12
| | | | | | | | | | Do not skip an output if the corresponding input contributes to other output channels.
| * lavr: cosmetics: reindentJustin Ruggles2013-02-12
| |
* | Merge commit '1647da89dd8ac09a55c111589f7a30d7e6b87d90'Michael Niedermayer2013-02-13
|\| | | | | | | | | | | | | | | | | | | * commit '1647da89dd8ac09a55c111589f7a30d7e6b87d90': lavr: make sure that the mix function is reset even if no mixing will be done lavr: print out the mix matrix in ff_audio_mix_set_matrix() ws-snd1: decode directly to the user-provided AVFrame wmavoice: decode directly to the user-provided AVFrame Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: make sure that the mix function is reset even if no mixing will be doneJustin Ruggles2013-02-12
| | | | | | | | | | 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.
| * lavr: print out the mix matrix in ff_audio_mix_set_matrix()Justin Ruggles2013-02-12
| | | | | | | | This will print the new matrix if it is set after initialization.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: h264: avoid pointless copying of ref lists lavr: always reset mix function names and pointers in mix_function_init() lavr: call mix_function_init() in ff_audio_mix_set_matrix() fate: update ref after rv30_loop_filter fix rv30: fix masking in rv30_loop_filter() Conflicts: tests/ref/fate/filter-delogo tests/ref/fate/rv30 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: always reset mix function names and pointers in mix_function_init()Justin Ruggles2013-01-17
| | | | | | | | CC: libav-stable@libav.org
| * lavr: call mix_function_init() in ff_audio_mix_set_matrix()Justin Ruggles2013-01-17
| | | | | | | | | | | | | | | | 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
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: xan: Convert to bytestream2 oggenc: add a page_duration option and deprecate the pagesize option x86: lavr: add SSE2/AVX dither_int_to_float() Conflicts: libavcodec/xan.c libavformat/oggenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: lavr: add SSE2/AVX dither_int_to_float()Justin Ruggles2013-01-08
| |
* | Merge commit '1fb8f6a44f06e48386450fe0363aefc02583d24a'Michael Niedermayer2013-01-09
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '1fb8f6a44f06e48386450fe0363aefc02583d24a': x86: lavr: add SSE2 quantize() for dithering doc/APIchanges: fill in missing dates and hashes. rtpdec_vp8: Request a keyframe if RTP packets are lost Conflicts: doc/APIchanges Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: lavr: add SSE2 quantize() for ditheringJustin Ruggles2013-01-08
| |
* | Merge commit '8729698d50739524665090e083d1bfdf28235724'Michael Niedermayer2013-01-08
|\| | | | | | | | | | | | | | | | | | | * commit '8729698d50739524665090e083d1bfdf28235724': rtsp: Recheck the reordering queue if getting a new packet lavr: log channel conversion description for any-to-any functions lavr: mix: reduce the mixing matrix when possible lavr: cosmetics: reindent Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: log channel conversion description for any-to-any functionsJustin Ruggles2013-01-07
| |
| * lavr: mix: reduce the mixing matrix when possibleJustin Ruggles2013-01-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * lavr: cosmetics: reindentJustin Ruggles2013-01-07
| |
* | Merge commit '074a00d192c0e749d677b008b337da42597e780f'Michael Niedermayer2013-01-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '074a00d192c0e749d677b008b337da42597e780f': lavr: add a public function for setting a custom channel map lavr: typedef internal structs in internal.h doc: Extend commit message section Conflicts: doc/APIchanges doc/developer.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: add a public function for setting a custom channel mapJustin Ruggles2013-01-07
| | | | | | | | This allows reordering, duplication, and silencing of input channels.
| * lavr: typedef internal structs in internal.hJustin Ruggles2013-01-07
| | | | | | | | | | Simplifies header dependencies by not including all other internal headers in internal.h.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-06
|\| | | | | | | | | | | | | * qatar/master: x86: lavr: use the x86inc.asm automatic stack alignment in mixing functions Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: lavr: use the x86inc.asm automatic stack alignment in mixing functionsJustin Ruggles2013-01-05
| | | | | | | | CC:libav-stable@libav.org
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-04
|\| | | | | | | | | | | | | | | * qatar/master: lavr: fix missing " in header documentation aviobuf: Discard old buffered, previously read data in ffio_read_partial Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: fix missing " in header documentationPeter Meerwald2013-01-04
| | | | | | | | | | Signed-off-by: Peter Meerwald <p.meerwald@bct-electronic.com> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'Michael Niedermayer2012-12-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '511cf612ac979f536fd65e14603a87ca5ad435f3': miscellaneous typo fixes Conflicts: libavcodec/4xm.c libavcodec/lagarith.c libavcodec/parser.c libavcodec/ratecontrol.c libavcodec/shorten.c libavcodec/vda_h264.c libavformat/dvenc.c libavformat/wtv.c tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * miscellaneous typo fixesDiego Biurrun2012-12-21
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-12-20
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavr: add option for dithering during sample format conversion to s16 mpeg12: do not decode extradata more than once. Conflicts: libavcodec/mpeg12.c libavcodec/mpeg12.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: add option for dithering during sample format conversion to s16Justin Ruggles2012-12-19
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-12-17
|\| | | | | | | | | | | | | | | * qatar/master: avresample: use valid log context in mixing functions lavr: remove automatic context close/open for resampling compensation Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avresample: use valid log context in mixing functionsHendrik Leppkes2012-12-16
| | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * lavr: remove automatic context close/open for resampling compensationJustin Ruggles2012-12-16
| | | | | | | | | | | | | | | | | | 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.
* | Merge commit 'f322b2073581119de5da74f92a03309a36891cfa'Michael Niedermayer2012-12-17
|\| | | | | | | | | | | | | | | | | * commit 'f322b2073581119de5da74f92a03309a36891cfa': lavr: only save/restore the mixing matrix if mixing is being done rtpdec_vp8: Cosmetics: Fix bad alignment/indentation rtpenc: Allow including a SDES/CNAME block in RTCP SR packets Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: only save/restore the mixing matrix if mixing is being doneJustin Ruggles2012-12-16
| |
* | Merge commit '27c8337e595a058347150269d5c2c48281e4285b'Michael Niedermayer2012-12-16
|\| | | | | | | | | | | | | * commit '27c8337e595a058347150269d5c2c48281e4285b': h264-mt: handle NAL_DPAs before calling ff_thread_finish_setup lavr: move AudioMix struct definition to audio_mix.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: move AudioMix struct definition to audio_mix.cJustin Ruggles2012-12-15
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-12-12
|\| | | | | | | | | | | | | | | * qatar/master: lavr: fix segfault due to overlooked change needed in 14758e3 x86inc: support stack mem allocation and re-alignment in PROLOGUE Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: fix segfault due to overlooked change needed in 14758e3Justin Ruggles2012-12-12
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '14758e3211d34a97c42b07acae117ce5627d7f57'Michael Niedermayer2012-12-12
|\| | | | | | | | | | | | | | | * commit '14758e3211d34a97c42b07acae117ce5627d7f57': lavr: temporarily store custom matrix in AVAudioResampleContext lavr: clarify documentation for avresample_get/set_matrix() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: temporarily store custom matrix in AVAudioResampleContextJustin Ruggles2012-12-11
| | | | | | | | | | | | | | | | | | 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.
| * lavr: clarify documentation for avresample_get/set_matrix()Justin Ruggles2012-12-11
| |
* | Merge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563'Michael Niedermayer2012-11-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563': vble: Do not abort decoding when version is not 1 lavr: do not pass consumed samples as a parameter to ff_audio_resample() lavr: correct the documentation for the ff_audio_resample() return value lavr: do not pass sample count as a parameter to ff_audio_convert() x86: h264_weight: port to cpuflags configure: Enable avconv filter dependencies automatically Conflicts: configure libavcodec/x86/h264_weight.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: do not pass consumed samples as a parameter to ff_audio_resample()Justin Ruggles2012-11-27
| | | | | | | | | | Since the resampler handles buffering of unconsumed samples internally, the caller does not need this information.
| * lavr: correct the documentation for the ff_audio_resample() return valueJustin Ruggles2012-11-27
| |
| * lavr: do not pass sample count as a parameter to ff_audio_convert()Justin Ruggles2012-11-27
| | | | | | | | | | 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.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-02 19:42:50 +0000