virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
60,824 Commits 37 Branches 400 Tags 460 MiB
6236debe1a
Commit Graph

384 Commits

Author SHA1 Message Date
Reimar Döffinger
e535897fad Fix libswresample compilation with Apple Neon assembler. 
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2014-02-17 17:40:10 +01:00
Martin Storsjö
3dd04cbcf7 swresample: Add arm&x86 clobber tests 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-18 18:38:57 +01:00
Reimar Döffinger
cbeaf67888 Avoid using empty macro arguments. 
These are not supported by all compilers (gcc 2.95 but also older SPARC
compilers, see gcc bug #33304 for example), and there is no real need for them.
One use of this feature remains in libavdevice/v4l2.c which can't be
replaced quite as easily.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-12-31 12:19:59 +01:00
Stefano Sabatini
334e2e2363 lavu,lavc,lswr: do not hardcode AV_SAMPLE_FMT_NB value when setting sample format max value 
The constant may change in libavutil but the library may be compiled
against an older version, thus rejecting a value which is otherwise
supported by the new libavutil.

INT_MAX is used here to denote the max allowed value for a sample format.

The opt-test code is changed to provide a valid reference example.
 2013-12-26 11:35:27 +01:00
James Almer
56572787ae Add Windows resource file support for shared libraries 
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>
 2013-12-05 23:42:07 +01:00
Michael Niedermayer
a6af5da7a2 swresample: use the internal buffer for resampling the last few samples 
Fixes out of array read
Fixes Ticket3193

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-04 20:40:42 +01:00
Nicolas George
4a640a6ac8 lswr: fix assert failure on unknown layouts. 2013-11-03 10:30:37 +01:00
Stefano Sabatini
904c89ac1b lswr/swresample: convert ocl and icl options to AV_OPT_TYPE_CHANNEL_LAYOUT 
Improve interface flexibility. In particular makes it possible to set
channel layout through symbolic names using the av_opt_set() interface.
 2013-10-17 18:09:54 +02:00
Ronald S. Bultje
ad75d2b590 x86: Fix compilation with nasm on PPC & OS/2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-08 12:36:19 +02:00
Clément Bœsch
a89e9ad1c8 swr: fix example code and doxy indent. 2013-09-29 23:37:46 +02:00
Michael Niedermayer
9078b40d35 swresample: replace 2 av_free() by av_freep() 
avoids leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-16 22:44:15 +02:00
Michael Niedermayer
c56d4dab03 swr/rematrix: Fix handling of AV_CH_LAYOUT_STEREO_DOWNMIX output 
Fixes Ticket2859

Note, testcases related to the downmix channels are welcome.
(id like to make sure this is working correctly now, as obviously it didnt
 work before ...)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-20 16:56:51 +02:00
Michael Niedermayer
6dfffe9200 swr: clean layouts before checking sanity 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-20 16:49:31 +02:00
Michael Niedermayer
7ac12599fe swresample: fix negative rematrix volumns 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 03:24:22 +02:00
Michael Niedermayer
e2b718464e swresample: Make rematrix maxvalue user settable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 03:23:54 +02:00
Timothy Gu
a9bbf59be7 cosmetics: Fix "dont" "wont" "doesnt" typos 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-29 02:31:16 +02:00
Michael Niedermayer
ca2818b881 swresample/x86/audio_convert: add emms to CONV 
Might fix Ticket1874

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-18 02:26:36 +02:00
Michael Niedermayer
d62030ffca swresample/rematrix_template: Fix integer overflow in mix8to2 
Fixes: CID1030352
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-10 03:03:17 +02:00
Michael Niedermayer
b04bbe6b86 swresample/rematrix_template: Fix integer overflow in mix6to2 
Fixes: CID1030351
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-10 03:03:12 +02:00
Michael Niedermayer
3289670142 swr: dont treat 32 and 24 as equal in simple copy check 
Fixes dithering from 32 to 24 bit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 03:06:34 +02:00
Michael Niedermayer
6bc4e36ba7 swr: set scale for 32->32/24 dither 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 03:06:34 +02:00
Paul B Mahol
0804171104 swresample: set flags & description and add documentation for output_sample_bits 
Allows users to actually use such option.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-04 21:57:25 +00:00
Michael Niedermayer
495bf1b685 swr: Fix dithering of s16 with SIMD 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-04 23:50:45 +02:00
Michael Niedermayer
4cfc92081d swr: add native_simd_one 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-04 23:50:45 +02:00
Michael Niedermayer
b84de51f54 swresample/rematrix: add S32 mixing code 
Needed for dithering S32

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-04 15:12:11 +02:00
Michael Niedermayer
f3c638eac1 wresample/rematrix_template: fix internal types 
Should make no difference, but future commits will need it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-04 15:12:11 +02:00
Michael Niedermayer
6e29f39252 swr/rematrix: use av_calloc() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-15 20:31:06 +02:00
Michael Niedermayer
03148fd174 buildsys: only include log2_tab per library for shared builds 
Fix linking failures with -all_load due to multiple log2_tabs

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2013-03-04 12:25:02 +01:00
Rob Sykes
dc666d360b soxr: libsoxr 0.1.1 support 
Libsoxr 0.1.1 will be out very soon; no changes planned beyond what's currently in git.
It includes a couple of fixes (not affecting FFmpeg's current usage) and a minor API change (but remains ABI compatible).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-01 14:38:02 +01:00
Michael Niedermayer
35aaa306ac swr: make the default of nopts for first_pts actually work 
Fixes Ticket2210

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-25 04:39:26 +01:00
Michael Niedermayer
8b3affda87 swr: support a seperate output sample bits. 
This avoids user apps having to mangle dither scale. for pcm24

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-24 20:31:56 +01:00
Michael Niedermayer
2abbe6d07a swr: add duplicate cutoff for compatibility 
Based on
	commit 50f4337a2f
	Author: Justin Ruggles <justin.ruggles@gmail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-24 20:31:56 +01:00
Michael Niedermayer
21cd905cd4 swr: check channel layouts before using them. 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-13 17:50:24 +01:00
Michael Niedermayer
b5f544a0f9 swr: Dont use floats for S32->S32 when possible 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-04 04:11:46 +01:00
Michael Niedermayer
be989f9236 swr: reorder init code to make rematrix status available earlier 
This also makes some other fields available earlier which may
be usefull one day

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-04 04:05:59 +01:00
Michael Niedermayer
24244cec2f swr-test: Fix clip to 32bit 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-04 04:05:59 +01:00
Michael Niedermayer
b8c55590d5 swr/resample: fix integer overflow, add missing cast 
The effects of this are limited to numeric errors in the output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-04 04:05:59 +01:00
Michael Niedermayer
91debec976 swr/resample: fix filter rounding and cliping for s32 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-04 04:05:59 +01:00
Michael Niedermayer
f9abeecd94 swr/ build_filter: use av_calloc() fix buffer overflow 
Fixes integer & buffer overflow

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-27 05:58:47 +01:00
Michael Niedermayer
167af704ea swr: limit phase_shift to a less insane value. 
This prevents potential crashes and out of memory issues if
the user manually sets such insane values.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-27 05:54:52 +01:00
Michael Niedermayer
00cae86754 swr: support first_pts 
Trolled-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-21 00:52:14 +01:00
Michael Niedermayer
cc4a41727e swr: fix "may be used uninitialized in this function" warnings 
The uninitialized use implicates 0 channels, which is unlikely
to reach this function but fixed anyway in this commit.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-20 17:09:48 +01:00
Michael Niedermayer
55d0528669 swr/dither: fix division by 0 
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-14 02:57:00 +01:00
Michael Niedermayer
d676598f87 swr: fix handling of timestamps that cause multiple drops or silence injections 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-13 18:39:06 +01:00
Michael Niedermayer
a34aee4646 swr: limit buffer size for silence injection 
This reduces memory usage for unreasonable large silence injections

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-13 16:04:41 +01:00
Michael Niedermayer
b481d09bd9 swr: limit buffer size for discarding. 
This prevents insane memory usage in case of insane input values.
Untested due to lack of a testcase that causes such insane allocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-13 16:04:41 +01:00
Michael Niedermayer
db4e0ecaf0 swr: move silence buffer to context to avoid per use malloc/free 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-13 15:28:00 +01:00
Michael Niedermayer
dc6588421e swr: move buffer used to discard sample to context 
This avoids the need to allocate & free to repeatly

Fixes Ticket2122

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-13 15:28:00 +01:00
Michael Niedermayer
c8737d348b swr: work with 4 noise shaping coeffs at a time 
63->38 kcycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 19:17:08 +01:00
Michael Niedermayer
93bc0f0180 swr/noise_shaping_data: pad coeffs to multiple of 4 when they are 1 below 
This allows using code working with 4 at a time

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 19:09:54 +01:00