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
89,395 Commits 37 Branches 400 Tags 465 MiB
release/3.4
Commit Graph

2174 Commits

Author SHA1 Message Date
Clément Bœsch
08e1376d81 fate: add fate-sws-pixdesc-query 
Test the pixel format querying within libswscale.
 2017-03-20 08:02:30 +01:00
Clément Bœsch
8e950c9b42 Merge commit 'aa37d2bf4505afc106e2a23c44afc722bb204a8e' 
* commit 'aa37d2bf4505afc106e2a23c44afc722bb204a8e':
  swscale: Kill non-compiling disabled cruft

The isGray() chunk is not merged as an alternative patch actually fixing
the dead code is currently under review on the mailing-list.

The SWS_X chunk is merged, with an additional cosmetic.

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-19 15:40:03 +01:00
Carl Eugen Hoyos
851f4255e0 lsws/slice: Move a misplaced const. 
Fixes a gcc warning:
libswscale/slice.c:178:56: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
 2017-03-08 00:33:21 +01:00
Carl Eugen Hoyos
a9c20598b5 lsws/input: Do not define unused functions. 
Fixes warnings like the following:
libswscale/input.c:951:13: warning: ‘planar_rgb14be_to_a’ defined but not used
 2017-03-08 00:30:06 +01:00
Philip Langdale
4c2176d45b swscale: add P016 input support 2017-02-01 14:29:11 -08:00
Michael Niedermayer
03ce71e4a1 swscale/swscale: Fix dereference of stride array before null check 
Fixes: CID1396263
Fixes: CID1396271

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-23 21:47:47 +01:00
Diego Biurrun
92db508307 build: Generate pkg-config files from Make and not from configure 
This moves work from the configure to the Make stage where it can
be parallelized and ensures that pkgconfig files are updated when
library versions change.

Bug-Id: 449
 2016-12-22 12:30:54 +01:00
Andreas Cadhalpun
319438e2f2 swscale: save ebx register when it is not available 
Configure checks if the ebx register can be used for asm and it has to
be saved if and only if this is not the case.
Without this the build fails when configuring with --toolchain=hardened
--disable-pic on i386 using gcc 4.8:
error: PIC register clobbered by '%ebx' in 'asm'

In that case gcc 4.8 reserves the ebx register for the GOT needed for
PIE, so it can't be used in asm directly.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-12-21 01:26:10 +01:00
Diego Biurrun
ea7ee4b4e3 ppc: Centralize compiler-specific altivec.h #include handling in one place 
Also move #includes into canonical order where appropriate.
 2016-12-14 14:08:43 +01:00
Paul B Mahol
6427c9ffee swscale: add gbr(a)p16 output support 2016-12-01 21:37:25 +01:00
Michael Niedermayer
ac206bb175 swscale/options: Use AV_OPT_TYPE_PIXEL_FMT 
Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-20 13:00:22 +01:00
Carl Eugen Hoyos
b5177c7051 lsws: Add GRAY10 conversion. 
Based on 19be5fb7 by Luca Barbato.
 2016-11-14 10:35:06 +01:00
Luca Barbato
19be5fb728 swscale: Add GRAY12 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-10 00:49:29 +01:00
Michael Niedermayer
b828788d58 swscale: Add GBRAP10 output 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-10 00:33:12 +01:00
Luca Barbato
2c7d8cbd66 swscale: Add the GBRAP12 output 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-10 00:33:12 +01:00
Michael Niedermayer
873d06c76e swscale/output: Fix alpha shift in yuv2gbrp_full_X_c() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-10 00:33:12 +01:00
Michael Niedermayer
a340cfef82 swscale/input: Fix alpha bswap for set readAlpPlanar 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-10 00:33:12 +01:00
Michael Niedermayer
d736b52a04 swscale: Drop is9_OR_10BPS() use, its name is not correct 
Found-by: Luca Barbato
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-10 00:33:12 +01:00
Luca Barbato
ab839054e6 swscale: Add GRAY12 2016-11-07 22:42:00 +01:00
Diego Biurrun
1263b2039e Adjust printf conversion specifiers to match variable signedness 2016-10-28 11:22:21 +02:00
Michael Niedermayer
1609935b6c Bump minor versions after 3.2 branchpoint to seperate release 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-26 20:52:42 +02:00
Michael Niedermayer
3f3025205f Bump minor versions for 3.2 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-26 20:52:42 +02:00
Michael Niedermayer
be9dba5c8a swscale: Properly load alpha for planar rgb 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2016-10-18 12:58:14 +02:00
Luca Barbato
881477c77b swscale: Add the GBRAP12 output 2016-10-12 21:33:34 +02:00
Kieran Kunhya
81f1f6c3f6 Add GBRAP12 pixel format support 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2016-10-12 21:33:34 +02:00
Luca Barbato
ef3740c3a0 swscale: Enable GBRP12 output 2016-10-12 18:00:24 +02:00
Michael Niedermayer
f59750641a swscale: x86: Add some forgotten 12-bit planar YUV cases 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2016-10-12 17:39:30 +02:00
Michael Niedermayer
328ea6a9a5 swscale: Add input support for 12-bit formats 
Implemented for AV_PIX_FMT_GBRP12.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2016-10-12 17:39:30 +02:00
Vittorio Giovara
eb54210602 swscale: Add missing yuv444p12 swapping 
Missing from 9bd6ea5695.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2016-10-12 10:42:38 +02:00
Luca Barbato
9bd6ea5695 pixfmt: Add yuv444p12 pixel format 2016-09-27 18:48:30 +02:00
Luca Barbato
0aebbbd024 pixfmt: Add yuv422p12 pixel format 2016-09-27 18:48:30 +02:00
Luca Barbato
85406e7a8d pixfmt: Add yuv420p12 pixel format 2016-09-27 18:48:30 +02:00
Luca Barbato
2b5b1e1e9b swscale: Rename is9_OR_10 to match what it does 
It is used to select functions that work with 9-15bits.
 2016-09-27 18:48:30 +02:00
Luca Barbato
e87a501e7d swscale: Update bitdepth range check 
Make sure the scaling functions for the 9-15bits are used for
9-15bits bit depths correctly.
 2016-09-27 17:17:54 +02:00
Vittorio Giovara
de8e096c7e swscale: Consistently order input YUV pixel formats 
Follow a 420, 422, 444 order instead of a random one.
This simplifies double-checking additions of new formats.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2016-09-27 08:33:09 +02:00
Pedro Arthur
8433d953e4 swscale: fix for sliced scaling artifacts 
Signed-off-by: Pedro Arthur <bygrandao@gmail.com>
 2016-09-16 11:25:28 -03:00
Michael Niedermayer
ba7be8c083 swscale: Fix "warning: ISO C90 forbids mixed declarations and code" 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-07 01:44:16 +02:00
Timo Rothenpieler
e3fd1857fb swscale: add unscaled conversion from yuv420p to p010 2016-09-06 12:41:28 +02:00
Michael Niedermayer
b4d7c1f84b swscale/swscale_unscaled: Try to fix bayer_to_yv12_wrapper() with slices 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-03 14:14:06 +02:00
Michael Niedermayer
e57d99dd4e swscale/swscale_unscaled: Try to fix Rgb16ToPlanarRgb16Wrapper() with slices 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-03 14:14:06 +02:00
Timo Rothenpieler
39f75645c8 swscale: add unscaled copy from yuv420p10 to p010 2016-09-03 00:09:39 +02:00
Michael Niedermayer
47bc1bdafb swscale/swscale_unscaled: Fix packed_16bpc_bswap() with slices 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-02 21:53:53 +02:00
Michael Niedermayer
89ec11e096 swscale/swscale: Try to fix rgb48Toxyz12() with slices 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-02 21:53:53 +02:00
Michael Niedermayer
f580719b1a swscale/swscale: Factor bottom to top handling 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-02 21:53:53 +02:00
Michael Niedermayer
7a6c288c2b swscale/tests/swscale: add cpuflags option 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-09-02 16:14:21 +02:00
Timo Rothenpieler
99882d05a6 swscale: add support for P010LE/BE output 2016-08-31 13:19:46 +02:00
Michael Niedermayer
76d377d0a0 swscale/output: Fix rounding offset in yuv2gbrp_full_X_c() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-08-23 02:46:02 +02:00
Diego Biurrun
aa37d2bf45 swscale: Kill non-compiling disabled cruft 2016-08-17 12:16:42 +02:00
Timothy Gu
58c7bf789f doxygen: Standardize root-level modules 2016-08-02 22:15:25 -07:00
Diego Biurrun
facdfe4080 swscale: Add proper ff_ prefix to init functions 
They are internal symbols that should not be exported.

