summaryrefslogtreecommitdiff
path: root/libavresample
Commit message (Collapse)AuthorAge
...
| * aarch64: NEON float to s16 audio conversionJanne Grunau2014-04-22
| |
* | Merge commit '21d8f4da91673051ad7055cf63d989488a56368e'Michael Niedermayer2014-04-17
|\| | | | | | | | | | | | | * commit '21d8f4da91673051ad7055cf63d989488a56368e': resample: remove an unneeded context variable Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * resample: remove an unneeded context variableAnton Khirnov2014-04-17
| |
* | Merge commit 'ac976ed91e323754e9a84509873ebdb437372797'Michael Niedermayer2014-04-13
|\| | | | | | | | | | | | | * commit 'ac976ed91e323754e9a84509873ebdb437372797': lavr: allocate the resampling buffer with a positive size Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: allocate the resampling buffer with a positive sizeAnton Khirnov2014-04-13
| | | | | | | | | | | | This fixes cases where very few input samples (fewer than needed for one output sample) are passed to lavr at the beginning. CC:libav-stable@libav.org
* | Merge commit 'f7c5fd81516fb7b186c64c66dc080e1139586226'Michael Niedermayer2014-04-13
|\| | | | | | | | | | | | | * commit 'f7c5fd81516fb7b186c64c66dc080e1139586226': resample: implement flushing Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * resample: implement flushingAnton Khirnov2014-04-13
| |
* | Merge commit '254c95cdd1b669a722204a4a65974fc2523c8f83'Michael Niedermayer2014-04-11
|\| | | | | | | | | | | | | * commit '254c95cdd1b669a722204a4a65974fc2523c8f83': resample: split linear into its own function Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * resample: split linear into its own functionAnton Khirnov2014-04-11
| |
* | Merge commit 'be394968c81019887ef996a78a526bdd85d1e216'Michael Niedermayer2014-04-11
|\| | | | | | | | | | | | | * commit 'be394968c81019887ef996a78a526bdd85d1e216': resample: add initial padding explicitly Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * resample: add initial padding explicitlyAnton Khirnov2014-04-11
| | | | | | | | | | This simplifies the code, since we do not have to deal with a possibly negative source index anymore.
* | Merge commit 'eed752d61da332fb13e9893a175a90fed7b1d7d3'Michael Niedermayer2014-04-11
|\| | | | | | | | | | | | | * commit 'eed752d61da332fb13e9893a175a90fed7b1d7d3': resample: drop useless abs() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * resample: drop useless abs()Anton Khirnov2014-04-11
| | | | | | | | negative sample_index is handled in the block above.
* | Merge commit '3c84f6b5d20cd345fac706f8cfb70c55e541ffb5'Michael Niedermayer2014-04-11
|\| | | | | | | | | | | | | * commit '3c84f6b5d20cd345fac706f8cfb70c55e541ffb5': resample: reindent Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * resample: reindentAnton Khirnov2014-04-11
| |
* | Merge commit 'f20892eb67a7b4b5a3c080388a35a3380516a805'Michael Niedermayer2014-04-11
|\| | | | | | | | | | | | | * commit 'f20892eb67a7b4b5a3c080388a35a3380516a805': resample: split the nearest neighbour path into a separate function pointer Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * resample: split the nearest neighbour path into a separate function pointerAnton Khirnov2014-04-11
| |
* | Merge commit 'b9dea23766f52b8e059e72d34980bb7b456efe8f'Michael Niedermayer2014-04-11
|\| | | | | | | | | | | | | * commit 'b9dea23766f52b8e059e72d34980bb7b456efe8f': resample: fix avresample_get_delay() return value Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * resample: fix avresample_get_delay() return valueAnton Khirnov2014-04-11
| | | | | | | | | | | | | | | | The correct "next" input sample is not the first sample of the resampling buffer, but the center sample of the filter_length-sized block at the beginning. CC:libav-stable@libav.org
* | Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'Michael Niedermayer2014-04-05
|\| | | | | | | | | | | | | | | | | | | * commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8': x86: Drop some unnecessary YASM ifdefs Conflicts: libavfilter/x86/vf_yadif_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: Drop some unnecessary YASM ifdefsDiego Biurrun2014-04-04
| | | | | | | | Dead code elimination is enough to avoid undefined references in these cases.
* | Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'Michael Niedermayer2014-03-26
|\| | | | | | | | | | | | | * commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f': Add missing headers to make template files compile (more) standalone Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add missing headers to make template files compile (more) standaloneDiego Biurrun2014-03-26
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-22
|\| | | | | | | | | | | | | * qatar/master: lavr: return an error if a avresample_open() is called on an open context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: return an error if a avresample_open() is called on an open contextAnton Khirnov2014-02-22
| |
* | Merge commit '7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731'Michael Niedermayer2014-02-22
|\| | | | | | | | | | | | | * commit '7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731': lavr: add a function for checking whether AVAudioResampleContext is open Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: add a function for checking whether AVAudioResampleContext is openAnton Khirnov2014-02-22
| |
* | Merge commit '76a75c523cd3c63560185394a0a5cd7249db962a'Michael Niedermayer2014-02-08
|\| | | | | | | | | | | | | * commit '76a75c523cd3c63560185394a0a5cd7249db962a': lavr: mix front center channel as indicated in the ATSC A/52 specification. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: mix front center channel as indicated in the ATSC A/52 specification.Tim Walker2014-02-08
| | | | | | | | When mixing 3 front channels into 2, the center channel is mixed into left and right with the center mix level, not -3dB.
* | Merge commit '5bcbb516f2ff45290ef7995b081762e668693672'Michael Niedermayer2014-02-08
|\| | | | | | | | | | | | | * commit '5bcbb516f2ff45290ef7995b081762e668693672': arm: Add X() around all references to extern symbols Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: Add X() around all references to extern symbolsMartin Storsjö2014-02-07
| | | | | | | | | | | | Don't rely on the fact that an unprefixed label currently exists. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-01-15
|\| | | | | | | | | | | | | * qatar/master: aarch64: port neon clobber test from arm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aarch64: port neon clobber test from armJanne Grunau2014-01-15
| |
* | Merge commit '99e20125232d40ea239a5b54d26bbfe526506114'Michael Niedermayer2014-01-13
|\| | | | | | | | | | | | | * commit '99e20125232d40ea239a5b54d26bbfe526506114': x86/arm: Add clobber tests to libavresample Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86/arm: Add clobber tests to libavresampleMartin Storsjö2014-01-13
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'cc976a75dffa148d655b52604331679ff669e8a2'Michael Niedermayer2014-01-04
|\| | | | | | | | | | | | | * commit 'cc976a75dffa148d655b52604331679ff669e8a2': audio_mix: print (SKIP) instead of 0.0 for matrix columns removed along with output zeroing Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * audio_mix: print (SKIP) instead of 0.0 for matrix columns removed along with ↵Anton Khirnov2014-01-03
| | | | | | | | output zeroing
* | Merge commit 'fc6a3ef40d34ce8443ae57c2452f3f273d7d4891'Michael Niedermayer2014-01-04
|\| | | | | | | | | | | | | * commit 'fc6a3ef40d34ce8443ae57c2452f3f273d7d4891': audio_mix: fix zeroing output channels in certain cases Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * audio_mix: fix zeroing output channels in certain casesAnton Khirnov2014-01-03
| | | | | | | | | | | | | | | | | | | | | | Specifically, when the corresponding input channel exists and its matrix column is all-zero (which is necessary for zeroing the output), the matrix column must be removed from the matrix. This is not done currently, so the mixing code would end up using uninitialized pointers from stack. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
* | Merge commit '3d95d27376e59de14f984e7a22a52e066d85df35'Michael Niedermayer2014-01-04
|\| | | | | | | | | | | | | * commit '3d95d27376e59de14f984e7a22a52e066d85df35': audio_mix: initialize the data pointers to NULL Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * audio_mix: initialize the data pointers to NULLAnton Khirnov2014-01-03
| | | | | | | | | | | | | | This should make it easier to catch problems where some of those pointers are used uninitialized, since reading from NULL should always crash, while random numbers from stack can turn out to be valid pointers, so random memory may be silently overwritten.
* | Merge commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0'Michael Niedermayer2013-12-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0': avutil: Move library version related macros to version.h Conflicts: libavcodec/version.h libavresample/version.h libavutil/avutil.h libavutil/utils.c See: 183117fed7d0a910b5f65e5c78b065f125abf369 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avutil: Move library version related macros to version.hDiego Biurrun2013-12-26
| | | | | | | | This is a more sensible place for these macros.
* | avresample: Include libavutil/avutil.h in version.hJames Almer2013-12-06
| | | | | | | | | | | | | | Should fix issues compiling lavr's Windows resource file. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add Windows resource file support for shared librariesJames Almer2013-12-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally written by James Almer <jamrial@gmail.com> With the following contributions by Timothy Gu <timothygu99@gmail.com> * Use descriptions of libraries from the pkg-config file generation function * Use "FFmpeg Project" as CompanyName (suggested by Alexander Strasser) * Use "FFmpeg" for ProductName as MSDN says "name of the product with which the file is distributed" [1]. * Use FFmpeg's version (N-xxxxx-gxxxxxxx) for ProductVersion per MSDN [1]. * Only build the .rc files when --enable-small is not enabled. [1] http://msdn.microsoft.com/en-us/library/windows/desktop/aa381058.aspx Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Add missing #includes for *INT64_MAX and *INT64_C Conflicts: ffmpeg.c ffmpeg_filter.c ffplay.c libavformat/assdec.c libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add missing #includes for *INT64_MAX and *INT64_CDiego Biurrun2013-11-23
| |
* | Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5'Michael Niedermayer2013-10-28
|\| | | | | | | | | | | | | * commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5': lavr: check that current_buffer is not NULL before using it Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: check that current_buffer is not NULL before using itJustin Ruggles2013-10-27
| | | | | | | | | | | | | | Fixes a segfault during resampling when compiled with -DDEBUG. Fixes all fate-lavr-resample tests with -DDEBUG. CC:libav-stable@libav.org
* | Merge commit '206895708ea2b464755d340e44501daf9a07c310'Michael Niedermayer2013-10-14
|\| | | | | | | | | | | | | * commit '206895708ea2b464755d340e44501daf9a07c310': x86inc: Remove our FMA4 support Merged-by: Michael Niedermayer <michaelni@gmx.at>