Clément Bœsch
bb71eb944c
Merge commit 'ac648bb835edd3f67bda2267d0e72e5e582eb5a1'
...
* commit 'ac648bb835edd3f67bda2267d0e72e5e582eb5a1':
dxva2: Simplify some ifdefs
Merged-by: Clément Bœsch <u@pkh.me>
2017-04-17 10:32:45 +02:00
Clément Bœsch
d40e181bec
Merge commit '932cc6496ef6ab0e589ea51d3adefe5b7d7f1e2a'
...
* commit '932cc6496ef6ab0e589ea51d3adefe5b7d7f1e2a':
vdpau: Do not #include vdpau_x11.h from the main vdpau header
Merged-by: Clément Bœsch <u@pkh.me>
2017-04-15 18:36:30 +02:00
Paul B Mahol
f6b5a5c7d0
avcodec/dnxhdenc: fix recent regression
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-04-15 09:23:43 +02:00
Carl Eugen Hoyos
b9e4bbc686
lavc/opus_pvq: Add missing copyright notices from libopus.
...
The file is based on libopus, analyzed by Rostislav Pehlivanov.
2017-04-15 07:45:17 +02:00
Paul B Mahol
5dedb2afd6
avcodec/dnxhd*: add ff_dnxhd_get_hr_frame_size()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-04-14 16:09:07 +02:00
Paul B Mahol
34c2eea3d8
avcodec/dnxhdenc: make sure that mb_height > 255 can be stored
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-04-14 16:00:35 +02:00
Rostislav Pehlivanov
3f1c527bf5
opus_pvq: add resynth support and band encoding cost function
...
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-04-14 12:12:43 +01:00
James Almer
c5fd47fa8a
Merge commit 'fc85646ad495f3418042468da415af73a7a07334'
...
* commit 'fc85646ad495f3418042468da415af73a7a07334':
libopusdec: fix out-of-bounds read
libschroedingerdec: fix leaking of framewithpts
libschroedingerdec: don't produce empty frames
This commit is a noop, see
a86ebbf7f641bc797002ddea7fb517759722cd1b
3c0328d58d98664b05efdd377d3fe66a569d385e
8c8f543b81aa2b50bb6a6cfd370a0061281492a3
Merged-by: James Almer <jamrial@gmail.com>
2017-04-13 19:07:14 -03:00
James Almer
f416a8d66a
Merge commit 'd5759701a82926059ae3e2530805e900041a5419'
...
* commit 'd5759701a82926059ae3e2530805e900041a5419':
libkvazaar: Add missing header #includes
Merged-by: James Almer <jamrial@gmail.com>
2017-04-13 18:18:54 -03:00
James Almer
7d3bb052c8
Merge commit '624aa8ab221cf34693f9a8c5ab67219cf560f2bb'
...
* commit '624aa8ab221cf34693f9a8c5ab67219cf560f2bb':
build: Add missing Makefile entries and ifdefs for QSV hwaccels
Merged-by: James Almer <jamrial@gmail.com>
2017-04-13 17:27:43 -03:00
James Almer
8cd8c83317
avcodec/aacenc_ltp: fix use of uninitialized values
...
Fixes some valgrind warnings.
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2017-04-12 19:38:17 -03:00
Michael Niedermayer
cd8e62746f
avcodec/tiff: Factor constant computation out of inner loop
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-11 17:58:26 +02:00
James Almer
2b4cc8d1bb
avcodec/dnxhddec: fix -Wformat warning raised by DJGPP
...
FF_ARRAY_ELEMS returns a size_t value.
Reviewed-by: ubitux
Signed-off-by: James Almer <jamrial@gmail.com>
2017-04-11 12:31:14 -03:00
Paul B Mahol
da2fd3f73e
avcodec/lcldec: mark output frames as keyframes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-04-11 17:07:52 +02:00
Paul B Mahol
c61dc28911
avcodec/lcldec: add support for frame threads
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-04-11 17:05:01 +02:00
Paul B Mahol
25e491b6f9
avcodec/dnxhddec: add support for very big resolutions
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-04-11 00:08:39 +02:00
Clément Bœsch
8839cbf911
Revert "avcodec/svq1: zero initialize entries array"
...
This reverts commit aed84ee4d1b0c9e315a84b1ee0918fa49ee9cc09.
It is a false positive from Valgrind with recent GCC and
-funswitch-loops (present in -O3).
2017-04-10 16:10:17 +02:00
Michael Niedermayer
c94d551ea7
avcodec/pixlet: Reorder rlen check
...
This changes nothing but is nicer looking as this checks rlen
Maybe this helps coverity remove CID1397743
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-10 13:11:15 +02:00
Michael Niedermayer
8dd0c12648
avcodec/mjpegenc_huffman: Assert length in ff_mjpegenc_huffman_compute_bits()
...
This should help coverity see that the issues this leads to cannot occur
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-10 13:11:15 +02:00
Rostislav Pehlivanov
03eb0515c1
mpegvideo_enc: disable optimized huffman coding with AMV or slice threads
...
Doesn't work yet with slice threading and won't work with AMV.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-09 21:53:31 +02:00
Michael Niedermayer
724bb805ef
Revert "mjpegenc: disable huffman coding with AMV"
...
This was the wrong patch
This reverts commit 7f9b492d544ccef36f1d5d97a76d22502623d3c8.
2017-04-09 21:53:30 +02:00
James Almer
4588063f3e
avcodec/hevcdec: remove duplicate extradata parsing function
...
Use ff_hevc_decode_extradata() instead, which correctly only tries
to decode parameter set NAL units and not any other NAL that may be
present in extradata.
Reviewed-by: nevcairiel
Signed-off-by: James Almer <jamrial@gmail.com>
2017-04-09 14:09:05 -03:00
James Almer
498e9e8e2a
avcodec/hevc_parse: split build dependencies
...
Reviewed-by: nevcairiel
Signed-off-by: James Almer <jamrial@gmail.com>
2017-04-09 13:55:17 -03:00
James Almer
f1533979a2
avcodec/hevc_parse: allow setting apply_defdispwin when decoding SPS NAL units
...
Reviewed-by: nevcairiel
Signed-off-by: James Almer <jamrial@gmail.com>
2017-04-09 13:46:35 -03:00
James Almer
159ab4625b
avcodec/hevc_parse: check for parameter set decoding failure
...
Reviewed-by: nevcairiel
Signed-off-by: James Almer <jamrial@gmail.com>
2017-04-09 13:46:33 -03:00
James Almer
aed84ee4d1
avcodec/svq1: zero initialize entries array
...
Fixes valgrind warnings about "Use of uninitialised value of size 8"
Reviewed-by: Kieran Kunhya <kierank@obe.tv>
Signed-off-by: James Almer <jamrial@gmail.com>
2017-04-09 13:38:41 -03:00
James Almer
521197ebec
Merge commit 'e1dc5358af0dadef548114ec9cabba766b7c6260'
...
* commit 'e1dc5358af0dadef548114ec9cabba766b7c6260':
build: Create a component for MPEG audio header decoding
Merged-by: James Almer <jamrial@gmail.com>
2017-04-09 12:29:58 -03:00
Clément Bœsch
63bb3db9aa
Merge commit '0fdc9f81a00f0f32eb93c324bad65d8014deb4dd'
...
* commit '0fdc9f81a00f0f32eb93c324bad65d8014deb4dd':
build: Add missing hevc_ps dependency for QSV HEVC encoder
Merged-by: Clément Bœsch <u@pkh.me>
2017-04-09 15:10:30 +02:00
Paul B Mahol
20f7872d99
avcodec/hqx: add support for frame threads
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-04-09 10:50:11 +02:00
Paul B Mahol
24d9b0c29c
avcodec/cllc: add support for frame threads
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-04-09 10:40:40 +02:00
Michael Niedermayer
9244b839b7
avcodec/dcadsp: Fix runtime error: signed integer overflow
...
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-09 03:51:19 +02:00
Rostislav Pehlivanov
45eeb1f785
mjpegenc: enable optimal huffman coding by default
...
As it gives excellent encoding gains at an insignificant speed increase
and passes fate without problems, it should now be safe to enable by
default.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-04-09 00:00:39 +01:00
Rostislav Pehlivanov
7f9b492d54
mjpegenc: disable huffman coding with AMV
...
Isn't supported.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-04-09 00:00:32 +01:00
Rostislav Pehlivanov
2c9be3882a
mjpegenc_common: check for codec ID before using avctx->priv_data
...
When coding lossless jpeg the priv context will be pointing to LJpegEncContext
rather than MpegEncContext, which the function expects.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-04-08 23:57:39 +01:00
Clément Bœsch
b853d6aa5b
Merge commit 'd82d5379caca21005d8906829b35361c4a65408e'
...
* commit 'd82d5379caca21005d8906829b35361c4a65408e':
mmaldec: initialize refcount using atomic_init()
Merged-by: Clément Bœsch <u@pkh.me>
2017-04-08 14:52:30 +02:00
Clément Bœsch
97745b131a
Merge commit '5168026a05258537f1c48ca95c1776b1554997f4'
...
* commit '5168026a05258537f1c48ca95c1776b1554997f4':
options_table: Do not rely on enum size as option bound
Merged-by: Clément Bœsch <u@pkh.me>
2017-04-08 14:49:10 +02:00
Clément Bœsch
883fe17e3b
Merge commit 'ff9db5cfd14558df9cfcc54d6c062bc34bf1f341'
...
* commit 'ff9db5cfd14558df9cfcc54d6c062bc34bf1f341':
lavc: Use a stricter check for the color properties values
Merged-by: Clément Bœsch <u@pkh.me>
2017-04-08 14:41:10 +02:00
Clément Bœsch
5be1440c74
Merge commit '0a35f128f3c6e0ae9a0a2236c557602c108da269'
...
* commit '0a35f128f3c6e0ae9a0a2236c557602c108da269':
cabac: x86: Give optimizations header a more meaningful name
Merged-by: Clément Bœsch <u@pkh.me>
2017-04-08 14:30:13 +02:00
Clément Bœsch
6e836052d8
Merge commit '5c89022542ce8521d89ef58858342a7bc1c3cd0d'
...
* commit '5c89022542ce8521d89ef58858342a7bc1c3cd0d':
hevc: Drop pointless av_unused attribute
Merged-by: Clément Bœsch <u@pkh.me>
2017-04-08 14:18:03 +02:00
Clément Bœsch
2d40fbe639
Merge commit '0983f9117f31521643162cb85380672495a9de1b'
...
* commit '0983f9117f31521643162cb85380672495a9de1b':
metasound: Drop unused tables
This commit is mostly a noop, see
276a8666d2d990335314752f8f8bdfdaac69e410
e8319f602e94af9b8454ed68d8323908ceaf944d
Merged-by: Clément Bœsch <u@pkh.me>
2017-04-08 14:16:32 +02:00
Rostislav Pehlivanov
d0a3143193
opusenc: switch between intra/inter mode for coarse energy
...
Saves around 5kbps.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-04-08 00:54:56 +01:00
Rostislav Pehlivanov
c39fba703b
opusenc: do not signal digital silence
...
Apparently its only use is to enable comfort noise/error recovery.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-04-08 00:48:28 +01:00
Rostislav Pehlivanov
42ffc67208
opusenc: minor style changes
...
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-04-08 00:40:33 +01:00
Rostislav Pehlivanov
63744d8afd
opusenc: remove unused header entries and simplify normalization
...
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-04-08 00:27:33 +01:00
Rostislav Pehlivanov
a66121d964
opus_rc: add macros for checkpoint rollback
...
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-04-08 00:27:33 +01:00
Rostislav Pehlivanov
6d0b62a12b
opus_celt: fix some style issues
...
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-04-08 00:27:33 +01:00
Rostislav Pehlivanov
db788de8ec
mdct15: use existing complex multiplication macros
...
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-04-08 00:27:33 +01:00
James Almer
e7fb6bc32d
avcodec/hevc_parse: ignore all non parameter set NAL units in extradata
...
While they shouldn't be present, they are harmless if they are.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2017-04-07 17:23:57 -03:00
Paul B Mahol
faa94a576f
avcodec/utvideodec: add support for gradient prediction
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-04-07 20:11:23 +02:00
Ronald S. Bultje
2e664b9c1e
pthread_frame: make accesses to debug field be protected by owner lock.
...
The av_log() is done outside the lock, but this way the accesses to the
field (reads and writes) are always protected by a mutex. The av_log()
is not run inside the lock context because it may involve user callbacks
and doing that in performance-sensitive code is probably not a good idea.
This should fix occasional tsan warnings when running fate-h264, like:
WARNING: ThreadSanitizer: data race (pid=10916)
Write of size 4 at 0x7d64000174fc by main thread (mutexes: write M2313):
#0 update_context_from_user src/libavcodec/pthread_frame.c:335 (ffmpeg+0x000000df7b06)
[..]
Previous read of size 4 at 0x7d64000174fc by thread T1 (mutexes: write M2311):
#0 ff_thread_await_progress src/libavcodec/pthread_frame.c:592 (ffmpeg+0x000000df8b3e)
2017-04-07 13:29:45 -04:00