Michael Niedermayer
fc332f3e29
Bump minor versions for staring release/3.3 branch
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-31 13:21:06 +02:00
Clément Bœsch
82ad9cbd32
Merge commit ' 17dac56b8f'
...
* commit '17dac56b8f ':
lavu: Rename ycgco color space appropriately
Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-31 09:46:51 +02:00
Michael Niedermayer
afebf470ca
avutil/tests/dict: Check return of av_dict_parse_string()
...
Fixes: CID1396402
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 23:35:18 +02:00
Mark Thompson
e3f9c5826a
Merge commit ' e8bbacbf52'
...
* commit 'e8bbacbf52 ':
hwcontext_qsv: support frame mapping
Merged-by: Mark Thompson <sw@jkqxz.net>
2017-03-30 21:54:46 +01:00
Mark Thompson
546524056d
Merge commit ' 8ea15afbf2'
...
* commit '8ea15afbf2 ':
hwcontext_qsv: transfer data through the child context when VPP fails
Merged-by: Mark Thompson <sw@jkqxz.net>
2017-03-30 21:18:23 +01:00
Mark Thompson
7cb082ac2f
Merge commit ' b91ce48600'
...
* commit 'b91ce48600 ':
hwcontext_qsv: do not fail when download/upload VPP session creation fails
Merged-by: Mark Thompson <sw@jkqxz.net>
2017-03-30 21:16:58 +01:00
Mark Thompson
59b1942aae
Merge commit ' b115a35ea6'
...
* commit 'b115a35ea6 ':
hwcontext_qsv: add support for the P8 format
Merged-by: Mark Thompson <sw@jkqxz.net>
2017-03-30 21:16:09 +01:00
Hendrik Leppkes
14764b93e2
Merge commit ' 10065d9324'
...
* commit '10065d9324 ':
hwcontext_dxva2: add support for the P8 format
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2017-03-30 11:37:39 +02:00
Hendrik Leppkes
9ca5d2de5d
Merge commit ' 9109737654'
...
* commit '9109737654 ':
hwcontext_dxva2: frame mapping support
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2017-03-30 11:33:51 +02:00
Clément Bœsch
71c22fb7ae
Merge commit ' 8ad9f9d675'
...
* commit '8ad9f9d675 ':
hwcontext_vaapi: Frame mapping support
Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 10:55:32 +02:00
Clément Bœsch
4cda23f1f1
Merge commit ' d06aa24ba5'
...
* commit 'd06aa24ba5 ':
hwcontext: Hardware frame mapping
Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 10:36:37 +02:00
Clément Bœsch
03f5e80bdb
Merge commit ' 67351924fa'
...
* commit '67351924fa ':
Drop unreachable break and return statements
Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 10:26:29 +02:00
Clément Bœsch
f291a9a1ad
Merge commit ' 99434f4df8'
...
* commit '99434f4df8 ':
float_dsp: Have implementation match function pointer prototype
Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 10:23:25 +02:00
Clément Bœsch
549045254c
Fix all -Wformat warnings raised by DJGPP
2017-03-29 14:49:29 +02:00
Clément Bœsch
1473afac5d
lavu/mem: clamp alignment to 16 for DJGPP
...
See also https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80208
2017-03-29 14:49:29 +02:00
Clément Bœsch
bfdcdd6d82
lavu: add av_fourcc_make_string() and av_fourcc2str()
2017-03-29 14:49:29 +02:00
Clément Bœsch
2a69724fd5
Merge commit ' 0456e68439'
...
* commit '0456e68439 ':
audio_fifo: Drop write-only variable
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24 13:17:55 +01:00
Clément Bœsch
0b3decc596
Merge commit ' 0d9b9bd37f'
...
* commit '0d9b9bd37f ':
lavu: Add JEDEC P22 color primaries
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-24 11:21:46 +01:00
Clément Bœsch
a44ab512e6
lavu/pixfmt: fix redundant comment
...
Mistake introduced in a1f6b1d9d8 .
2017-03-24 11:17:51 +01:00
James Almer
c97e986e90
Merge commit ' 7911186ed6'
...
* commit '7911186ed6 ':
emms: Give apriv_emms_yasm() a more general name
Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:28:56 -03:00
James Almer
29db87af52
Merge commit ' 6be7944ee2'
...
* commit '6be7944ee2 ':
x86: Add missing colons after assembly labels
Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:05:27 -03:00
Clément Bœsch
a1f6b1d9d8
Merge commit ' 310c55f179'
...
* commit '310c55f179 ':
pixfmt: Document alternative names for smpte 431 and 432
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23 11:22:32 +01:00
Clément Bœsch
443e969293
Merge commit ' 27079a426c'
...
* commit '27079a426c ':
buffer: convert to stdatomic
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-22 17:46:01 +01:00
Clément Bœsch
67d8eabdbb
lavu/buffer: drop USE_ATOMICS
...
USE_ATOMICS is only set if there is no thread implementation enabled, in
which case you can't expect any lock mechanism from FFmpeg.
This is also conflicting with the incoming use of stdatomic.
2017-03-22 17:40:03 +01:00
Jun Zhao
9365dfcbf6
hwcontext: fix comments for av_hwdevice_ctx_alloc()
...
fix the wrong comments for av_hwdevice_ctx_alloc()
Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Signed-off-by: Mark Thompson <sw@jkqxz.net>
2017-03-22 00:58:42 +00:00
James Almer
d8962ffbd8
avutil/x86util: don't use movss in VBROADCASTSS macro when src and dst args are the same
...
Reviewed-by: Henrik Gramner <henrik@gramner.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-21 19:15:00 -03:00
Clément Bœsch
3898e346b3
Merge commit ' 07e1f99a1b'
...
* commit '07e1f99a1b ':
x86util: Document SBUTTERFLY macro
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 18:38:07 +01:00
Clément Bœsch
2feef75cb5
Merge commit ' 09a145b3c8'
...
* commit '09a145b3c8 ':
hwcontext_vdpau: Remove duplicate definition of GET_CALLBACK
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 16:05:51 +01:00
Clément Bœsch
3835283293
Merge commit ' 4fb311c804'
...
* commit '4fb311c804 ':
Drop memalign hack
Merged, as this may indeed be uneeded since
46e3936fb0 .
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 08:54:44 +01:00
Clément Bœsch
a5cf6628d6
Merge commit ' f01f7a7846'
...
* commit 'f01f7a7846 ':
hwcontext_dxva2: use the special UC copy for downloading frames
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 08:37:40 +01:00
Clément Bœsch
8200b16a9c
Merge commit ' d7bc52bf45'
...
* commit 'd7bc52bf45 ':
imgutils: add a function for copying image data from GPU mapped memory
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 08:34:10 +01:00
Clément Bœsch
9c2436e1e7
lavu: add AV_PIX_FMT_FLAG_BAYER
2017-03-20 08:02:30 +01:00
Clément Bœsch
ea8efc9594
lavu/mathematics: split closing bracket out of ifdefery
2017-03-18 23:50:05 +01:00
Clément Bœsch
1e1513d01a
lavu/mathematics: document so-called "cruft"
2017-03-18 23:50:03 +01:00
Clément Bœsch
53587ca482
Merge commit ' ec021d4844'
...
* commit 'ec021d4844 ':
buffer: fix av_buffer_pool_init2() documentation
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 19:22:30 +01:00
Vittorio Giovara
f20bcec4c2
spherical: Change types of bounding and pad to uint32_t
...
These values are defined to be 32bit in the specification,
so it makes more sense to store them as fixed width.
Based on a patch by Micahel Niedermayer <michael@niedermayer.cc>.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2017-03-17 13:12:25 -04:00
Carl Eugen Hoyos
1cd58e9154
lavu/spherical: Make AVSphericalMapping pointer parameter const.
...
Reflects the actual code and silences a gcc warning:
ffprobe.c:1797:42: warning: passing argument 1 of 'av_spherical_tile_bounds' discards 'const' qualifier from pointer target type
2017-03-16 22:18:12 +01:00
Clément Bœsch
5e4a572699
Merge commit ' 24a362569b'
...
* commit '24a362569b ':
buffer: fix av_buffer_realloc() when the data is offset wrt buffer start
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-16 21:42:45 +01:00
James Almer
30fe4b8d4c
Merge commit ' f79d847400'
...
* commit 'f79d847400 ':
intreadwrite: Use the __unaligned keyword on MSVC for ARM and x86_64
Merged-by: James Almer <jamrial@gmail.com>
2017-03-15 21:20:44 -03:00
James Almer
916dff9cb1
Merge commit ' 230b1c070b'
...
* commit '230b1c070b ':
intreadwrite: Add intermediate variables in the byteswise AV_W*() macros
Mostly a noop. Merged for cosmetic purposes.
See d83ff76ca0
Merged-by: James Almer <jamrial@gmail.com>
2017-03-15 21:17:37 -03:00
Martin Storsjö
dda45c087b
aarch64: Add parentheses around the offset parameter in movrel
...
This fixes building with clang for linux with PIC enabled.
This is cherrypicked from libav commit
8847eeaa14 .
Signed-off-by: Martin Storsjö <martin@martin.st>
2017-03-11 13:14:50 +02:00
Michael Niedermayer
1d0bad421c
avutil/tests/lfg: Remove debugging start/stop timer
...
Fixes code with qemu ARM
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-08 14:32:00 +01:00
Thomas Turner
a50ccbd240
avutil/tests/lfg.c: added proper normality test
...
The Chen-Shapiro(CS) test was used to test normality for
Lagged Fibonacci PRNG.
Normality Hypothesis Test:
The null hypothesis formally tests if the population
the sample represents is normally-distributed. For
CS, when the normality hypothesis is True, the
distribution of QH will have a mean close to 1.
Information on CS can be found here:
http://www.stata-journal.com/sjpdf.html?articlenum=st0264
http://www.originlab.com/doc/Origin-Help/NormalityTest-Algorithm
Signed-off-by: Thomas Turner <thomastdt@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-08 14:32:00 +01:00
James Almer
dbc932e745
Revert "lavu/atomic: add support for the new memory model aware gcc built-ins"
...
This reverts commit faa9d29829 .
This change became superfluous when support for C11 atomics was introduced.
Reverting it will make the removal of this implementation in an upcoming
merge conflict free.
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-08 00:48:37 -03:00
Vittorio Giovara
1b7ffddb3a
spherical: Add tiled equirectangular type and projection-specific properties
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2017-03-07 11:19:37 -05:00
James Almer
a43389547c
avutil/md5: stop discarding the const qualifier for the src pointer
...
The code modifying the buffer on big endian systems was removed.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-03 13:37:11 -03:00
James Almer
e2b7ae4b19
avutil/md5: fix misaligned reads
...
This makes ubsan happy and also considerably increases performance on
big endian systems.
Tested on an IBM POWER7 3.55 GHz
Before:
2.24user 0.14system 0:02.39elapsed 99%CPU (0avgtext+0avgdata 2624maxresident)k
2.26user 0.11system 0:02.38elapsed 99%CPU (0avgtext+0avgdata 2688maxresident)k
2.23user 0.15system 0:02.38elapsed 99%CPU (0avgtext+0avgdata 2624maxresident)k
2.25user 0.12system 0:02.38elapsed 100%CPU (0avgtext+0avgdata 2624maxresident)k
2.20user 0.15system 0:02.36elapsed 99%CPU (0avgtext+0avgdata 2624maxresident)k
After:
1.86user 0.13system 0:02.00elapsed 99%CPU (0avgtext+0avgdata 2624maxresident)k
1.89user 0.11system 0:02.01elapsed 99%CPU (0avgtext+0avgdata 2624maxresident)k
1.85user 0.14system 0:02.00elapsed 99%CPU (0avgtext+0avgdata 2624maxresident)k
1.84user 0.15system 0:01.99elapsed 99%CPU (0avgtext+0avgdata 2624maxresident)k
1.89user 0.13system 0:02.02elapsed 99%CPU (0avgtext+0avgdata 2688maxresident)k
Tested-by: Nicolas George <george@nsup.org>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-03 13:36:49 -03:00
Michael Niedermayer
55196e5d10
Revert "avutil/frame: Disallow zero sized frame side data"
...
Found a case where we use size==0, the other related commits
remain needed, and should be sufficient to fix the original issue
This reverts commit 7e4f32f4e4 .
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-03 01:03:29 +01:00
Mark Thompson
2b8151c806
hwcontext_vaapi: Don't abort on failing to allocate from a fixed-size pool
...
Cherry-picked from Libav d30719e62d .
Signed-off-by: wm4 <nfxjfg@googlemail.com>
2017-03-02 11:20:47 +01:00
wm4
554bc4eea8
avcodec, avutil, avformat: remove AVOption requirement for some fields
...
Allow all struct fields to be accessed directly, as long as they're
public.
Before this change, many fields were "public", but could be accessed via
AVOption only. This meant they were effectively not public, but were
present for documentation purposes, which was incredibly confusing at
best.
2017-03-02 10:32:12 +01:00