215430e049
Merge commit '0ac8ff618c5e6d878c547a8877e714ed728950ce'
...
* commit '0ac8ff618c5e6d878c547a8877e714ed728950ce':
avresample: Reallocate the internal buffer to the correct size
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-29 05:46:35 +02:00
0ac8ff618c
avresample: Reallocate the internal buffer to the correct size
...
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>
2015-04-28 23:51:51 +02:00
40d552dae6
Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'
...
* 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>
2015-04-20 03:19:47 +02:00
1a3eb042c7
Replace av_dlog with normal av_log at trace level
...
This applies to every library where performance is not critical.
2015-04-19 12:41:59 +01:00
db3f6465a6
Merge commit '12655c48049f9a52e5504bde90fe738862b0ff08'
...
* commit '12655c48049f9a52e5504bde90fe738862b0ff08':
libavresample: NEON optimized FIR audio resampling
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-22 00:06:23 +01:00
12655c4804
libavresample: NEON optimized FIR audio resampling
...
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>
2015-02-21 22:08:39 +02:00
e32fc9b45b
Merge commit 'a24a252709dd38f12aa4929ce4981f87091a5113'
...
* commit 'a24a252709dd38f12aa4929ce4981f87091a5113':
aarch64: NEON optimized FIR audio resampling
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-25 01:19:27 +02:00
26953ed2e3
Merge commit 'cae8df78759c2e69257f7fe58842f34c0d98a7ec'
...
* commit 'cae8df78759c2e69257f7fe58842f34c0d98a7ec':
lavr: define ResampleContext in resample.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-25 01:17:15 +02:00
a24a252709
aarch64: NEON optimized FIR audio resampling
...
Optimized for the default filter length 16.
30% faster opus silk decoding.
2014-04-24 18:28:26 +02:00
cae8df7875
lavr: define ResampleContext in resample.h
...
Required for arch optimized resampling.
2014-04-24 18:28:26 +02:00
11d187b377
Merge commit '21d8f4da91673051ad7055cf63d989488a56368e'
...
* commit '21d8f4da91673051ad7055cf63d989488a56368e':
resample: remove an unneeded context variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-17 21:07:25 +02:00
21d8f4da91
resample: remove an unneeded context variable
2014-04-17 20:08:19 +02:00
cbfa71d689
Merge commit 'f7c5fd81516fb7b186c64c66dc080e1139586226'
...
* commit 'f7c5fd81516fb7b186c64c66dc080e1139586226':
resample: implement flushing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-13 14:03:02 +02:00
f7c5fd8151
resample: implement flushing
2014-04-13 11:15:45 +02:00
662a8d8827
Merge commit '254c95cdd1b669a722204a4a65974fc2523c8f83'
...
* commit '254c95cdd1b669a722204a4a65974fc2523c8f83':
resample: split linear into its own function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-11 20:39:04 +02:00
65088b925a
Merge commit 'be394968c81019887ef996a78a526bdd85d1e216'
...
* commit 'be394968c81019887ef996a78a526bdd85d1e216':
resample: add initial padding explicitly
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-11 20:38:38 +02:00
671f908657
Merge commit 'f20892eb67a7b4b5a3c080388a35a3380516a805'
...
* commit 'f20892eb67a7b4b5a3c080388a35a3380516a805':
resample: split the nearest neighbour path into a separate function pointer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-11 19:34:03 +02:00
c04961fa0f
Merge commit 'b9dea23766f52b8e059e72d34980bb7b456efe8f'
...
* commit 'b9dea23766f52b8e059e72d34980bb7b456efe8f':
resample: fix avresample_get_delay() return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-11 19:24:03 +02:00
254c95cdd1
resample: split linear into its own function
2014-04-11 16:34:02 +02:00
be394968c8
resample: add initial padding explicitly
...
This simplifies the code, since we do not have to deal with a possibly
negative source index anymore.
2014-04-11 16:33:46 +02:00
f20892eb67
resample: split the nearest neighbour path into a separate function pointer
2014-04-11 16:26:36 +02:00
b9dea23766
resample: fix avresample_get_delay() return value
...
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
2014-04-11 16:21:25 +02:00
d814a839ac
Reinstate proper FFmpeg license for all files.
2013-08-30 15:47:38 +00:00
4d68269d58
lavr: typedef internal structs in internal.h
...
Simplifies header dependencies by not including all other internal headers
in internal.h.
2013-01-07 21:49:05 -05:00
f1c2915ce1
lavr: remove automatic context close/open for resampling compensation
...
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.
2012-12-16 19:26:17 -05:00
f322b20735
lavr: only save/restore the mixing matrix if mixing is being done
2012-12-16 19:26:17 -05:00
1d86aa8b0f
lavr: do not pass consumed samples as a parameter to ff_audio_resample()
...
Since the resampler handles buffering of unconsumed samples internally, the
caller does not need this information.
2012-11-27 16:49:19 -05:00
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
3aa696e883
avresample: De-doxygenize some comments where Doxygen is not appropriate
2012-08-11 20:22:01 +02:00
6410397600
lavr: resampling: add support for s32p, fltp, and dblp internal sample formats
...
Based partially on implementation by Michael Niedermayer <michaelni@gmx.at> in
libswresample in FFmpeg. See commits:
7f1ae79d3824ab1abfb6
2012-07-08 15:22:11 -04:00
372647aed0
lavr: resampling: add filter type and Kaiser window beta to AVOptions
2012-07-08 15:22:11 -04:00
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
Michael Niedermayer
Luca Barbato
Vittorio Giovara
Peter Meerwald
Janne Grunau
Anton Khirnov
Thilo Borgmann
Justin Ruggles
Martin Storsjö
Diego Biurrun