84297 Commits

Author SHA1 Message Date
Anton Khirnov
7492626932 pthread_frame: use atomics for PerThreadContext.state
Merges Libav commit 64a31b28.

Signed-off-by: wm4 <nfxjfg@googlemail.com>
2017-03-21 06:16:49 +01:00
wm4
87c082c426 ffmpeg: don't unnecessarily use a deprecated API function
Since we've disabled side data merging in ffmpeg.c, this really changes
nothing.
2017-03-21 06:16:49 +01:00
wm4
d682ae70b4 avcodec, avformat: deprecate anything related to side data merging
This patch deprecates anything that has to do with merging/splitting
side data. Automatic side data merging (and splitting), as well as all
API symbols involved in it, are removed completely.

Two FF_API_ defines are dedicated to deprecating API symbols related to
this: FF_API_MERGE_SD_API removes av_packet_split/merge_side_data in
libavcodec, and FF_API_LAVF_KEEPSIDE_FLAG deprecates
AVFMT_FLAG_KEEP_SIDE_DATA in libavformat.

Since it was claimed that changing the default from merging side data to
not doing it is an ABI change, there are two additional FF_API_ defines,
which stop using the side data merging/splitting by default (and remove
any code in avformat/avcodec doing this): FF_API_MERGE_SD in libavcodec,
and FF_API_LAVF_MERGE_SD in libavformat.

It is very much intended that FF_API_MERGE_SD and FF_API_LAVF_MERGE_SD
are quickly defined to 0 in the next ABI bump, while the API symbols are
retained for a longer time for the sake of compatibility.
AVFMT_FLAG_KEEP_SIDE_DATA will (very much intentionally) do nothing for
most of the time it will still be defined. Keep in mind that no code
exists that actually tries to unset this flag for any reason, nor does
such code need to exist. Code setting this flag explicitly will work as
before. Thus it's ok for AVFMT_FLAG_KEEP_SIDE_DATA to do nothing once
side data merging has been removed from libavformat.

In order to avoid that anyone in the future does this incorrectly, here
is a small guide how to update the internal code on bumps:

- next ABI bump (probably soon):
  - define FF_API_LAVF_MERGE_SD to 0, and remove all code covered by it
  - define FF_API_MERGE_SD to 0, and remove all code covered by it
- next API bump (typically two years in the future or so):
  - define FF_API_LAVF_KEEPSIDE_FLAG to 0, and remove all code covered
    by it
  - define FF_API_MERGE_SD_API to 0, and remove all code covered by it

This forces anyone who actually wants packet side data to temporarily
use deprecated API to get it all. If you ask me, this is batshit fucked
up crazy, but it's how we roll. Making AVFMT_FLAG_KEEP_SIDE_DATA to be
set by default was rejected as an ABI change, so I'm going all the way
to get rid of this once and for all.

Reviewed-by: James Almer <jamrial@gmail.com>
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-21 06:13:45 +01:00
Gerion Entrup
5e3a418b60 add signature filter for MPEG7 video signature
This filter does not implement all features of MPEG7. Missing features:
- compression of signature files
- work only on (cropped) parts of the video

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-21 00:11:08 +01:00
Clément Bœsch
b7cc4eb303 lavc/nvenc: misc cosmetics to reduce diff with Libav 2017-03-20 23:04:28 +01:00
Clément Bœsch
e849296d0a Merge commit '70de2ea4261f860457a04e3d0c58c5543f403325'
* commit '70de2ea4261f860457a04e3d0c58c5543f403325':
  nvenc: Extended rate-control support as provided by SDK 7

This commit is a noop, see facc19ef06a753515a3fa604269dd1aa412dc08f

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 22:57:28 +01:00
Clément Bœsch
99d081e638 Merge commit '358c887a9fa0fb2e7ce089eaea71ab924a3e47a7'
* commit '358c887a9fa0fb2e7ce089eaea71ab924a3e47a7':
  nvenc: Add support for high bitdepth

