summaryrefslogtreecommitdiffstats
path: root/libavresample
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'd68c05380cebf563915412182643a8be04ef890b'Michael Niedermayer2015-06-013-4/+8
|\ | | | | | | | | | | | | | | * commit 'd68c05380cebf563915412182643a8be04ef890b': x86: check for AV_CPU_FLAG_AVXSLOW where useful See: c16e99e3b3c02edcf33245468731d414eab97dac Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: check for AV_CPU_FLAG_AVXSLOW where usefulJames Almer2015-05-313-4/+8
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '0ac8ff618c5e6d878c547a8877e714ed728950ce'Michael Niedermayer2015-04-291-1/+3
|\ \ | |/ | | | | | | | | | | * commit '0ac8ff618c5e6d878c547a8877e714ed728950ce': avresample: Reallocate the internal buffer to the correct size Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avresample: Reallocate the internal buffer to the correct sizeLuca Barbato2015-04-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fixes the corner case in which the internal buffer size is larger than input buffer provided and resizing it before moving the left over samples would make it write to now unallocated memory. Bug-Id: 825 CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'Michael Niedermayer2015-04-204-42/+42
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a3eb042c704dea190c644def5b32c9cee8832b8': Replace av_dlog with normal av_log at trace level Conflicts: ffplay.c libavdevice/fbdev_dec.c libavfilter/avfilter.c libavfilter/internal.h libavfilter/setpts.c libavfilter/src_movie.c libavfilter/vf_crop.c libavfilter/vf_drawtext.c libavfilter/vf_fieldorder.c libavformat/assdec.c libavformat/avidec.c libavformat/flvdec.c libavformat/http.c libavformat/ipmovie.c libavformat/isom.c libavformat/mov.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/mpegtsenc.c libavformat/mux.c libavformat/mxfdec.c libavformat/nsvdec.c libavformat/oggdec.c libavformat/r3d.c libavformat/rtspdec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace av_dlog with normal av_log at trace levelVittorio Giovara2015-04-194-42/+42
| | | | | | | | This applies to every library where performance is not critical.
* | Merge commit '12655c48049f9a52e5504bde90fe738862b0ff08'Michael Niedermayer2015-02-226-2/+470
|\ \ | |/ | | | | | | | | | | * commit '12655c48049f9a52e5504bde90fe738862b0ff08': libavresample: NEON optimized FIR audio resampling Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavresample: NEON optimized FIR audio resamplingPeter Meerwald2015-02-216-2/+470
| | | | | | | | | | | | | | | | | | | | modelled after aarch64 code on Cortex-A8, s16 and s32 code is about 2x faster, float code about 7x faster Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'df0891fc8f32db3ced797cd6ebff9492fda01b99'Michael Niedermayer2015-02-201-2/+2
|\ \ | |/ | | | | | | | | | | * commit 'df0891fc8f32db3ced797cd6ebff9492fda01b99': libavresample: Annotate AARCH64 init function with av_cold Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavresample: Annotate AARCH64 init function with av_coldPeter Meerwald2015-02-201-2/+2
| | | | | | | | | | Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '963f76144897d3f7684d82ec21e51dd50ea1106e'Michael Niedermayer2014-10-181-1/+1
|\ \ | |/ | | | | | | | | | | * commit '963f76144897d3f7684d82ec21e51dd50ea1106e': avresample: Make sure the even check does not overflow Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avresample: Make sure the even check does not overflowLuca Barbato2014-10-181-1/+1
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 732225
* | Merge commit '088eca28164c8cd3b72b0c3d3f9e3fe5ee5cb28f'Michael Niedermayer2014-10-181-1/+4
|\ \ | |/ | | | | | | | | | | * commit '088eca28164c8cd3b72b0c3d3f9e3fe5ee5cb28f': avresample: prevent theoretical division by zero Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avresample: prevent theoretical division by zeroVittorio Giovara2014-10-181-1/+4
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1231986
* | Add missing "const" all over the place.Reimar Döffinger2014-08-291-1/+1
| | | | | | | | | | | | Only "./configure --enable-gpl" on x86 was tested. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge commit '11db644a8e54f02e54d2eaad343a87fcb697c15e'Michael Niedermayer2014-08-171-2/+2
|\ \ | |/ | | | | | | | | | | * commit '11db644a8e54f02e54d2eaad343a87fcb697c15e': lavr: Update the planar check in ff_audio_convert Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: Update the planar check in ff_audio_convertLuca Barbato2014-08-171-2/+2
| | | | | | | | | | | | Leftover from fbc0b8659967ea54a8472b5f795270d38bb085dd. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45'Michael Niedermayer2014-08-103-1/+200
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45': avresample: Introduce AVFrame-based API Conflicts: libavresample/utils.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avresample: Introduce AVFrame-based APILuca Barbato2014-08-103-1/+200
| |
* | Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8'Michael Niedermayer2014-08-101-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8': Bump major versions of all libraries. Conflicts: doc/APIchanges libavcodec/version.h libavdevice/version.h libavfilter/version.h libavformat/version.h libavutil/version.h libswscale/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Bump major versions of all libraries.Anton Khirnov2014-08-091-2/+2
| |
* | Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e'Michael Niedermayer2014-08-091-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e': Postpone API-incompatible changes until the next bump. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Postpone API-incompatible changes until the next bump.Anton Khirnov2014-08-091-1/+1
| |
* | Merge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd'Michael Niedermayer2014-08-044-12/+16
|\ \ | |/ | | | | | | | | | | * commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd': lavr: Do not change the sample format for mono audio Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: Do not change the sample format for mono audioJustin Ruggles2014-08-034-12/+16
| | | | | | | | | | | | | | This treats mono as planar internally within libavresample rather than changing the sample format. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'b2d45654220503224aa94e78cdff19ec624e9342'Michael Niedermayer2014-05-293-8/+39
|\ \ | |/ | | | | | | | | | | * commit 'b2d45654220503224aa94e78cdff19ec624e9342': avresample: Add avresample_get_out_samples Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avresample: Add avresample_get_out_samplesLuca Barbato2014-05-283-8/+39
| | | | | | | | | | Utility function to get the upper bound on the number of samples the resampler would output.
* | Merge commit '449511740f06a4675b0066730fa45cdb764ffafc'Michael Niedermayer2014-05-131-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '449511740f06a4675b0066730fa45cdb764ffafc': build: handle library dependencies in configure Conflicts: common.mak configure libavdevice/Makefile libavfilter/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: handle library dependencies in configureJanne Grunau2014-05-131-1/+0
| | | | | | | | | | Instead of setting FFLIBS in each library Makefile configure exports FFLIBS-$library in config.mak.
* | Merge commit 'a24a252709dd38f12aa4929ce4981f87091a5113'Michael Niedermayer2014-04-256-2/+342
|\ \ | |/ | | | | | | | | | | * commit 'a24a252709dd38f12aa4929ce4981f87091a5113': aarch64: NEON optimized FIR audio resampling Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aarch64: NEON optimized FIR audio resamplingJanne Grunau2014-04-246-2/+342
| | | | | | | | | | | | Optimized for the default filter length 16. 30% faster opus silk decoding.
* | Merge commit 'cae8df78759c2e69257f7fe58842f34c0d98a7ec'Michael Niedermayer2014-04-252-29/+29
|\ \ | |/ | | | | | | | | | | * commit 'cae8df78759c2e69257f7fe58842f34c0d98a7ec': lavr: define ResampleContext in resample.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavr: define ResampleContext in resample.hJanne Grunau2014-04-242-29/+29
| | | | | | | | Required for arch optimized resampling.
* | Merge commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924'Michael Niedermayer2014-04-225-0/+419
|\ \ | |/ | | | | | | | | | | * commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924': aarch64: NEON float to s16 audio conversion Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aarch64: NEON float to s16 audio conversionJanne Grunau2014-04-225-0/+419
| |
* | Merge commit '21d8f4da91673051ad7055cf63d989488a56368e'Michael Niedermayer2014-04-171-8/+3
|\ \ | |/ | | | | | | | | | | * commit '21d8f4da91673051ad7055cf63d989488a56368e': resample: remove an unneeded context variable Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * resample: remove an unneeded context variableAnton Khirnov2014-04-171-8/+3
| |
* | Merge commit 'ac976ed91e323754e9a84509873ebdb437372797'Michael Niedermayer2014-04-131-1/+1
|\ \ | |/ | | | | | | | | | | * 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-131-1/+1
| | | | | | | | | | | | 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-131-7/+39
|\ \ | |/ | | | | | | | | | | * commit 'f7c5fd81516fb7b186c64c66dc080e1139586226': resample: implement flushing Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * resample: implement flushingAnton Khirnov2014-04-131-7/+39
| |
* | Merge commit '254c95cdd1b669a722204a4a65974fc2523c8f83'Michael Niedermayer2014-04-112-15/+27
|\ \ | |/ | | | | | | | | | | * 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-112-15/+27
| |
* | Merge commit 'be394968c81019887ef996a78a526bdd85d1e216'Michael Niedermayer2014-04-112-22/+36
|\ \ | |/ | | | | | | | | | | * commit 'be394968c81019887ef996a78a526bdd85d1e216': resample: add initial padding explicitly Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * resample: add initial padding explicitlyAnton Khirnov2014-04-112-22/+36
| | | | | | | | | | This simplifies the code, since we do not have to deal with a possibly negative source index anymore.
* | Merge commit 'eed752d61da332fb13e9893a175a90fed7b1d7d3'Michael Niedermayer2014-04-111-2/+2
|\ \ | |/ | | | | | | | | | | * commit 'eed752d61da332fb13e9893a175a90fed7b1d7d3': resample: drop useless abs() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * resample: drop useless abs()Anton Khirnov2014-04-111-2/+2
| | | | | | | | negative sample_index is handled in the block above.
* | Merge commit '3c84f6b5d20cd345fac706f8cfb70c55e541ffb5'Michael Niedermayer2014-04-111-21/+20
|\ \ | |/ | | | | | | | | | | * commit '3c84f6b5d20cd345fac706f8cfb70c55e541ffb5': resample: reindent Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * resample: reindentAnton Khirnov2014-04-111-21/+20
| |
* | Merge commit 'f20892eb67a7b4b5a3c080388a35a3380516a805'Michael Niedermayer2014-04-112-13/+25
|\ \ | |/ | | | | | | | | | | * commit 'f20892eb67a7b4b5a3c080388a35a3380516a805': resample: split the nearest neighbour path into a separate function pointer Merged-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud