OSDN Git Service
Martin Storsjö [Mon, 14 Nov 2016 10:32:24 +0000 (12:32 +0200)]
aarch64: Add an offset parameter to the movrel macro
With apple tools, the linker fails with errors like these, if the
offset is negative:
ld: in section __TEXT,__text reloc 8: symbol index out of range for architecture arm64
This is cherry-picked from libav commit
c44a8a3eabcd6acd2ba79f32ec8a432e6ebe552c.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Martin Storsjö [Mon, 14 Nov 2016 10:32:23 +0000 (12:32 +0200)]
arm: vp9: Add NEON loop filters
This work is sponsored by, and copyright, Google.
The implementation tries to have smart handling of cases
where no pixels need the full filtering for the 8/16 width
filters, skipping both calculation and writeback of the
unmodified pixels in those cases. The actual effect of this
is hard to test with checkasm though, since it tests the
full filtering, and the benefit depends on how many filtered
blocks use the shortcut.
Examples of relative speedup compared to the C version, from checkasm:
Cortex A7 A8 A9 A53
vp9_loop_filter_h_4_8_neon: 2.72 2.68 1.78 3.15
vp9_loop_filter_h_8_8_neon: 2.36 2.38 1.70 2.91
vp9_loop_filter_h_16_8_neon: 1.80 1.89 1.45 2.01
vp9_loop_filter_h_16_16_neon: 2.81 2.78 2.18 3.16
vp9_loop_filter_mix2_h_44_16_neon: 2.65 2.67 1.93 3.05
vp9_loop_filter_mix2_h_48_16_neon: 2.46 2.38 1.81 2.85
vp9_loop_filter_mix2_h_84_16_neon: 2.50 2.41 1.73 2.85
vp9_loop_filter_mix2_h_88_16_neon: 2.77 2.66 1.96 3.23
vp9_loop_filter_mix2_v_44_16_neon: 4.28 4.46 3.22 5.70
vp9_loop_filter_mix2_v_48_16_neon: 3.92 4.00 3.03 5.19
vp9_loop_filter_mix2_v_84_16_neon: 3.97 4.31 2.98 5.33
vp9_loop_filter_mix2_v_88_16_neon: 3.91 4.19 3.06 5.18
vp9_loop_filter_v_4_8_neon: 4.53 4.47 3.31 6.05
vp9_loop_filter_v_8_8_neon: 3.58 3.99 2.92 5.17
vp9_loop_filter_v_16_8_neon: 3.40 3.50 2.81 4.68
vp9_loop_filter_v_16_16_neon: 4.66 4.41 3.74 6.02
The speedup vs C code is around 2-6x. The numbers are quite
inconclusive though, since the checkasm test runs multiple filterings
on top of each other, so later rounds might end up with different
codepaths (different decisions on which filter to apply, based
on input pixel differences). Disabling the early-exit in the asm
doesn't give a fair comparison either though, since the C code
only does the necessary calcuations for each row.
Based on START_TIMER/STOP_TIMER wrapping around a few individual
functions, the speedup vs C code is around 4-9x.
This is pretty similar in runtime to the corresponding routines
in libvpx. (This is comparing vpx_lpf_vertical_16_neon,
vpx_lpf_horizontal_edge_8_neon and vpx_lpf_horizontal_edge_16_neon
to vp9_loop_filter_h_16_8_neon, vp9_loop_filter_v_16_8_neon
and vp9_loop_filter_v_16_16_neon - note that the naming of horizonal
and vertical is flipped between the libraries.)
In order to have stable, comparable numbers, the early exits in both
asm versions were disabled, forcing the full filtering codepath.
Cortex A7 A8 A9 A53
vp9_loop_filter_h_16_8_neon: 597.2 472.0 482.4 415.0
libvpx vpx_lpf_vertical_16_neon: 626.0 464.5 470.7 445.0
vp9_loop_filter_v_16_8_neon: 500.2 422.5 429.7 295.0
libvpx vpx_lpf_horizontal_edge_8_neon: 586.5 414.5 415.6 383.2
vp9_loop_filter_v_16_16_neon: 905.0 784.7 791.5 546.0
libvpx vpx_lpf_horizontal_edge_16_neon: 1060.2 751.7 743.5 685.2
Our version is consistently faster on on A7 and A53, marginally slower on
A8, and sometimes faster, sometimes slower on A9 (marginally slower in all
three tests in this particular test run).
This is an adapted cherry-pick from libav commit
dd299a2d6d4d1af9528ed35a8131c35946be5973.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Martin Storsjö [Mon, 14 Nov 2016 10:32:22 +0000 (12:32 +0200)]
arm: vp9: Add NEON itxfm routines
This work is sponsored by, and copyright, Google.
For the transforms up to 8x8, we can fit all the data (including
temporaries) in registers and just do a straightforward transform
of all the data. For 16x16, we do a transform of 4x16 pixels in
4 slices, using a temporary buffer. For 32x32, we transform 4x32
pixels at a time, in two steps of 4x16 pixels each.
Examples of relative speedup compared to the C version, from checkasm:
Cortex A7 A8 A9 A53
vp9_inv_adst_adst_4x4_add_neon: 3.39 5.83 4.17 4.01
vp9_inv_adst_adst_8x8_add_neon: 3.79 4.86 4.23 3.98
vp9_inv_adst_adst_16x16_add_neon: 3.33 4.36 4.11 4.16
vp9_inv_dct_dct_4x4_add_neon: 4.06 6.16 4.59 4.46
vp9_inv_dct_dct_8x8_add_neon: 4.61 6.01 4.98 4.86
vp9_inv_dct_dct_16x16_add_neon: 3.35 3.44 3.36 3.79
vp9_inv_dct_dct_32x32_add_neon: 3.89 3.50 3.79 4.42
vp9_inv_wht_wht_4x4_add_neon: 3.22 5.13 3.53 3.77
Thus, the speedup vs C code is around 3-6x.
This is mostly marginally faster than the corresponding routines
in libvpx on most cores, tested with their 32x32 idct (compared to
vpx_idct32x32_1024_add_neon). These numbers are slightly in libvpx's
favour since their version doesn't clear the input buffer like ours
do (although the effect of that on the total runtime probably is
negligible.)
Cortex A7 A8 A9 A53
vp9_inv_dct_dct_32x32_add_neon: 18436.8 16874.1 14235.1 11988.9
libvpx vpx_idct32x32_1024_add_neon 20789.0 13344.3 15049.9 13030.5
Only on the Cortex A8, the libvpx function is faster. On the other cores,
ours is slightly faster even though ours has got source block clearing
integrated.
This is an adapted cherry-pick from libav commits
a67ae67083151f2f9595a1f2d17b601da19b939e and
52d196fb30fb6628921b5f1b31e7bd11eb7e1d9a.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Martin Storsjö [Mon, 14 Nov 2016 10:32:21 +0000 (12:32 +0200)]
arm: vp9: Add NEON optimizations of VP9 MC functions
This work is sponsored by, and copyright, Google.
The filter coefficients are signed values, where the product of the
multiplication with one individual filter coefficient doesn't
overflow a 16 bit signed value (the largest filter coefficient is
127). But when the products are accumulated, the resulting sum can
overflow the 16 bit signed range. Instead of accumulating in 32 bit,
we accumulate the largest product (either index 3 or 4) last with a
saturated addition.
(The VP8 MC asm does something similar, but slightly simpler, by
accumulating each half of the filter separately. In the VP9 MC
filters, each half of the filter can also overflow though, so the
largest component has to be handled individually.)
Examples of relative speedup compared to the C version, from checkasm:
Cortex A7 A8 A9 A53
vp9_avg4_neon: 1.71 1.15 1.42 1.49
vp9_avg8_neon: 2.51 3.63 3.14 2.58
vp9_avg16_neon: 2.95 6.76 3.01 2.84
vp9_avg32_neon: 3.29 6.64 2.85 3.00
vp9_avg64_neon: 3.47 6.67 3.14 2.80
vp9_avg_8tap_smooth_4h_neon: 3.22 4.73 2.76 4.67
vp9_avg_8tap_smooth_4hv_neon: 3.67 4.76 3.28 4.71
vp9_avg_8tap_smooth_4v_neon: 5.52 7.60 4.60 6.31
vp9_avg_8tap_smooth_8h_neon: 6.22 9.04 5.12 9.32
vp9_avg_8tap_smooth_8hv_neon: 6.38 8.21 5.72 8.17
vp9_avg_8tap_smooth_8v_neon: 9.22 12.66 8.15 11.10
vp9_avg_8tap_smooth_64h_neon: 7.02 10.23 5.54 11.58
vp9_avg_8tap_smooth_64hv_neon: 6.76 9.46 5.93 9.40
vp9_avg_8tap_smooth_64v_neon: 10.76 14.13 9.46 13.37
vp9_put4_neon: 1.11 1.47 1.00 1.21
vp9_put8_neon: 1.23 2.17 1.94 1.48
vp9_put16_neon: 1.63 4.02 1.73 1.97
vp9_put32_neon: 1.56 4.92 2.00 1.96
vp9_put64_neon: 2.10 5.28 2.03 2.35
vp9_put_8tap_smooth_4h_neon: 3.11 4.35 2.63 4.35
vp9_put_8tap_smooth_4hv_neon: 3.67 4.69 3.25 4.71
vp9_put_8tap_smooth_4v_neon: 5.45 7.27 4.49 6.52
vp9_put_8tap_smooth_8h_neon: 5.97 8.18 4.81 8.56
vp9_put_8tap_smooth_8hv_neon: 6.39 7.90 5.64 8.15
vp9_put_8tap_smooth_8v_neon: 9.03 11.84 8.07 11.51
vp9_put_8tap_smooth_64h_neon: 6.78 9.48 4.88 10.89
vp9_put_8tap_smooth_64hv_neon: 6.99 8.87 5.94 9.56
vp9_put_8tap_smooth_64v_neon: 10.69 13.30 9.43 14.34
For the larger 8tap filters, the speedup vs C code is around 5-14x.
This is significantly faster than libvpx's implementation of the same
functions, at least when comparing the put_8tap_smooth_64 functions
(compared to vpx_convolve8_horiz_neon and vpx_convolve8_vert_neon from
libvpx).
Absolute runtimes from checkasm:
Cortex A7 A8 A9 A53
vp9_put_8tap_smooth_64h_neon: 20150.3 14489.4 19733.6 10863.7
libvpx vpx_convolve8_horiz_neon: 52623.3 19736.4 21907.7 25027.7
vp9_put_8tap_smooth_64v_neon: 14455.0 12303.9 13746.4 9628.9
libvpx vpx_convolve8_vert_neon: 42090.0 17706.2 17659.9 16941.2
Thus, on the A9, the horizontal filter is only marginally faster than
libvpx, while our version is significantly faster on the other cores,
and the vertical filter is significantly faster on all cores. The
difference is especially large on the A7.
The libvpx implementation does the accumulation in 32 bit, which
probably explains most of the differences.
This is an adapted cherry-pick from libav commits
ffbd1d2b0002576ef0d976a41ff959c635373fdc,
392caa65df3efa8b2d48a80f08a6af4892c61c08,
557c1675cf0e803b2fee43b4c8b58433842c84d0 and
11623217e3c9b859daee544e31acdd0821b61039.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Martin Storsjö [Mon, 14 Nov 2016 10:32:20 +0000 (12:32 +0200)]
arm: Clear the gp register alias at the end of functions
We reset .Lpic_gp to zero at the start of each function, which means
that the logic within movrelx for clearing gp when necessary will
be missed.
This fixes using movrelx in different functions with a different
helper register.
This is cherry-picked from libav commit
824e8c284054f323f854892d1b4739239ed1fdc7.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Martin Storsjö [Mon, 14 Nov 2016 10:32:19 +0000 (12:32 +0200)]
vp9dsp: Deduplicate the subpel filters
Make them aligned, to allow efficient access to them from simd.
This is an adapted cherry-pick from libav commit
a4cfcddcb0f76e837d5abc06840c2b26c0e8aefc.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Michael Niedermayer [Tue, 15 Nov 2016 17:05:33 +0000 (18:05 +0100)]
avcodec/ituh263dec: Avoid spending a long time in slice sync
Fixes: 177/fuzz-3-ffmpeg_VIDEO_AV_CODEC_ID_FLV1_fuzzer
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Ronald S. Bultje [Tue, 8 Nov 2016 19:43:59 +0000 (14:43 -0500)]
vp9: add avx2 iadst16 implementations.
Also a small cosmetic change to the avx2 idct16 version to make it
explicit that one of the arguments to the write-out macros is unused
for >=avx2 (it uses pmovzxbw instead of punpcklbw).
Michael Niedermayer [Tue, 15 Nov 2016 13:54:47 +0000 (14:54 +0100)]
avcodec/movtextdec: Add error message for tsmb_size check
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 15 Nov 2016 13:52:21 +0000 (14:52 +0100)]
avcodec/movtextdec: Fix tsmb_size check==0 check
Fixes: 173/fuzz-3-ffmpeg_SUBTITLE_AV_CODEC_ID_MOV_TEXT_fuzzer
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 15 Nov 2016 13:46:16 +0000 (14:46 +0100)]
avcodec/movtextdec: Fix potential integer overflow
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Andreas Cadhalpun [Sun, 13 Nov 2016 19:52:02 +0000 (20:52 +0100)]
softfloat: handle -INT_MAX correctly
This is similar to commit
9ac61e73d0843ec4b83f4e3d47eded73234e406e.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Martin Vignali [Sun, 23 Oct 2016 15:16:12 +0000 (17:16 +0200)]
doc/filters: add metadata information for blackframe
Reviewed-by: Moritz Barsnick <barsnick@gmx.net>
Signed-off-by: Lou Logan <lou@lrcd.com>
James Almer [Mon, 14 Nov 2016 18:15:30 +0000 (15:15 -0300)]
doc/codecs.texi: add new and missing color related options
Found-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 14:27:48 +0000 (15:27 +0100)]
Merge commit '
f8d17d53957056c053a46f9320fa7ae6fe1479a5'
* commit '
f8d17d53957056c053a46f9320fa7ae6fe1479a5':
checkasm: Add tests for vp8dsp
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 14:21:49 +0000 (15:21 +0100)]
Merge commit '
e8b96a77010dd62624c3c65c357d7ae3b397ceaa'
* commit '
e8b96a77010dd62624c3c65c357d7ae3b397ceaa':
arm: Fix a typo in a comment
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 14:21:24 +0000 (15:21 +0100)]
Merge commit '
dc08bbf63a217c839aa4c143f2a1d0b7e2e6d997'
* commit '
dc08bbf63a217c839aa4c143f2a1d0b7e2e6d997':
vp8dsp: Clarify the first dimension of the mc function tables
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 14:20:09 +0000 (15:20 +0100)]
Merge commit '
924e2ecd2b7d51cca60c79351ef16b04dd4245c3'
* commit '
924e2ecd2b7d51cca60c79351ef16b04dd4245c3':
qsvdec: when a frames ctx is supplied, use its frame dimensions
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 14:20:00 +0000 (15:20 +0100)]
Merge commit '
92736c74fb1633e36f7134a880422a9b7db14d3f'
* commit '
92736c74fb1633e36f7134a880422a9b7db14d3f':
qsvdec: add support for P010 (10-bit 420) decoding
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 14:19:51 +0000 (15:19 +0100)]
Merge commit '
ce320cf1c4daab3e2e3726ed7d2e879d10f7b991'
* commit '
ce320cf1c4daab3e2e3726ed7d2e879d10f7b991':
qsvdec: use the same mfxFrameInfo for allocating frames that was passed to DECODE_Init
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 14:19:43 +0000 (15:19 +0100)]
Merge commit '
536bb17e9659c5ed7576a218d4085cdd6d5742fa'
* commit '
536bb17e9659c5ed7576a218d4085cdd6d5742fa':
qsvdec: make ff_qsv_map_pixfmt() return a MFX fourcc as well
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 14:18:49 +0000 (15:18 +0100)]
Merge commit '
d20c118975220a0256027d1c2410bade94b8534d'
* commit '
d20c118975220a0256027d1c2410bade94b8534d':
hwcontext_qsv: add support for p010
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 14:18:23 +0000 (15:18 +0100)]
Merge commit '
40f74dc87acb3f5bbb51f273790a4a7a64201b16'
* commit '
40f74dc87acb3f5bbb51f273790a4a7a64201b16':
matroskadec: export CodecDelay
Noop, we already export CodecDelay
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 14:16:56 +0000 (15:16 +0100)]
Merge commit '
582d4211e00015b68626f77ce4af53161e2b1713'
* commit '
582d4211e00015b68626f77ce4af53161e2b1713':
vf_scale_vaapi: Respect driver quirks around buffer destruction
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 14:16:39 +0000 (15:16 +0100)]
Merge commit '
221ffca6314ed3ba9d38464ea50cd85251c04e74'
* commit '
221ffca6314ed3ba9d38464ea50cd85251c04e74':
vaapi_encode: Respect driver quirks around buffer destruction
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 14:16:31 +0000 (15:16 +0100)]
Merge commit '
4926fa9a4aa03f3b751f52e900b9efb87fea0591'
* commit '
4926fa9a4aa03f3b751f52e900b9efb87fea0591':
hwcontext_vaapi: Add driver quirks to the hwdevice
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 14:15:19 +0000 (15:15 +0100)]
Merge commit '
2ef87815fec059504370ae3050cc243a53553915'
* commit '
2ef87815fec059504370ae3050cc243a53553915':
hwcontext_dxva2: add support for p010
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 14:09:31 +0000 (15:09 +0100)]
Merge commit '
e78e5b735fd559bc7aa3f5a01e9c8d37dc2ec6d8'
* commit '
e78e5b735fd559bc7aa3f5a01e9c8d37dc2ec6d8':
swscale: add P010 input support
This commit is a noop, see
2e31434d84bba17610ecc491afb5b372678fd517
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 14:08:19 +0000 (15:08 +0100)]
Merge commit '
b7c5f885233a7b8692140c920d9f43220dc830d9'
* commit '
b7c5f885233a7b8692140c920d9f43220dc830d9':
pixfmt: add P010 pixel format
This commit is a noop, see
c2869b4640f0af56e2dd828406d074ef6290fde4
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 13:31:19 +0000 (14:31 +0100)]
Merge commit '
b55566db4c51d920a6496455bb30a608e5a50a41'
* commit '
b55566db4c51d920a6496455bb30a608e5a50a41':
avconv: use avcodec_parameters_copy() with streamcopy
The fate-aac-autobsf-adtstoasc changes from writing an audio bitdepth
based on the sample format, which is now available.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 13:03:47 +0000 (14:03 +0100)]
Merge commit '
be3e807c8fad1f82766c083073e44396799f155b'
* commit '
be3e807c8fad1f82766c083073e44396799f155b':
oggparseopus: export pre-skip
Noop, we already export this information
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Carl Eugen Hoyos [Mon, 14 Nov 2016 12:33:22 +0000 (13:33 +0100)]
lavf/Makefile: Fix rule for the data muxer.
Hendrik Leppkes [Mon, 14 Nov 2016 11:41:32 +0000 (12:41 +0100)]
Merge commit '
029cf99c5166b36f33381cd8ebfa5f1f1f463d1f'
* commit '
029cf99c5166b36f33381cd8ebfa5f1f1f463d1f':
mov: Save number of stsd elements after stream extradata allocation
Mostly noop, see
8b43ee4054af799e388d380b379a13a60849c1b5
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 11:32:08 +0000 (12:32 +0100)]
Merge commit '
6c445990e64124ad64c79423dfd3764520648c89'
* commit '
6c445990e64124ad64c79423dfd3764520648c89':
tiffenc: Check zlib support for deflate option during initialization
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 11:30:35 +0000 (12:30 +0100)]
Merge commit '
9f732e4c996243c1e57c2bbbec6c8b94c37a7a22'
* commit '
9f732e4c996243c1e57c2bbbec6c8b94c37a7a22':
tiffenc: Check av_pix_fmt_desc_get() return value
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 11:16:32 +0000 (12:16 +0100)]
Merge commit '
d8f3b0fb584677d4882e3a2d7c28f8b15c7319f5'
* commit '
d8f3b0fb584677d4882e3a2d7c28f8b15c7319f5':
targaenc: Move size check to initialization function
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 11:03:00 +0000 (12:03 +0100)]
Merge commit '
eeb6849cedac099d41feb482da581f4059c63ca7'
* commit '
eeb6849cedac099d41feb482da581f4059c63ca7':
rle: K&R formatting cosmetics
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 10:50:03 +0000 (11:50 +0100)]
Merge commit '
326d9116936ab61d13ac4142b49c7337daf7c4c0'
* commit '
326d9116936ab61d13ac4142b49c7337daf7c4c0':
build: Drop unnecessary libavcodec <-> libavformat object dependencies
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 10:19:25 +0000 (11:19 +0100)]
Merge commit '
e72d6fa08a3c1876109149401753a8d2c736d418'
* commit '
e72d6fa08a3c1876109149401753a8d2c736d418':
build: Move MP2 muxer declaration away from MP3 muxer code
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 09:50:50 +0000 (10:50 +0100)]
Merge commit '
67cb2c0f73ec08bdcecd675c1ffe25c3a5b26ef2'
* commit '
67cb2c0f73ec08bdcecd675c1ffe25c3a5b26ef2':
checkasm: hevc: Iterate over features first, then over bitdepths
Noop, we don't have these checkasm tests.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 09:42:36 +0000 (10:42 +0100)]
Merge commit '
fe27792fd779ac4cdd5e57be5f6f488483c307b2'
* commit '
fe27792fd779ac4cdd5e57be5f6f488483c307b2':
build: Move ff_mpeg12_frame_rate_tab to a separate file
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Carl Eugen Hoyos [Mon, 14 Nov 2016 09:36:25 +0000 (10:36 +0100)]
lavc/hevc_ps: Use correct pix_fmt for 10bit 4:0:0.
Fixes the second sample from ticket #5544.
Carl Eugen Hoyos [Mon, 14 Nov 2016 00:55:49 +0000 (01:55 +0100)]
lsws: Add GRAY10 conversion.
Based on
19be5fb7 by Luca Barbato.
Carl Eugen Hoyos [Mon, 14 Nov 2016 00:43:40 +0000 (01:43 +0100)]
lavu/pixfmt: Add GRAY10
Based on
7471352f by Luca Barbato.
Hendrik Leppkes [Mon, 14 Nov 2016 09:09:44 +0000 (10:09 +0100)]
Merge commit '
8c929037ec75fbe9f367e0a31ee34839e92de481'
* commit '
8c929037ec75fbe9f367e0a31ee34839e92de481':
build: Add a new component for H.264 parsing code
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 09:05:43 +0000 (10:05 +0100)]
Merge commit '
3c08b7bc761b6411f55db68189721638dde2c46a'
* commit '
3c08b7bc761b6411f55db68189721638dde2c46a':
ffv1: Report additional bitstream information in verbose mode
Noop, we already have bitstream information printing.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 09:03:30 +0000 (10:03 +0100)]
Merge commit '
fe6e5cbea7dbd5d2c67d79b5570e26debb70e95b'
* commit '
fe6e5cbea7dbd5d2c67d79b5570e26debb70e95b':
ffv1: Remove version 2 and mark version 3 as non-experimental
Noop, our ffv1 decoder is far more advanced and version 3 has been stable for a while.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 14 Nov 2016 09:02:33 +0000 (10:02 +0100)]
Merge commit '
7c55fac7dfa8bad9644dea5d03309da30be69563'
* commit '
7c55fac7dfa8bad9644dea5d03309da30be69563':
fate: Add test for webp
Noop, we already have a variety of webp tests, including a fate-webp target,
which would collide with this test.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Rodger Combs [Sun, 13 Nov 2016 00:01:52 +0000 (18:01 -0600)]
lavf/mux: don't warn about missing timestamps on attached pictures
Dmitry Kalinkin [Tue, 6 Sep 2016 04:11:17 +0000 (07:11 +0300)]
lavc/audiotoolboxdec: fix OSX SDK detection
__MAC_10_11 can be present in updated revision of an older SDK so it
can't reliably detect availability of kAudioFormatEnhancedAC3 constant.
Fixes:
b4daa2c40f ('lavc/audiotoolboxdec: add eac3 decoder')
Cc: Rodger Combs <rodger.combs@gmail.com>
Signed-off-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Previous version reviewed by: Rodger Combs <rodger.combs@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Kyle Swanson [Mon, 14 Nov 2016 01:11:07 +0000 (19:11 -0600)]
lavfi/ebur128: use ff_ prefix
Signed-off-by: Kyle Swanson <k@ylo.ph>
Simon Thelen [Fri, 11 Nov 2016 00:27:12 +0000 (01:27 +0100)]
doc/ffmpeg: add documentation for the disposition option
Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Carl Eugen Hoyos [Thu, 10 Nov 2016 22:04:46 +0000 (23:04 +0100)]
lavc/dpx: Support GRAY12 colourspace.
Hendrik Leppkes [Sun, 13 Nov 2016 22:02:39 +0000 (23:02 +0100)]
Merge commit '
e48746deec48e9ff195841bc3266b4e153a878cd'
* commit '
e48746deec48e9ff195841bc3266b4e153a878cd':
checkasm: h264dsp: Move the x and y variables into the randomize_buffer macro
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 13 Nov 2016 22:00:07 +0000 (23:00 +0100)]
Merge commit '
e57de6faa1e796099091c9af947d4755edacccaf'
* commit '
e57de6faa1e796099091c9af947d4755edacccaf':
checkasm: h264dsp: Initialize the padding area
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 13 Nov 2016 21:59:35 +0000 (22:59 +0100)]
Merge commit '
82b7525173f20702a8cbc26ebedbf4b69b8fecec'
* commit '
82b7525173f20702a8cbc26ebedbf4b69b8fecec':
Add an OpenH264 decoder wrapper
This commit is a noop, see
c5d326f551b0312ff581bf1df35b21d956e01523
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 13 Nov 2016 21:55:34 +0000 (22:55 +0100)]
Merge commit '
785c25443b56adb6dbbb78d68cccbd9bd4a42e05'
* commit '
785c25443b56adb6dbbb78d68cccbd9bd4a42e05':
movenc: Apply offsets on timestamps when peeking into interleaving queues
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 13 Nov 2016 21:38:45 +0000 (22:38 +0100)]
Merge commit '
eccfb9778ae939764d17457f34338d140832d9e1'
* commit '
eccfb9778ae939764d17457f34338d140832d9e1':
qsvdec_hevc: add the UID of the HEVC HW decoder plugin
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 13 Nov 2016 21:38:29 +0000 (22:38 +0100)]
Merge commit '
c67594a2c7fd4381e6d44246b18487c7e6b75f02'
* commit '
c67594a2c7fd4381e6d44246b18487c7e6b75f02':
qsvdec_hevc: fix a variable name
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 13 Nov 2016 21:36:18 +0000 (22:36 +0100)]
Merge commit '
f62bb216ac4cfbbff16108c6bac35a0282532972'
* commit '
f62bb216ac4cfbbff16108c6bac35a0282532972':
hwcontext_vaapi: allow transfers to/from any size of sw frame
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 13 Nov 2016 21:35:57 +0000 (22:35 +0100)]
Merge commit '
c3f113d58488df7594a489bdbb993a69ad47063c'
* commit '
c3f113d58488df7594a489bdbb993a69ad47063c':
vf_hwdownload: allocate the destination frame for the pool size
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 13 Nov 2016 21:35:49 +0000 (22:35 +0100)]
Merge commit '
fdfe01365d579189d9a55b3741dba2ac46eb1df8'
* commit '
fdfe01365d579189d9a55b3741dba2ac46eb1df8':
hwcontext: allocate the destination frame for the pool size
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 13 Nov 2016 21:35:04 +0000 (22:35 +0100)]
Merge commit '
5fcae3b3f93fd02b3d1e009b9d9b17410fca9498'
* commit '
5fcae3b3f93fd02b3d1e009b9d9b17410fca9498':
hwcontext: clarify the behaviour of transfer_data() for cropped frames
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 13 Nov 2016 21:34:01 +0000 (22:34 +0100)]
doc/libav-merge: add skipped fixup commits to the list of missing changes
Hendrik Leppkes [Sun, 13 Nov 2016 21:33:05 +0000 (22:33 +0100)]
Merge commit '
94ebf5565849e4dc036d2ca43979571ed3736457'
* commit '
94ebf5565849e4dc036d2ca43979571ed3736457':
avconv: restructure sending EOF to filters
Noop, as its a fixup to a previously skipped commit
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 13 Nov 2016 21:32:48 +0000 (22:32 +0100)]
Merge commit '
d2e56cf753a6c462041dee897d9d0c90f349988c'
* commit '
d2e56cf753a6c462041dee897d9d0c90f349988c':
avconv: move flushing the queued frames to configure_filtergraph()
Noop, as its a fixup to a previously skipped commit
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 13 Nov 2016 21:29:04 +0000 (22:29 +0100)]
Merge commit '
7a745f014f528d1001394ae4d2f4ed1a20bf7fa2'
* commit '
7a745f014f528d1001394ae4d2f4ed1a20bf7fa2':
options_table: Add aliases for color properties
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Anton Khirnov [Fri, 30 Sep 2016 19:21:46 +0000 (21:21 +0200)]
hwcontext_vaapi: add a quirk for the missing MemoryType attribute
The Intel binary iHD driver does not support the
VASurfaceAttribMemoryType, so surface allocation will fail when using
it.
(cherry picked from commit
2124711b950b03c582a119c75f52a87acc32d6ec)
Mark Thompson [Thu, 28 Jul 2016 22:28:30 +0000 (23:28 +0100)]
hwcontext_vaapi: Try the first render node as the default DRM device
If no string argument is supplied when av_hwdevice_ctx_create() is
called to create a VAAPI device, we currently only try the default
X11 display (that is, $DISPLAY) to find a device, and will therefore
fail in the absence of an X server to connect to. Change the logic
to also look for a device via the first DRM render node (that is,
"/dev/dri/renderD128"), which is probably the right thing to use in
most simple configurations which only have one DRM device.
(cherry picked from commit
121f34d5f0c8d7d376829a467590fbbe4c228f4f)
Mark Thompson [Sun, 26 Jun 2016 21:35:49 +0000 (22:35 +0100)]
vf_scale_vaapi: Respect driver quirks around buffer destruction
(cherry picked from commit
582d4211e00015b68626f77ce4af53161e2b1713)
Mark Thompson [Sun, 12 Jun 2016 16:28:28 +0000 (17:28 +0100)]
vaapi_encode: Respect driver quirks around buffer destruction
No longer leaks memory when used with a driver with the "render does
not destroy param buffers" quirk (i.e. Intel i965).
(cherry picked from commit
221ffca6314ed3ba9d38464ea50cd85251c04e74)
Fixes ticket #5871.
Mark Thompson [Sun, 12 Jun 2016 16:20:25 +0000 (17:20 +0100)]
hwcontext_vaapi: Add driver quirks to the hwdevice
The driver being used is detected inside av_hwdevice_ctx_init() and
the quirks field then set from a table of known device. If this
behaviour is unwanted, the user can also set the quirks field
manually.
Also adds the Intel i965 driver quirk (it does not destroy parameter
buffers used in a call to vaRenderPicture()) and detects that driver
to set it.
(cherry picked from commit
4926fa9a4aa03f3b751f52e900b9efb87fea0591)
Andreas Cadhalpun [Sun, 13 Nov 2016 17:22:12 +0000 (18:22 +0100)]
filmstripdec: correctly check image dimensions
This prevents a division by zero in read_packet.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Mark Thompson [Sun, 13 Nov 2016 15:37:52 +0000 (15:37 +0000)]
ffmpeg_qsv: Fix hwaccel transcoding
Set up the encoder with a hardware context which will match the one
the decoder will use when it starts later.
Includes
02c2761973dfc886e94a60a9c7d6d30c296d5b8c, with additional
hackery to get around
a3a0230a9870b9018dc7415ae5872784d524cfe5 being
skipped.
Hendrik Leppkes [Sun, 13 Nov 2016 17:38:16 +0000 (18:38 +0100)]
Merge commit '
444a36269f853844369af0a9836507e5a2780323'
* commit '
444a36269f853844369af0a9836507e5a2780323':
pixdesc: Fix AVCOL_TRC_BT2020_12 name
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 13 Nov 2016 17:32:07 +0000 (18:32 +0100)]
Merge commit '
f172e22d6aed0bff36e975bafb0183b6779f9444'
* commit '
f172e22d6aed0bff36e975bafb0183b6779f9444':
pixdesc: Add aliases to SMPTE color properties
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 13 Nov 2016 16:38:40 +0000 (17:38 +0100)]
Merge commit '
8a62d2c28fbacd1ae20c35887a1eecba2be14371'
* commit '
8a62d2c28fbacd1ae20c35887a1eecba2be14371':
vaapi_encode: Maintain a pool of bitstream output buffers
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 13 Nov 2016 16:33:31 +0000 (17:33 +0100)]
Merge commit '
bd31c61cf94d01dbe1051cf65874e7b2c0ac5454'
* commit '
bd31c61cf94d01dbe1051cf65874e7b2c0ac5454':
avconv: Remove hw_device_ctx output filter reinit hack
Noop, since our hwaccel infrastructure still requires this.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 13 Nov 2016 16:30:33 +0000 (17:30 +0100)]
Merge commit '
4a081f224e12f4227ae966bcbdd5384f22121ecf'
* commit '
4a081f224e12f4227ae966bcbdd5384f22121ecf':
libavcodec: fix constness in clobber test avcodec_open2() wrappers
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 13 Nov 2016 16:29:01 +0000 (17:29 +0100)]
doc: update merge status for recent additions and skipped merges
Hendrik Leppkes [Sun, 13 Nov 2016 16:26:53 +0000 (17:26 +0100)]
Merge commit '
02c2761973dfc886e94a60a9c7d6d30c296d5b8c'
* commit '
02c2761973dfc886e94a60a9c7d6d30c296d5b8c':
avconv_qsv: use the device creation API
Not merged, our ffmpeg hwaccel infra is not quite the same as avconvs.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 13 Nov 2016 16:25:23 +0000 (17:25 +0100)]
Merge commit '
232399e3ee219d16d0e0d482c9f31a26202d4993'
* commit '
232399e3ee219d16d0e0d482c9f31a26202d4993':
avconv: pass the hwaccel frames context to the decoder
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 13 Nov 2016 16:25:05 +0000 (17:25 +0100)]
Merge commit '
a3a0230a9870b9018dc7415ae5872784d524cfe5'
* commit '
a3a0230a9870b9018dc7415ae5872784d524cfe5':
avconv: init filtergraphs only after we have a frame on each input
This commit is a noop since it doesn't apply cleanly due to differences
in the dataflow between avconv and ffmpeg, and thus fixing this in the
scope of a merge is unfeasible.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 13 Nov 2016 16:23:57 +0000 (17:23 +0100)]
Merge commit '
3e265ca58f0505470186dce300ab66a6eac3978e'
* commit '
3e265ca58f0505470186dce300ab66a6eac3978e':
avconv: do packet ts rescaling in write_packet()
This commit is a noop since it doesn't apply cleanly due to differences
in the dataflow between avconv and ffmpeg, and thus fixing this in the
scope of a merge is unfeasible.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 13 Nov 2016 14:33:39 +0000 (15:33 +0100)]
Merge commit '
50722b4f0cbc5940e9e6e21d113888436cc89ff5'
* commit '
50722b4f0cbc5940e9e6e21d113888436cc89ff5':
avconv: decouple configuring filtergraphs and setting output parameters
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 13 Nov 2016 14:17:00 +0000 (15:17 +0100)]
Merge commit '
ba7397baef796ca3991fe1c921bc91054407c48b'
* commit '
ba7397baef796ca3991fe1c921bc91054407c48b':
avconv: factor out initializing stream parameters for encoding
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Fri, 11 Nov 2016 13:47:49 +0000 (14:47 +0100)]
ffmpeg_filter: fix hwaccel transcoding
Based on a patch by Yogender Gupta <ygupta@nvidia.com>
Andreas Cadhalpun [Sat, 12 Nov 2016 22:45:52 +0000 (23:45 +0100)]
vp9_mc_template: limit assert to SCALED == 0
The handling of the other block sizes was limited to 'SCALED == 0' in
commit
dc96c0f9fc96bf4167633befc074394062793322, so this assert should
be disabled, too, as it can now be triggered.
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Hendrik Leppkes [Sat, 12 Nov 2016 00:37:57 +0000 (01:37 +0100)]
configure: use check_lib2 for cuda and cuvid
Fixes building for Windows x86 with MSVC using the link libraries distributed with the CUDA SDK.
check_lib2 is required here because it includes the header to get the full signature of the
function, including the stdcall calling convention and all of its arguments, which enables
the linker to determine the fully qualified object name and resolve it through the import
library, since the CUDA SDK libraries do not include un-qualified aliases.
Vlad Tarca [Thu, 2 Jun 2016 14:28:13 +0000 (16:28 +0200)]
avformat: Add Pro-MPEG CoP #3-R2 FEC protocol
Pro-MPEG Code of Practice #3 release 2 forward error correction for rtp_mpegts streams
Signed-off-by: Vlad Tarca <vtarca@mobibase.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Nicolas George [Tue, 30 Aug 2016 13:28:41 +0000 (15:28 +0200)]
lavfi: split frame_count between input and output.
AVFilterLink.frame_count is supposed to count the number of frames
that were passed on the link, but with min_samples, that number is
not always the same for the source and destination filters.
With the addition of a FIFO on the link, the difference will become
more significant.
Split the variable in two: frame_count_in counts the number of
frames that entered the link, frame_count_out counts the number
of frames that were sent to the destination filter.
Nicolas George [Tue, 30 Aug 2016 18:12:20 +0000 (20:12 +0200)]
fate/colorkey: disable audio stream.
The test is not supposed to cover audio.
Also, using -vframes along with an audio stream depends on
the exact order the frames are processed by filters, it is
too much constraint to guarantee.
Marton Balint [Sun, 13 Nov 2016 01:32:09 +0000 (02:32 +0100)]
lavfi/ebur128: specify scaling_factor directly
This should fix build with Solaris CC.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 12 Nov 2016 01:07:24 +0000 (02:07 +0100)]
lavf/fifo: fix undefined behaviour in deinit when destroying mutex
Reviewed-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 12 Nov 2016 00:38:25 +0000 (01:38 +0100)]
ffmpeg: add newline to avformat_write_header error message
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
James Almer [Sat, 12 Nov 2016 23:52:22 +0000 (20:52 -0300)]
avformat/mov: zero initialize codec_name in mov_parse_stsd_video()
Fixes valgrind warning about "Conditional jump or move depends on uninitialised value(s)"
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 12 Nov 2016 23:09:00 +0000 (20:09 -0300)]
fate: fix fate-api dependencies
No need to run the whole fate-lavf set. fate-lavf-flv_fmt is enough to
create the required source file.
Signed-off-by: James Almer <jamrial@gmail.com>
Robert Nagy [Fri, 11 Nov 2016 13:56:00 +0000 (21:56 +0800)]
increment initial_prog_date_time when removing old segments
Fixes https://trac.ffmpeg.org/ticket/5940#ticket
Reviewed-by: Michael Niedermayer <<michael@niedermayer.cc>>
Signed-off-by: Robert Nagy <ronag89@gmail.com>
Signed-off-by: Steven Liu <lingjiujianke@gmail.com>
Michael Niedermayer [Fri, 11 Nov 2016 01:25:42 +0000 (02:25 +0100)]
avcodec/htmlsubtitles: Fix reading one byte beyond the array
Fixes: fuzz-2-ffmpeg_SUBTITLE_AV_CODEC_ID_SUBRIP_fuzzer
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Andreas Cadhalpun [Wed, 9 Nov 2016 00:09:35 +0000 (01:09 +0100)]
pnmdec: make sure v is capped by maxval
Otherwise put_bits can be called with a value that doesn't fit in the
sample_len, causing an assertion failure.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>