This commit is a noop, see d1bf8a3aa878003f5019bb97c3228f8027e5d116

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 22:56:01 +01:00
Clément Bœsch
a5dea2b773 Merge commit 'e02e2515b24bfc37ede6ca1744696230be55e50b'
* commit 'e02e2515b24bfc37ede6ca1744696230be55e50b':
  nvenc: Add some easier to understand presets that match x264 terminology

This commit is a noop, see a81b000a392e5c7119d2eddb3f4c90ab9f1e0554 and
faffff88c21c24765e5a3c87ffc657b191c4efc0.

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 22:42:25 +01:00
Clément Bœsch
e3ee67c85e Merge commit '352741b5ead1543d775ccf6040f33023e4491186'
* commit '352741b5ead1543d775ccf6040f33023e4491186':
  nvenc: Make sure that enum and array index match

This commit is a noop, see a81b000a392e5c7119d2eddb3f4c90ab9f1e0554

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 22:38:14 +01:00
Clément Bœsch
83cd80d10a Merge commit '12004a9a7f20e44f4da2ee6c372d5e1794c8d6c5'
* commit '12004a9a7f20e44f4da2ee6c372d5e1794c8d6c5':
  audiodsp/x86: yasmify vector_clipf_sse
  audiodsp: reorder arguments for vector_clipf

Merged the version from Libav after a discussion with James Almer on
IRC:

19:22 <ubitux> jamrial: opinion on 12004a9a7f20e44f4da2ee6c372d5e1794c8d6c5?
19:23 <ubitux> it was apparently yasmified differently
19:23 <ubitux> (it depends on the previous commit arg shuffle)
19:24 <ubitux> i don't see the magic movsxdifnidn in your port btw
19:24 <ubitux> it's a port from 1d36defe94c7d7ebf995d4dbb4f878d06272f9c6
19:25 <jamrial> seems better thanks to said arg shuffle
19:25 <jamrial> the loop is the same, but init is simpler
19:25 <jamrial> probably worth merging
19:25 <ubitux> OK
19:25 <ubitux> thanks
19:26 <jamrial> curious they didn't make len ptrdiff_t after the previous bunch of commits, heh
19:26 <ubitux> yeah indeed

Both commits are merged at the same time to prevent a conflict with our
existing yasmified ff_vector_clipf_sse.

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 22:35:07 +01:00
Clément Bœsch
bbc3bde14f configure: fix crystalhd detection
Regression since 4563a86f011b54977b390c72ec3901cace35f8da.

See 20c4fb2e010fff7e3f8acd36ad132c0140fec5fb for more information.

Tested-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-20 19:46:19 +01:00
Clément Bœsch
90f6433dcf Merge commit 'bf58545aace7d14522ce4fa680c7b3ff62109a3a'
* commit 'bf58545aace7d14522ce4fa680c7b3ff62109a3a':
  audiodsp: fix vector_clipf documentation

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 19:11:44 +01:00
Clément Bœsch
8414755486 Merge commit 'e9ef6171396dc4106526aaa86b620c61ca3d1017'
* commit 'e9ef6171396dc4106526aaa86b620c61ca3d1017':
  checkasm: add tests for audiodsp

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 19:10:56 +01:00
Clément Bœsch
c50b2164a6 Merge commit '2eb97af66af90ca3978229da151f0b8b3a5d9370'
* commit '2eb97af66af90ca3978229da151f0b8b3a5d9370':
  checkasm: add a test for blockdsp

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 19:05:05 +01:00
Clément Bœsch
b78243c504 lavc/arm: fix indent in blockdsp_init_neon 2017-03-20 19:01:25 +01:00
Clément Bœsch
9010676ea3 Merge commit 'eea9857bfd6925d0c34382c00b971ee6df12ad44'
* commit 'eea9857bfd6925d0c34382c00b971ee6df12ad44':
  blockdsp: drop the high_bit_depth parameter

This commit is a noop, see 562ba4a827ceb9ed5b7d056484a9c2312a5458c5

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 18:59:40 +01:00
Clément Bœsch
87007ebc16 Merge commit '340f12f71207513672b5165d810cb6c8622c6b21'
* commit '340f12f71207513672b5165d810cb6c8622c6b21':
  hwcontext_cuda: Add P010 and YUV444P16 pixel format

This commit is a noop, we already have P010 and P016.

18:52 <@BtbN> Adding AV_PIX_FMT_YUV444P16 won't hurt, but doesn't gain anything.
18:53 <@BtbN> I'd say just noop it. If we'll ever need it, it will be added in turn.

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 18:54:33 +01:00
Clément Bœsch
43a4c729d4 Merge commit '75d98e30afab61542faab3c0f11880834653bd6b'
* commit '75d98e30afab61542faab3c0f11880834653bd6b':
  audiodsp/x86: clear the high bits of the order parameter on 64bit

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 18:44:00 +01:00
Clément Bœsch
072fad7cf5 Merge commit '1d6c76e11febb58738c9647c47079d02b5e10094'
* commit '1d6c76e11febb58738c9647c47079d02b5e10094':
  audiodsp/x86: fix ff_vector_clip_int32_sse2

No functionnal changes, only cosmetics. This issue was fixed in
9a9e2f1c8aa4539a261625145e5c1f46a8106ac2.

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 18:42:37 +01:00
Clément Bœsch
3898e346b3 Merge commit '07e1f99a1bb41d1a615676140eefc85cf69fa793'
* commit '07e1f99a1bb41d1a615676140eefc85cf69fa793':
  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
37cf0d0bbf Merge commit 'de64dd13cbd47fd54334b6aa2a2cd3c7c36daae2'
* commit 'de64dd13cbd47fd54334b6aa2a2cd3c7c36daae2':
  avcodec: Add the extended pixel format profile for HEVC

This commit is a noop, see 5a41999d81459297183c4e27618e38f8ba719853

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 18:37:00 +01:00
Clément Bœsch
71d3d96c9f Merge commit '136f55207521f0b03194ef5b55ba70f1635d6aee'
* commit '136f55207521f0b03194ef5b55ba70f1635d6aee':
  mpegvideo_motion: Handle edge emulation even without unrestricted_mv

This commit is a noop, see 7b1e0beb2da31a0a8847bc9c68a87a120b71fa8a

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 18:34:06 +01:00
Clément Bœsch
6d43533286 Merge commit '15fcf6292ed79be274c824fedb099c2665f4cc15'
* commit '15fcf6292ed79be274c824fedb099c2665f4cc15':
  build: remove hardcoded name of version header

This commit is noop, our version.sh is completely different.

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 18:30:03 +01:00
Clément Bœsch
465a7a1b9f Merge commit '8c201dde0ab62e5cd581d958e78d7609e0ba710d'
* commit '8c201dde0ab62e5cd581d958e78d7609e0ba710d':
  build: doc: more fine-grained dependencies for generated texi files

This commit is a noop, we have a different system for handling the
documentation.

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 18:29:06 +01:00
Matthieu Bouron
d839c4716c configure: error out if jni is enabled and cannot be found 2017-03-20 18:48:44 +01:00
Clément Bœsch
f91bf71d69 Merge commit 'bc7399934def210c2a84ea51375d50f79c676c96'
* commit 'bc7399934def210c2a84ea51375d50f79c676c96':
  libdc1394: Distinguish between enumeration errors and no cameras found

This commit is a noop, see 384251daffb98d88b0fe897b341bb68445f885de

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 16:53:56 +01:00
Clément Bœsch
48cc083a30 Merge commit 'df3795025337479a639cb3cd26c93a4e82ccd4db'
* commit 'df3795025337479a639cb3cd26c93a4e82ccd4db':
  rtsp: Fix a crash with the RTSP muxer

This commit is a noop, see f8a13c72132a65e34e05b878dc780ad330dd7371

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 16:47:41 +01:00
Clément Bœsch
bc1023eb36 Merge commit 'bdf7610eb266fd3de650040c97328791868abd82'
* commit 'bdf7610eb266fd3de650040c97328791868abd82':
  vf_scale_vaapi: Crop input surface to active region

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 16:44:53 +01:00
Clément Bœsch
9a0f91314a Merge commit '3a9662af6c741f8354b1ca97642f78f5c02e2e8f'
* commit '3a9662af6c741f8354b1ca97642f78f5c02e2e8f':
  vaapi_h264: Fix HRD bit_rate/cpb_size scaling

This commit is a noop, see 06d73d002e7f911f26ae1548b46e442a6ece9a4a

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 16:42:50 +01:00
Clément Bœsch
6c3d2dad9e Merge commit '7081620aca36e616ea96f71fd71d2703e3abae09'
* commit '7081620aca36e616ea96f71fd71d2703e3abae09':
  hwcontext_vdpau: Fix missing subscripts

This commit is a noop, see f7e9275f83ec116fc859367d61998eae8af438fc

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 16:07:11 +01:00
Clément Bœsch
2feef75cb5 Merge commit '09a145b3c837273b1379321e44386a3233156e75'
* commit '09a145b3c837273b1379321e44386a3233156e75':
  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
e07fa3008b Merge commit 'de452e503734ebb0fdbce86e9d16693b3530fad3'
* commit 'de452e503734ebb0fdbce86e9d16693b3530fad3':
  pixblockdsp: Change type of stride parameters to ptrdiff_t

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 15:58:32 +01:00
Paul B Mahol
ce818d90bd avcodec/wmaprodec: reset offsets when error happens
Fixes #6250.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-03-20 15:36:55 +01:00
Ricardo Constantino
20c4fb2e01 configure: add stdint.h to x264 and xavs checks
Regression from 4563a86f011b54977b390c72ec3901cace35f8da.
Both need stdint.h included before the respective x264.h and xavs.h.

Old require() used different, separate checks that didn't actually
need stdint.h to work. require2()'s (now require) check_func_headers()
does include stdint.h but only after the custom headers.

For libxavs this would also be consequently fixed by libav's
commit 20abcaa273a6e77d0a2e1a98c643c73562c6f8f2 which wasn't merged yet.
2017-03-20 15:17:57 +01:00
Ilia
2f3d10a01a avcodec/vp9: avx2 implementation of ipred_dl_16x16_16
vp9_diag_downleft_16x16_10bpp_c: 263.0
vp9_diag_downleft_16x16_10bpp_sse2: 44.7
vp9_diag_downleft_16x16_10bpp_ssse3: 32.5
vp9_diag_downleft_16x16_10bpp_avx: 31.9
vp9_diag_downleft_16x16_10bpp_avx2: 25.7
vp9_diag_downleft_16x16_12bpp_c: 264.7
vp9_diag_downleft_16x16_12bpp_sse2: 44.4
vp9_diag_downleft_16x16_12bpp_ssse3: 32.0
vp9_diag_downleft_16x16_12bpp_avx: 32.4
vp9_diag_downleft_16x16_12bpp_avx2: 25.5

Benchmarked with 10000 runs

Signed-off-by: Ilia <zakne0ne@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2017-03-20 09:47:43 -04:00
Mirage Abeysekara
5eb4f95bef h264pred: added AVX2 implementation for tm_vp8 16x16.
checkasm --bench results with 5000 runs

pred16x16_tm_vp8_c: 302.8
pred16x16_tm_vp8_mmx: 101.4
pred16x16_tm_vp8_mmxext: 95.5
pred16x16_tm_vp8_sse2: 95.1
pred16x16_tm_vp8_avx2: 38.2

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2017-03-20 09:45:42 -04:00
Ronald S. Bultje
f3cd2302a9 wmavoice: remove unused or write-only variables. 2017-03-20 09:44:52 -04:00
Clément Bœsch
4563a86f01 Merge commit 'ab3554e1a7c04a5ea30f9c905de92348478ef7c8'
* commit 'ab3554e1a7c04a5ea30f9c905de92348478ef7c8':
  configure: Drop check_lib()/require() in favor of check_lib2()/require2()

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 12:23:02 +01:00
Clément Bœsch
8e9dfe0d29 Merge commit '468bfe38c66d4d020984158e53b09a6a5749f394'
* commit '468bfe38c66d4d020984158e53b09a6a5749f394':
  ppc: mpegvideo: Add proper runtime AltiVec detection

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 12:08:11 +01:00
Clément Bœsch
7c54e5870f Merge commit '6ce93757ee6b81fe727bfdc9f546fd0ddf9139c3'
* commit '6ce93757ee6b81fe727bfdc9f546fd0ddf9139c3':
  ppc: Update #endif comments

