summaryrefslogtreecommitdiff
path: root/libavresample
Commit message (Collapse)AuthorAge
...
* | 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.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-11-18
|\| | | | | | | | | | | | | | | | | * qatar/master: x86: lavr: fix stack allocation for 7 and 8 channel downmixing on x86-32 lavr: fix the decision for writing directly to the output buffer parisc: work around bug in gcc 4.3 and later Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: lavr: fix stack allocation for 7 and 8 channel downmixing on x86-32Ronald S. Bultje2012-11-17
| | | | | | | | Fixes crashes on Win32 and stack overruns on x86-32 in general.
| * lavr: fix the decision for writing directly to the output bufferJustin Ruggles2012-11-17
| | | | | | | | | | | | 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.
| * build: Drop AVX assembly ifdefsDiego Biurrun2012-11-11
| | | | | | | | An assembler able to cope with AVX instructions is now required.
* | Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'Michael Niedermayer2012-11-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '97bf7c03b1338a867da52c159a2afecbdedcfa88': doc: git-howto: Leave reviewers time to react before pushing patches Include libavutil/channel_layout.h instead of libavutil/audioconvert.h lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/git-howto.texi ffmpeg_filter.c libavcodec/flacdec.c libavcodec/imc.c libavcodec/mpegaudiodec.c libavcodec/utils.c libavfilter/asrc_anullsrc.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffer.c libavutil/Makefile libavutil/audioconvert.h libavutil/channel_layout.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Include libavutil/channel_layout.h instead of libavutil/audioconvert.hJustin Ruggles2012-11-11
| | | | | | | | Also reorder some other #include when applicable.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-11-10
|\| | | | | | | | | | | | | | | * qatar/master: x86: PALIGNR: port to cpuflags x86: h264_qpel_10bit: port to cpuflags Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: PALIGNR: port to cpuflagsDiego Biurrun2012-11-09
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-11-06
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: atrac: Place atrac1 and atrac3 tests in different groups fate: aac: cosmetics: Group AAC LATM tests together x86: avresample: Add missing colons to assembly labels Conflicts: tests/fate/aac.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: avresample: Add missing colons to assembly labelsDiego Biurrun2012-11-06
| | | | | | | | YASM accepts labels without colons, but NASM issues warnings.
* | Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'Michael Niedermayer2012-10-31
|\| | | | | | | | | | | | | | | | | | | * commit '04581c8c77ce779e4e70684ac45302972766be0f': x86: yasm: Use complete source path for macro helper %includes Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: yasm: Use complete source path for macro helper %includesDiego Biurrun2012-10-31
| | | | | | | | | | This is more consistent with the way we handle C #includes and it simplifies the build system.
* | Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'Michael Niedermayer2012-10-31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6860b4081d046558c44b1b42f22022ea341a2a73': x86: include x86inc.asm in x86util.asm cng: Reindent some incorrectly indented lines cngdec: Allow flushing the decoder cngdec: Make the dbov variable have the right unit cngdec: Fix the memset size to cover the full array cngdec: Update the LPC coefficients after averaging the reflection coefficients configure: fix print_config() with broke awks Conflicts: libavcodec/x86/ac3dsp.asm libavcodec/x86/dct32.asm libavcodec/x86/deinterlace.asm libavcodec/x86/dsputil.asm libavcodec/x86/dsputilenc.asm libavcodec/x86/fft.asm libavcodec/x86/fmtconvert.asm libavcodec/x86/h264_chromamc.asm libavcodec/x86/h264_deblock.asm libavcodec/x86/h264_deblock_10bit.asm libavcodec/x86/h264_idct.asm libavcodec/x86/h264_idct_10bit.asm libavcodec/x86/h264_intrapred.asm libavcodec/x86/h264_intrapred_10bit.asm libavcodec/x86/h264_weight.asm libavcodec/x86/vc1dsp.asm libavcodec/x86/vp3dsp.asm libavcodec/x86/vp56dsp.asm libavcodec/x86/vp8dsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: include x86inc.asm in x86util.asmDiego Biurrun2012-10-31
| | | | | | | | This is necessary to allow refactoring some x86util macros with cpuflags.
* | Merge commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8'Michael Niedermayer2012-10-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8': dv: use AVStream.index instead of abusing AVStream.id lavfi: add ashowinfo filter avcodec: Add a RFC 3389 comfort noise codec lpc: Add a function for calculating reflection coefficients from samples lpc: Add a function for calculating reflection coefficients from autocorrelation coefficients lavr: document upper bound on number of output samples. lavr: add general API usage doxy indeo3: remove duplicate capabilities line. fate: ac3: Add dependencies Conflicts: Changelog doc/filters.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/version.h libavfilter/Makefile libavfilter/af_ashowinfo.c libavfilter/allfilters.c libavfilter/version.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: document upper bound on number of output samples.Anton Khirnov2012-10-29
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * lavr: add general API usage doxyAnton Khirnov2012-10-29
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520'Michael Niedermayer2012-10-14
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520': configure: tms470: add mapping for -mfpu=vfpv3-d16 flag configure: recognise Minix as OS configure: work around bug in ash shell eval-test: make table static const lavr: handle clipping in the float to s32 conversion nut: support pcm codecs not mapped in avi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: handle clipping in the float to s32 conversionJustin Ruggles2012-10-13
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: yuv4mpeg: return proper error codes. Give all anonymously typedeffed structs in headers a name fate: Add parseutils test parseutils-test: Drop random colors from parsing test vf_pad/scale: use double precision for aspect ratios. build: error on variable-length arrays ppc: swscale: rework yuv2planeX_altivec() ppc: fmtconvert: kill VLA in float_to_int16_interleave_altivec() x86: dsputil: kill VLA in gmc_mmx() libspeexenc: Updated commentary to reflect recent changes libspeexenc: Add an option for enabling DTX doc/APIchanges: fill in missing dates and hashes. lavr: bump major to 1 and declare it stable. lavr: change the type of the data buffers to uint8_t**. lavc: deprecate the audio resampling API. Conflicts: cmdutils.h configure doc/APIchanges ffplay.c libavcodec/dwt.h libavcodec/libspeexenc.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavformat/asf.h tests/fate/libavutil.mak tests/ref/fate/parseutils Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: bump major to 1 and declare it stable.Anton Khirnov2012-10-05
| |
| * lavr: change the type of the data buffers to uint8_t**.Anton Khirnov2012-10-05
| | | | | | | | | | | | This is more consistent with what the rest of Libav does. This breaks API.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: x86: dsputil: Move Xvid IDCT put/add functions to a more suitable place trasher: Include all the necessary headers x86: Remove some leftover declarations for non-existent functions ARM: libavresample: NEON optimised generic fltp to s16 conversion ARM: libavresample: NEON optimised stereo fltp to s16 conversion ARM: libavresample: NEON optimised flat float to s16 conversion Conflicts: libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ARM: libavresample: NEON optimised generic fltp to s16 conversionMans Rullgard2012-09-13
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * ARM: libavresample: NEON optimised stereo fltp to s16 conversionMans Rullgard2012-09-13
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * ARM: libavresample: NEON optimised flat float to s16 conversionMans Rullgard2012-09-13
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: os_support: Choose between direct.h and io.h using a configure check os_support: Include io.h instead of direct.h on mingw32ce x86: ac3dsp: Only refer to the ac3_downmix_sse symbol if it has been declared swscale: Remove two bogus asserts ac3: move ac3_downmix() from dsputil to ac3dsp lavr/audio_mix_matrix: acknowledge the existence of LFE2. mlp_parser: avoid mapping multiple disctinct TrueHD channels to the same Libav channel. lavu/audioconvert: add a second low frequency channel. Conflicts: doc/APIchanges libavcodec/ac3dsp.c libavcodec/ac3dsp.h libavcodec/mlp_parser.c libavutil/audioconvert.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr/audio_mix_matrix: acknowledge the existence of LFE2.Tim Walker2012-09-12
| | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: swscale: Provide the right alignment for external mmx asm x86: Replace checks for CPU extensions and flags by convenience macros configure: msvc: fix/simplify setting of flags for hostcc x86: mlpdsp: mlp_filter_channel_x86 requires inline asm Conflicts: libavcodec/x86/fft_init.c libavcodec/x86/h264_intrapred_init.c libavcodec/x86/h264dsp_init.c libavcodec/x86/mpegaudiodec.c libavcodec/x86/proresdsp_init.c libavutil/x86/float_dsp_init.c libswscale/utils.c libswscale/x86/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: Replace checks for CPU extensions and flags by convenience macrosDiego Biurrun2012-09-08
| | | | | | | | | | This separates code relying on inline from that relying on external assembly and fixes instances where the coalesced check was incorrect.
* | Merge commit 'c7b610aa0b1bac47eea0056b13fe6e982b85844a'Michael Niedermayer2012-09-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c7b610aa0b1bac47eea0056b13fe6e982b85844a': avopt: Explicitly store float/double option defaults in .dbl Conflicts: libavcodec/ac3dec.c libavcodec/libx264.c libavfilter/af_amix.c libavfilter/af_asyncts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avopt: Explicitly store float/double option defaults in .dblMartin Storsjö2012-09-04
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'Michael Niedermayer2012-09-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9': avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options_table.h libavcodec/snowenc.c libavcodec/tiffenc.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_join.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_delogo.c libavfilter/vf_drawtext.c libavformat/http.c libavformat/img2dec.c libavformat/img2enc.c libavformat/movenc.c libavformat/mpegenc.c libavformat/mpegtsenc.c libavformat/options_table.h libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union memberMartin Storsjö2012-09-04
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-18 03:16:34 +0000