based on a patch by Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2016-07-16 17:38:37 +02:00
Andreas Cadhalpun
c0fd2fb27b swscale: Rename sws_context_class to ff_sws_context_class 
It is an internal swscale symbol and thus should not be exported.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2016-07-16 17:38:37 +02:00
Ronald S. Bultje
70d418c7e6 Revert "PPC64: Add versions of functions in libswscale/input.c optimized for POWER8 VSX SIMD." 
This reverts commit 1df908f33f. The expected
performance improvements are essentially non-existent.
 2016-07-11 10:15:05 -04:00
Hendrik Leppkes
e78e5b735f swscale: add P010 input support 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2016-07-02 09:35:41 +02:00
Dan Parrot
1df908f33f PPC64: Add versions of functions in libswscale/input.c optimized for POWER8 VSX SIMD. 
This patch addresses Trac ticket #5570. The optimized functions are in file
libswscale/ppc/input_vsx.c. Each optimized function name is a concatenation of the
corresponding name in libswscale/input.c with suffix _vsx.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-30 12:02:08 +02:00
Matthieu Bouron
0acc170aad Merge commit '535a742c2695a9e0c586b50d7fa76e318232ff24' 
* commit '535a742c2695a9e0c586b50d7fa76e318232ff24':
  build: Change structure of the linker version script templates

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
 2016-06-27 17:56:47 +02:00
Matthieu Bouron
9eb3da2f99 asm: FF_-prefix internal macros used in inline assembly 
See merge commit '39d6d3618d48625decaff7d9bdbb45b44ef2a805'.
 2016-06-27 17:21:18 +02:00
Hendrik Leppkes
c142dc203e Merge commit 'dc40a70c5755bccfb1a1349639943e1f408bea50' 
* commit 'dc40a70c5755bccfb1a1349639943e1f408bea50':
  Drop unnecessary libavutil/x86/asm.h #includes

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2016-06-26 15:53:00 +02:00
Clément Bœsch
5d48e4eafa Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196' 
* commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196':
  tests: Move all test programs to a subdirectory

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-22 13:44:34 +02:00
Clément Bœsch
8ef57a0d61 Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb' 
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
  cosmetics: Fix spelling mistakes

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-21 21:55:34 +02:00
Clément Bœsch
c01f1157ac Merge commit '0f40c9098498ad90dbbd2380eb4269015e84bde4' 
* commit '0f40c9098498ad90dbbd2380eb4269015e84bde4':
  Drop pointless assert.h #includes

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-21 15:26:20 +02:00
Paul B Mahol
9d30690f20 swscale: add input support for gbrap10 pixel format 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-06-10 17:17:12 +02:00
Pedro Arthur
e616e9a4b8 swscale: fix ring buffer size when scaling slices of a frame 
The ring buffer size should be able to store input lines
when there is not enough lines to output a single line.
 2016-06-10 09:45:24 -03:00