This commit is mostly a noop as we seem to support PPC LE (see
902ce2a6c4364fd27ae3f1db78cd275caf79c006). Only the h264 chunks are
updated.

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 12:06:51 +01:00
Clément Bœsch
9e8fd5c423 Merge commit 'caccb3a0cdc7ee32cbed7eab156d35025133eadc'
* commit 'caccb3a0cdc7ee32cbed7eab156d35025133eadc':
  audiodsp: ppc: Add VSX variant

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 11:57:32 +01:00
Clément Bœsch
3c8f7a8f6b Merge commit 'e89cef40506d990a982aefedfde7d3ca4f88c524'
* commit 'e89cef40506d990a982aefedfde7d3ca4f88c524':
  checkasm: Read the unsigned value as it should

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 11:55:20 +01:00
Clément Bœsch
9785b1e21b Merge commit '75d642a944d5579e4ef20ff3701422a64692afcf'
* commit '75d642a944d5579e4ef20ff3701422a64692afcf':
  vaapi_vp8: Explicitly include libva vp8 decode header
  vaapi_decode: Ignore the profile when not useful
  lavc/vaapi: Add VP8 decode hwaccel
  vp8: Add hwaccel hooks

This merge is a noop as these commits are already under review on the
mailing list. doc/libav-merge.txt is updated to track its progress.

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 11:54:29 +01:00
Clément Bœsch
eed8ccde3e Merge commit '131a85a1fed9966bbd38517f76abfac0237e39dc'
* commit '131a85a1fed9966bbd38517f76abfac0237e39dc':
  utvideo: Change type of array stride parameters to ptrdiff_t

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 11:33:48 +01:00
Clément Bœsch
8316a0e08b Merge commit '52730e0f867fe77b7d2353d8b44e92edb7079ca5'
* commit '52730e0f867fe77b7d2353d8b44e92edb7079ca5':
  iir_filter: Change type of array stride parameters to ptrdiff_t

The merge also updates the MIPS code and drop the extra log.h include.

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 11:27:48 +01:00
Clément Bœsch
d36a423445 Merge commit '6b52762951fa138eef59e2628dabb389e0500e40'
* commit '6b52762951fa138eef59e2628dabb389e0500e40':
  error_resilience: Change type of array stride parameters to ptrdiff_t

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 11:10:46 +01:00
Clément Bœsch
100026bed6 Merge commit 'ec903058447ad5be34d89533962e9ae1aa1c78f7'
* commit 'ec903058447ad5be34d89533962e9ae1aa1c78f7':
  configure: Simplify clock_gettime() test

nanosleep check also updated.

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 11:04:50 +01:00
Clément Bœsch
38343651a8 Merge commit '3aa9d37d03da3c9b482d19b3988659287815280e'
* commit '3aa9d37d03da3c9b482d19b3988659287815280e':
  build: Fix directory dependencies of tests/pixfmts.mak target

This might not be necessary given our mkdirs in the configure, but it
probably doesn't hurt.

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 11:01:02 +01:00
Clément Bœsch
4ae80c3753 Merge commit '0e5dde739943168d6f61d3fb40b3f622e7abfeff'
* commit '0e5dde739943168d6f61d3fb40b3f622e7abfeff':
  configure: Fix --disable-pod2man / --disable-texi2html

This commit is a noop, we have dedicated documentation option for this
purpose.

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 10:47:01 +01:00
Clément Bœsch
d0db00c808 configure: remove pod2man from the config list
The configure has the --disable-manpages option for this purpose, and
--disable-pod2man is currently ignored due to that. This is also
consistent with the other documentation options.
2017-03-20 10:45:48 +01:00