virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
71,054 Commits 37 Branches 400 Tags 465 MiB
f3ec2a0859
Commit Graph

492 Commits

Author SHA1 Message Date
Michael Niedermayer
3e9ccd0019 swresample/swresample: Fix integer overflow in seed calculation 
Fixes CID1322333

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 32f53958b8)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-11-19 03:51:38 +01:00
Michael Niedermayer
f2e3d5adb3 swr: Remember previously set int_sample_format from user 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d4325b2fea)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-20 04:43:40 +02:00
Michael Niedermayer
ed5bfeca04 swresample/swresample: Cleanup on init failure. 
This avoids leaks if the user doest call swr_close() after a failed init

Found-by: James Almer <jamrial@gmail.com>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c3f87f7545)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-20 04:43:39 +02:00
Ganesh Ajjanagadde
9d749d69b2 swresample/dither: check memory allocation 
check memory allocation in swri_get_dither()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 196b885a5f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-20 04:43:39 +02:00
Michael Niedermayer
9591f2fe94 swresample: Check the return value of resampler->init() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 02915602d9)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-07-20 04:43:39 +02:00
Rainer Hochecker
531ea97b89 swr: fix alignment issue caused by 8ch sse functions 
Fix crash when doing 8 ch conversion from apps compiled with MSVS
Thanks to Ronald for giving this hint:
https://ffmpeg.org/pipermail/ffmpeg-devel/2015-May/173049.html

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit adb7372f74)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-15 10:04:51 +02:00
Michael Niedermayer
3f9ecaf886 swresample/swresample-test: Randomly wipe out channel counts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ff50b1b13b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-15 10:04:50 +02:00
Michael Niedermayer
50dc37f281 swresample: Check channel layouts and channels against each other and print human readable error messages 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3c77bb5f23)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-15 10:04:50 +02:00
Michael Niedermayer
6c39528a3a swresample: Allow reinitialization without ever setting channel layouts 
(cherry picked from commit 80a28c7509)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-15 10:04:50 +02:00
Michael Niedermayer
9b0c9261cc swresample: Allow reinitialization without ever setting channel counts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d7b9cb2f7a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-05-15 10:04:50 +02:00
Michael Niedermayer
4d00860ac7 swresample: Add prefix to soxr_resampler 
also move declaration to header

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-27 19:20:43 +01:00
Michael Niedermayer
c0e3b46118 swresample: add av_cold to init functions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-21 00:33:09 +01:00
Michael Niedermayer
0cb95f9082 swresample/resample_template: Add () to protect the arguments of the OUT() macro 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 00:36:35 +01:00
Michael Niedermayer
37013fd018 swresample/swresample-test: Add () to protect uint_rand() argument 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-16 23:09:09 +01:00
James Almer
f7ed997a6d x86/swr: make pack_8ch functions work with compilers without aligned stack 
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-02-15 13:57:37 -03:00
Michael Niedermayer
b74ecb82fa swresample/x86/rematrix_init: Check av_malloc* return codes, forward errors 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-09 10:15:56 +01:00
Michael Niedermayer
48ffaaaaef swresample/x86/rematrix_init: Use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-09 10:15:56 +01:00
Michael Niedermayer
9d7ae72725 swresample: Use int instead of enum for fields which are accessed through AVOptions as int 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-02 23:27:26 +01:00
Michael Niedermayer
c77cc2c176 swresample/dither: Cleanup number suffixes 
The <<31 case needs LL

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-01 20:00:10 +01:00
Reimar Döffinger
6efd0ba977 swresample_internal.h: Move struct declaration before first use. 
It seems more logical and works with more restricted C compilers
like tinycc.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2015-01-27 21:29:51 +01:00
James Almer
59ac93f6af x86/swr: add SSE/AVX unpack_6ch functions 
int32/float only

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-01-12 15:40:03 -03:00
James Almer
6abf00d615 x86/swr: load constants outside the loop in pack_6ch functions 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-01-11 01:11:46 -03:00
James Almer
975ff6a3c6 x86/swr: disable pack_8ch functions on msvc/icl x86_32 
Until a proper fix is committed.

Signed-off-by: James Almer <jamrial@gmail.com>
 2014-12-31 16:38:33 -03:00