Pedro Arthur
b5deacfb1f swscale: fix crash with swscale-test when using slices 2016-06-10 08:50:57 -03:00
Diego Biurrun
535a742c26 build: Change structure of the linker version script templates 
Split version files into one line per symbol/directive to allow compatibility
with the Solaris linker without preprocessing and eliminate $ from version file
templates to simplify the postprocessing shell command.
 2016-05-29 16:43:11 +02:00
Diego Biurrun
dc40a70c57 Drop unnecessary libavutil/x86/asm.h #includes 2016-05-28 19:18:26 +02:00
Diego Biurrun
1e9c5bf4c1 asm: FF_-prefix internal macros used in inline assembly 
These warnings conflict with system macros on Solaris, producing
truckloads of warnings about macro redefinition.
 2016-05-28 19:18:26 +02:00
Diego Biurrun
a6a750c7ef tests: Move all test programs to a subdirectory 2016-05-13 14:55:56 +02:00
Derek Buitenhuis
ca5ec2bf51 Merge commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec' 
* commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec':
  build: miscellaneous cosmetics

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-09 16:25:28 +01:00
Vittorio Giovara
41ed7ab45f cosmetics: Fix spelling mistakes 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2016-05-04 18:16:21 +02:00
Diego Biurrun
0f40c90984 Drop pointless assert.h #includes 2016-05-03 15:45:10 +02:00
Matthieu Bouron
4c22441276 swscale/arm: add yuv2planeX_8_neon 2016-04-11 18:13:36 +02:00
Clément Bœsch
c921f4f687 sws/aarch64: add ff_yuv2planeX_8_neon 2016-04-11 16:27:19 +02:00
Matthieu Bouron
7abc8e7ae3 swscale/arm: add ff_hscale_8_to_15_neon 2016-04-09 00:16:56 +02:00
Clément Bœsch
cab9661dba sws/aarch64/yuv2rgb: honor iOS calling convention 
y_offset and y_coeff being successive 32-bit integers, they are packed
into 8 bytes instead of 2x8 bytes.

See https://developer.apple.com/library/ios/documentation/Xcode/Conceptual/iPhoneOSABIReference/Articles/ARM64FunctionCallingConventions.html

> iOS diverges from Procedure Call Standard for the ARM 64-bit
> Architecture in several ways
[...]
> In the generic procedure call standard, all function arguments passed
> on the stack consume slots in multiples of 8 bytes. In iOS, this
> requirement is dropped, and values consume only the space required.
[...]
> Padding is still inserted on the stack to satisfy arguments’ alignment
> requirements.
 2016-04-08 17:58:43 +02:00
Diego Biurrun
01621202aa build: miscellaneous cosmetics 
Restore alphabetical order in lists, break overly long lines, do some
prettyprinting, add some explanatory section comments, group parts
together that belong together logically.
 2016-04-07 15:26:08 +02:00
Michael Niedermayer
c169062073 swscale/utils: Remove unused variable 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-07 13:41:23 +02:00
Clément Bœsch
040598218f sws/aarch64: restore ff_hscale_8_to_15_neon() 
Fix final scaling and required filter alignment. Pass FATE.
 2016-04-05 12:00:36 +02:00
Ronald S. Bultje
b3eda69490 swscale: add bt2020 yuv2rgb coefficients. 2016-04-01 15:39:48 -04:00
Ronald S. Bultje
98038e2ee0 swscale: fix bt709 yuv2rgb coefficients. 
They were derived from incorrect values cr=0.2125 (should be cr=0.2126)
and cb=0.0721 (should be cb=0.0722).
 2016-04-01 15:39:47 -04:00
Clément Bœsch
eadaef2a63 sws/aarch64: disable ff_hscale_8_to_15_neon temporarly 
Looks broken.
 2016-04-01 17:33:01 +02:00
