bdb2e80e88
Merge commit 'b2d45654220503224aa94e78cdff19ec624e9342'
...
* commit 'b2d45654220503224aa94e78cdff19ec624e9342':
avresample: Add avresample_get_out_samples
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-05-29 01:23:22 +02:00
b2d4565422
avresample: Add avresample_get_out_samples
...
Utility function to get the upper bound on the number of samples the
resampler would output.
2014-05-28 22:04:56 +02:00
3d7218d932
Merge commit '449511740f06a4675b0066730fa45cdb764ffafc'
...
* commit '449511740f06a4675b0066730fa45cdb764ffafc':
build: handle library dependencies in configure
Conflicts:
common.mak
configure
libavdevice/Makefile
libavfilter/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-05-13 22:40:32 +02:00
449511740f
build: handle library dependencies in configure
...
Instead of setting FFLIBS in each library Makefile configure
exports FFLIBS-$library in config.mak.
2014-05-13 20:02:01 +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
96a4d0c1c3
Merge commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924'
...
* commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924':
aarch64: NEON float to s16 audio conversion
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-22 23:33:07 +02:00
f4d5a2cc35
aarch64: NEON float to s16 audio conversion
2014-04-22 19:35:41 +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
c11aa9d29a
Merge commit 'ac976ed91e323754e9a84509873ebdb437372797'
...
* commit 'ac976ed91e323754e9a84509873ebdb437372797':
lavr: allocate the resampling buffer with a positive size
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-13 14:33:42 +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
ac976ed91e
lavr: allocate the resampling buffer with a positive size
...
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
2014-04-13 11:21:20 +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
6d6bd16fce
Merge commit 'eed752d61da332fb13e9893a175a90fed7b1d7d3'
...
* commit 'eed752d61da332fb13e9893a175a90fed7b1d7d3':
resample: drop useless abs()
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-11 20:23:33 +02:00
fb7d64df7e
Merge commit '3c84f6b5d20cd345fac706f8cfb70c55e541ffb5'
...
* commit '3c84f6b5d20cd345fac706f8cfb70c55e541ffb5':
resample: reindent
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-11 19:34:31 +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
eed752d61d
resample: drop useless abs()
...
negative sample_index is handled in the block above.
2014-04-11 16:28:11 +02:00
3c84f6b5d2
resample: reindent
2014-04-11 16:27:22 +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
ebb21887b8
Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'
...
* commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8':
x86: Drop some unnecessary YASM ifdefs
Conflicts:
libavfilter/x86/vf_yadif_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-05 19:16:39 +02:00
01c5779f56
x86: Drop some unnecessary YASM ifdefs
...
Dead code elimination is enough to avoid undefined references in these cases.
2014-04-04 19:08:05 +02:00
0371eaebcd
Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'
...
* commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f':
Add missing headers to make template files compile (more) standalone
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-03-26 14:50:55 +01:00
aba70bb538
Add missing headers to make template files compile (more) standalone
2014-03-26 04:31:27 -07:00
246eae98cf
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavr: return an error if a avresample_open() is called on an open context
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-22 21:12:02 +01:00
5367c0be62
Merge commit '7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731'
...
* commit '7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731':
lavr: add a function for checking whether AVAudioResampleContext is open
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-22 21:06:02 +01:00
1db03a6864
lavr: return an error if a avresample_open() is called on an open context
2014-02-22 20:53:09 +01:00
7e86c27b4e
lavr: add a function for checking whether AVAudioResampleContext is open
2014-02-22 20:52:36 +01:00
b08f554fdc
Merge commit '76a75c523cd3c63560185394a0a5cd7249db962a'
...
* commit '76a75c523cd3c63560185394a0a5cd7249db962a':
lavr: mix front center channel as indicated in the ATSC A/52 specification.
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-08 18:38:17 +01:00
76a75c523c
lavr: mix front center channel as indicated in the ATSC A/52 specification.
...
When mixing 3 front channels into 2, the center channel is mixed into left and right with the center mix level, not -3dB.
2014-02-08 13:42:55 +01:00
bf90abe1dd
Merge commit '5bcbb516f2ff45290ef7995b081762e668693672'
...
* commit '5bcbb516f2ff45290ef7995b081762e668693672':
arm: Add X() around all references to extern symbols
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-02-08 00:48:26 +01:00
5bcbb516f2
arm: Add X() around all references to extern symbols
...
Don't rely on the fact that an unprefixed label currently exists.
Signed-off-by: Martin Storsjö <martin@martin.st >
2014-02-07 15:13:58 +02:00
949adce125
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
aarch64: port neon clobber test from arm
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-15 15:49:22 +01:00
fe96769bed
aarch64: port neon clobber test from arm
2014-01-15 12:31:07 +01:00
9ace154186
Merge commit '99e20125232d40ea239a5b54d26bbfe526506114'
...
* commit '99e20125232d40ea239a5b54d26bbfe526506114':
x86/arm: Add clobber tests to libavresample
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-13 14:36:55 +01:00
99e2012523
x86/arm: Add clobber tests to libavresample
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2014-01-13 14:13:27 +02:00
781fd58838
Merge commit 'cc976a75dffa148d655b52604331679ff669e8a2'
...
* 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 >
2014-01-04 02:30:07 +01:00
4b8bc6d2b0
Merge commit 'fc6a3ef40d34ce8443ae57c2452f3f273d7d4891'
...
* commit 'fc6a3ef40d34ce8443ae57c2452f3f273d7d4891':
audio_mix: fix zeroing output channels in certain cases
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-04 02:16:33 +01:00
fadec4f6db
Merge commit '3d95d27376e59de14f984e7a22a52e066d85df35'
...
* commit '3d95d27376e59de14f984e7a22a52e066d85df35':
audio_mix: initialize the data pointers to NULL
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-01-04 02:11:33 +01:00
cc976a75df
audio_mix: print (SKIP) instead of 0.0 for matrix columns removed along with output zeroing
2014-01-03 16:43:25 +01:00
fc6a3ef40d
audio_mix: fix zeroing output channels in certain cases
...
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
2014-01-03 16:42:46 +01:00
3d95d27376
audio_mix: initialize the data pointers to NULL
...
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.
2014-01-03 16:42:23 +01:00