James Almer
5f14f9e984 x86/swr: add missing alignment check to pack_6ch functions 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-12-31 13:35:11 -03:00
James Almer
37b35feb64 x86/swr: add SSE2/AVX pack_8ch functions 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-12-30 23:05:27 -03:00
Michael Niedermayer
649c158e8c Add FFMPEG_VERSION into the binary libs 
This simplifies identifying from which revision a binary of a lib came from

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 19:32:40 +01:00
Rob Sykes
4b6f225374 swresample/soxr_resample: fix error handling 
Fixes CID1257659

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-13 21:12:56 +01:00
James Almer
edff061fb0 x86/swr: add ff_float_to_int32_a_avx2 
13797 decicycles in ff_float_to_int32_a_sse2, 32768 runs, 0 skips
8603 decicycles in ff_float_to_int32_a_avx2, 32766 runs, 2 skips

Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-11-07 15:01:35 -03:00
James Almer
b385c4c6a3 x86/swr: replace sse4 instructions in pack_6ch with sse ones 
There's no benefit from using blendps here except on CPUs with AVX, where
it's faster than shufps according to Intel's documentation.
As such, rename the sse4 functions to sse/sse2 and use shufps instead.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-11-06 20:54:00 -03:00
Michael Niedermayer
e4f8a973aa swresample: Fix swr_drop_output so it does not flush the buffers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-04 17:17:23 +01:00
Michael Niedermayer
f6bb2cd1b0 swresample/resample: fix invert_initial_buffer() after flush 
Fixes: asan_heap-uaf_2071250_7_139.ogg
Fixes: assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-16 22:35:27 +02:00
Michael Niedermayer
080c846f59 swresample: do not put multiple statements in one line 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-16 18:18:40 +02:00
Michael Niedermayer
344f8d307a swresample/audioconvert: Fix undefined behavior (left shift of negative value) 
Fixes: asan_heap-oob_4da4f3_8_asan_heap-oob_4da4f3_419_scene1a.mm

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-08 05:35:06 +02:00
Michael Niedermayer
6b347f519d swresample/swresample: replace always true if() by av_assert0() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-06 01:29:15 +02:00
Michael Niedermayer
f9fefa499f swresample/swresample: fix sample drop loop end condition 
Fixes Ticket3985

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-06 01:29:06 +02:00
Reimar Döffinger
2c5c37ade1 libswresample: move condition to start of loop. 
This avoids several issue like calculating sum/maxcoef
incorrectly due to adding up matrix entries that will
be overwritten, as well as out-of-range writes to
s->matrix if the maximum allowed number of channels is used.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-09-07 11:31:34 +02:00
Reimar Döffinger
284123d7fd Remove pointless if. 
A branch to avoid some calculation seems unlikely to have any benefits.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-09-07 11:31:33 +02:00
Reimar Döffinger
2231d5b671 libswresample: Avoid needlessly large on-stack array. 
We only actually need to use a tiny part of it.
Unfortunately we seem to have no real test coverage on
the code, so this is a bit risky.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-09-07 11:31:33 +02:00
Michael Niedermayer
7c51f5bd39 swr: aarch64 audio_convert and neon clobber test 
Ported from avresample
Code by:  Mans Rullgard, Janne Grunau, Martin Storsjo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-27 20:06:37 +02:00
Michael Niedermayer
b7d5e016a3 swresample: Add AVFrame based API 
Based on commit fb1ddcdc8f by Luca Barbato <lu_zero@gentoo.org>
Adapted for libswresample by Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-16 20:39:37 +02:00
Michael Niedermayer
f4e814f787 swresample: check av_opt_set for failure in swr_alloc_set_opts() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-11 01:34:34 +02:00
Luca Barbato
c4ac48c5a1 swresample: document the need to configure the context using AVOptions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-11 00:35:56 +02:00
Michael Niedermayer
97f8c7a03e bump libpostproc and libswresample 
this is needed / avoids some headaches  as one of their dependancies
(libavutil) was bumped

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 01:17:02 +02:00
Michael Niedermayer
74be0f82a7 swresample-test: make it independant of the internal SWR_CH_MAX 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 01:15:43 +02:00
Michael Niedermayer
05ff1a2c05 swresample/swresample: Treat mono as planar 
This might in some cases improve performance.

Idea from: fbc0b86599
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-04 03:05:05 +02:00
Andreas Cadhalpun
39a6e02fd4 fix spelling errors 
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 22:33:27 +02:00
Michael Niedermayer
52fafaf474 swresample/libswresample.v: hide ff_* 
Found-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 18:40:17 +02:00
Timothy Gu
5b58692ed4 swresample: misc. doxy improvements 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 01:36:56 +02:00
Timothy Gu
064945b3aa swresample: organize functions into doxy groups 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 22:07:15 +02:00
Timothy Gu
81f47e272d swresample: better doxy for configuration-returning functions 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 22:06:51 +02:00