Matthieu Bouron
58994d7bca swscale/arm/yuv2rgb: make the code bitexact with its aarch64 counter part 2016-04-01 17:23:45 +02:00
Matthieu Bouron
5629361cc2 swscale/arm/yuv2rgb: save a few instructions by processing the luma line interleaved 2016-04-01 17:23:45 +02:00
Matthieu Bouron
339668301e swscale/arm/yuv2rgb: re-order compute_rgba macro arguments 2016-04-01 17:23:45 +02:00
Matthieu Bouron
ff4885face swscale/arm/yuv2rgb: rename {process_1l,process_2l,compute}_16px{,_internal} macros 2016-04-01 17:23:45 +02:00
Matthieu Bouron
562653b731 swscale/arm/yuv2rgb: macro-ify 2016-04-01 17:23:45 +02:00
Matthieu Bouron
0286b56f2f swscale/arm/yuv2rgb: factorize lsl in load_args_nvx 2016-04-01 17:23:45 +02:00
Matthieu Bouron
0649fe0fae swscale/arm/yuv2rgb: factorize lsl in load_args_yuv420p 2016-04-01 17:23:45 +02:00
Matthieu Bouron
2aec59c07c swscale/arm/yuv2rgb: remove unused store of dst + linesize in load_args_yuv422p 2016-04-01 17:23:45 +02:00
Matthieu Bouron
b3ea901945 swscale/arm/yuv2rgb: factorize lsl in load_args_yuv422p 2016-04-01 17:23:45 +02:00
Matthieu Bouron
466e209e6e swscale/arm/yuv2rgb: fix comments in load_args_yuv422p 2016-04-01 17:23:45 +02:00
Matthieu Bouron
11b4acab8b swscale/arm/yuv2rgb: remove 32bit code path 2016-04-01 17:23:45 +02:00
Pedro Arthur
6de58b4903 swscale: cleanup unused code 
Removed previous swscale code under '#ifndef NEW_FILTER'
and removed unused fields of SwsContext
 2016-03-31 16:36:16 -03:00
Michael Niedermayer
3b905b9fe6 swscale: Deprecate vector functions which are unused outside swscale 
There are no known users of these functions within debian
It should be thus possible to remove these functions without recommandition of a
replacement

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-03-31 20:21:14 +02:00
Clément Bœsch
263eb76bdf sws/aarch64: add ff_hscale_8_to_15_neon 
./ffmpeg -nostats -f lavfi -i testsrc2=4k:d=2 -vf bench=start,scale=1024x1024,bench=stop -f null -

    before: t:0.489726 avg:0.489883 max:0.491852 min:0.489482
    after:  t:0.256515 avg:0.256458 max:0.256999 min:0.253755
 2016-03-31 10:12:55 +02:00
Lou Logan
06eef96b69 fix some a/an typos 
Signed-off-by: Lou Logan <lou@lrcd.com>
 2016-03-28 14:13:17 -08:00
Clément Bœsch
277408b7f1 sws/aarch64/yuv2rgb: save a few mul and add 
27ms to 26ms with UHD 2160 input.
 2016-03-25 16:14:13 +01:00
Clément Bœsch
f1148390d7 sws/aarch64: add {nv12,nv21,yuv420p,yuv422p}_to_{argb,rgba,abgr,rgba}_neon 2016-03-01 17:53:33 +01:00
Clément Bœsch
1e7a37f0a0 sws/yuv2rgb: clarify precision of coeff and offset for mmx code 
It makes easier looking at the difference with the generic code just
below.
 2016-02-27 11:13:26 +01:00
Clément Bœsch
f9987464cf sws/yuv2rgb: avoid a few ub on signed left shifts 2016-02-27 11:13:26 +01:00
Derek Buitenhuis
1a12eb4a73 Merge commit '29c2d06d67724e994980045afa055c6c34611b30' 
* commit '29c2d06d67724e994980045afa055c6c34611b30':
  cosmetics: Drop empty comment lines

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 17:31:44 +00:00