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
91,065 Commits 37 Branches 400 Tags 465 MiB
d628caf54f
Commit Graph

91065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
5c70513418 avformat/mxfenc: Correct KAG alignment of preface 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-05-08 23:02:58 +02:00
Hendrik Leppkes
8007a86363 lavfi/vf_srcnn: use avio_check instead of access 
The filter uses avio for file access already, and avio_check is
portable.

Fixes trac #7192.
 2018-05-08 17:52:33 +02:00
Clément Bœsch
6876a63368 lavc/cfhd: use AV_CEIL_RSHIFT instead of deprecated FF_CEIL_RSHIFT 2018-05-08 12:47:38 +02:00
Clément Bœsch
1eb4e731fc lavfi/swaprect: use AV_CEIL_RSHIFT instead of deprecated FF_CEIL_RSHIFT 2018-05-08 12:47:38 +02:00
Clément Bœsch
8d6354aa82 lavfi/nlmeans: use AV_CEIL_RSHIFT instead of deprecated FF_CEIL_RSHIFT 2018-05-08 12:47:38 +02:00
Martin Vignali
6ebc71847e fate/hapenc : remove tests due to inconsistent result 2018-05-08 11:44:34 +02:00
Clément Bœsch
e6114d21ac lavfi/nlmeans: inline integral patch value function 
This prevents redundant position computation and make the code faster
(1.1x faster overall).
 2018-05-08 10:28:06 +02:00
Clément Bœsch
4278f79ef6 lavfi/nlmeans: use unsigned for the integral patch value 
This value can not be negative.
 2018-05-08 10:28:06 +02:00
Clément Bœsch
de956198a9 lavfi/nlmeans: reorder memory accesses in get_integral_patch_value 
This doesn't seem to make much of a difference but it can't hurt.
 2018-05-08 10:28:06 +02:00
Clément Bœsch
34e1e53e28 lavfi/nlmeans: move final weighted averaging out of nlmeans_plane 
This helps figuring out where the filter is slow:

  70.53%  ffmpeg_g  ffmpeg_g          [.] nlmeans_slice
  25.73%  ffmpeg_g  ffmpeg_g          [.] compute_safe_ssd_integral_image_c
   1.74%  ffmpeg_g  ffmpeg_g          [.] compute_unsafe_ssd_integral_image
   0.82%  ffmpeg_g  ffmpeg_g          [.] ff_mjpeg_decode_sos
   0.51%  ffmpeg_g  [unknown]         [k] 0xffffffff91800a80
   0.24%  ffmpeg_g  ffmpeg_g          [.] weight_averages

(Tested with a large image that takes several seconds to process)

Since this function is irrelevant speed wise, the file's TODO is
updated.
 2018-05-08 10:28:06 +02:00
Clément Bœsch
667503ef68 lavfi/nlmeans: switch from double to float 
Overall speed appears to be 1.1x faster with no noticeable quality
impact.
 2018-05-08 10:28:06 +02:00
Clément Bœsch
43d16aef63 lavfi/nlmeans: make compute_safe_ssd_integral_image_c faster 
before:  ssd_integral_image_c: 49204.6
after:   ssd_integral_image_c: 44272.8

Unrolling by 4 made the biggest difference on odroid-c2 (aarch64);
unrolling by 2 or 8 both raised 46k cycles vs 44k for 4.

Additionally, this is a much better reference when writing SIMD (SIMD
vectorization will just target 16 instead of 4).
 2018-05-08 10:28:06 +02:00
Clément Bœsch
f679711c1b checkasm: add vf_nlmeans test for ssd_integral_image 2018-05-08 10:28:06 +02:00
Clément Bœsch
5a71bce371 lavfi/nlmeans: add AArch64 SIMD for compute_safe_ssd_integral_image 
ssd_integral_image_c: 49204.6
ssd_integral_image_neon: 28346.8
 2018-05-08 10:28:06 +02:00
Clément Bœsch
5ba14f4f1a lavfi/nlmeans: use ptrdiff_t for linesizes 
Similarly to previous commit, this will help writing SIMD code by not
having manual zero-extension in SIMD code
 2018-05-08 10:28:06 +02:00
Clément Bœsch
26f02c51ce lavfi/nlmeans: add SIMD-friendly assumptions for compute_safe_ssd_integral_image 
SIMD code will not have to deal with padding itself. Overwriting in that
function may have been possible but involve large overreading of the
sources. Instead, we simply make sure the width to process is always a
multiple of 16. Additionally, there must be some actual area to process
so the SIMD code can have its boundary checks after processing the first
pixels.
 2018-05-08 10:28:06 +02:00
Clément Bœsch
f1248b7795 lavfi/nlmeans: random code shuffling to help compiler 
This makes nlmeans_slice() slightly faster at least on GCC 7.3.
 2018-05-08 10:28:06 +02:00
Gyan Doshi
0683ad709b avformat/segafilmenc - set keyframe bit correctly 
As per
https://web.archive.org/web/20020803104640/http://www.pcisys.net:80/~melanson/codecs/film-format.txt,

the top bit of the info1 chunk is set as 1 for inter-coded frames and 0
otherwise.
 2018-05-08 13:29:15 +05:30
Rostislav Pehlivanov
29eb1c51d7 mdct15: simplify x86 exptab permutation 
Removes an unneeded copy and does the 5-point permute in-place.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2018-05-07 23:44:40 +01:00
Rostislav Pehlivanov
a72d0fb973 mdct15: simplify the fft15 x86 SIMD 
Saves 1 gpr and 2 instructions and simplifies the macros a bit.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2018-05-07 23:27:41 +01:00
Haihao Xiang
1b0e0578c2 vaapi_encode_vp8: memset the the structure to 0 
The structure has reserved bytes, it is required to set the reserved
bytes to 0 for future use.

Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
 2018-05-07 21:32:47 +01:00
Haihao Xiang
65be65da37 cbs_h264: Need [] in the name when subscript is required 
Otherwise it will hit an assert in the function
ff_cbs_trace_syntax_element() in cbs.c, line 400.

Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
 2018-05-07 21:32:41 +01:00
Zhong Li
06344f705e lavc/qsvenc: set corret maximum value of look_ahead_downsampling 
Option "4x(MFX_LOOKAHEAD_DS_4x)" is provided but can't be set due to
wrong maximum value.

Signed-off-by: Zhong Li <zhong.li@intel.com>
 2018-05-07 21:32:34 +01:00
James Almer
0736f32a4f configure: fix and simplify xlib check 
Signed-off-by: James Almer <jamrial@gmail.com>
 2018-05-06 20:46:32 -03:00
James Almer
652b857b94 configure: add missing dependencies to vf_srcnn 
The access dependecy is temporary and should fix compilation with
msvc until a proper fix is committed.

Signed-off-by: James Almer <jamrial@gmail.com>
 2018-05-06 17:23:29 -03:00
Marton Balint
ab7692ee35 avcodec/libzvbi-teletextdec: remove DEBUG code 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2018-05-06 21:57:24 +02:00
Marton Balint
03038d4da9 avcodec/libzvbi-teletextdec: allow -1 subtitle duration and make it the default 
Most decoders (pgssubdec, ccaption_dec) are using -1 or UINT32_MAX for a
subtitle event which should be cleared at the next event.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2018-05-06 21:57:22 +02:00
Michael Niedermayer
652ba72ed3 avcodec/jpeg2000dec: Fix undefined shift in the jpeg2000_decode_packets_po_iteration() CPRL case 
Fixes: shift exponent 47 is too large for 32-bit type 'int'
Fixes: 7955/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-6016721977606144

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-05-06 21:02:04 +02:00
Michael Niedermayer
a96c131eb5 avcodec/jpeg2000dec: Skip init for component in CPRL if nothing is to be done 
Fixes: assertion failure
Fixes: 7949/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-4819602782552064

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-05-06 21:02:04 +02:00
Michael Niedermayer
3543522d20 avcodec/jpeg2000dec: Reduce the number of tile parts allocated 
This is large enough for all jpeg2000 files i tested. If some need more then this
should be changed to dynamic allocation. Dynamic allocation would need to be done
carefully as these are many relatively small arrays so repeatly reallocating them
would not be good.
The decrease is a clean and simple solution assuming it works for all files.

Fixes: OOM
Fixes: 6534/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-4821490731057152

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-05-06 21:02:04 +02:00
Michael Niedermayer
0a47451458 avcodec/g2meet: Change order of operations to avoid undefined behavior 
Fixes: signed integer overflow: 65280 * 196032 cannot be represented in type 'int'
Fixes: 7279/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_G2M_fuzzer-5977332473921536

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-05-06 21:02:04 +02:00
Jan Ekström
8d1263fa19 configure: add pkg-config check for zlib 
It exists, so why not use it? Helps one get rid of additional
search path related flags in addition to PKG_CONFIG_{PATH,LIBDIR}
when utilizing a cross-prefix separate from the sysroot.
 2018-05-06 20:47:42 +03:00
Jan Ekström
b995ec078f lavf/bluray: translate a read of 0 to EOF 
Yet another case of forgotten 0 =! EOF translation. The libbluray
documentation specifically mentions that a read of 0 is EOF.

Reported by Fyr on IRC.
 2018-05-06 18:51:33 +03:00
Jun Zhao
053ee996a0 lavf/format: Remove the dead code in av_probe_input_buffer2. 
Remove the dead code in av_probe_input_buffer2

Signed-off-by: Jun Zhao <mypopydev@gmail.com>
 2018-05-06 15:07:28 +08:00
Jun Zhao
4d3e9e3135 avformat/avio: make the logic simple 
remove the "ret" to make the code simple and generic.

Signed-off-by: Jun Zhao <mypopydev@gmail.com>
 2018-05-06 15:07:28 +08:00
James Almer
08032331ac fate: update fate-sws-pixdesc-query reference file 
Signed-off-by: James Almer <jamrial@gmail.com>
 2018-05-05 19:20:38 -03:00
Paul B Mahol
a26367493c fate: update pad pixfmt test 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2018-05-05 22:05:07 +02:00
Paul B Mahol
72b29c02f4 avfilter/drawutils: support gray14 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2018-05-05 21:50:22 +02:00
Paul B Mahol
41ebbae9dd avfilter/vf_extractplanes: add support for extracting planes with 14 depth 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2018-05-05 21:35:31 +02:00
Paul B Mahol
b9dd058f7a swscale: add gray14 support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2018-05-05 21:35:31 +02:00
Paul B Mahol
aef93c6aa5 avutil: add gray14 pixel format 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2018-05-05 21:35:31 +02:00
Paul B Mahol
20a3c4f606 avfilter: forward status back in some filters that missed it 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2018-05-05 21:32:33 +02:00
Paul B Mahol
ac86011b1f avfilter/af_amerge: port to activate API 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2018-05-05 21:32:33 +02:00
Rostislav Pehlivanov
d05c3b9cee mpegvideo: add deprecated flags to the rc_strategy option 
Forgotten with the commit which removed support for libxvid_rc.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2018-05-05 20:15:31 +01:00
Rostislav Pehlivanov
c1b282dc74 dcaenc: fix segfault when attempting to encode with invalid samplerate 
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2018-05-05 19:41:30 +01:00
Rostislav Pehlivanov
a1c6fc773f mpegvideo: remove support for libxvid's RC system 
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2018-05-05 19:41:30 +01:00
Paul B Mahol
0f4ca420bc avfilter/vf_colorchannelmixer: add planar rgb support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2018-05-05 17:37:50 +02:00
Paul B Mahol
931e2c4541 avfilter/vf_colorchannelmixer: refactor code 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2018-05-05 17:37:50 +02:00
Paul B Mahol
2017b4b1c2 avfilter/vf_colorbalance: fix off by one overflow 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2018-05-05 17:37:50 +02:00
Paul B Mahol
d1e1872418 avfilter/vf_colorchannelmixer: add slice threading 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2018-05-05 17:37:50 +02:00