summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* lavfi/framesync2: rename all conflicting symbols.Nicolas George2017-07-302-36/+36
|
* lavfi: copy framesync into framesync2.Nicolas George2017-07-302-0/+640
| | | | | | | framesync2 will be the base for the version using activate. Most of the logic will be the same, but the code cannot be shared. Copying the file initially without change will make the diff easier to read.
* Revert "Revert "lavfi/buffersrc: push the frame deeper if requested.""Nicolas George2017-07-303-4/+29
| | | | | | | | | | | This reverts commit 04aa09c4bcf2d5a634a35da3a3ae3fc1abe30ef8 and reintroduces 0ff5567a30be6d7c804e95997ae282d6bacd76c3 that was temporarily reverted due to minor regressions. It also reverts e5bce8b4ce7b1f3a83998febdfa86a3771df96ce that fixed FATE refs. The fate-ffm change is caused by field_order now being set on the output format because the first frame arrives earlier. The fate-mxf change is assumed to be the same.
* mdct15: add inverse transform postrotation SIMDRostislav Pehlivanov2017-07-304-20/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | 2.5ms frames: Before (c): 2638 decicycles in postrotate, 2097040 runs, 112 skips After (sse3): 1467 decicycles in postrotate, 2097083 runs, 69 skips After (avx2): 1244 decicycles in postrotate, 2097085 runs, 67 skips 5ms frames: Before (c): 4987 decicycles in postrotate, 1048371 runs, 205 skips After (sse3): 2644 decicycles in postrotate, 1048509 runs, 67 skips After (avx2): 2031 decicycles in postrotate, 1048523 runs, 53 skips 10ms frames: Before (c): 9153 decicycles in postrotate, 523575 runs, 713 skips After (sse3): 5110 decicycles in postrotate, 523726 runs, 562 skips After (avx2): 3738 decicycles in postrotate, 524223 runs, 65 skips 20ms frames: Before (c): 17857 decicycles in postrotate, 261866 runs, 278 skips After (sse3): 10041 decicycles in postrotate, 261746 runs, 398 skips After (avx2): 7050 decicycles in postrotate, 262116 runs, 28 skips Improves total decoding performance for real world content by 9% with avx2. Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* lavc/makefile: Add missing file dependencies.Matt Oliver2017-07-301-5/+5
| | | | | | | | | ac3dsp.c uses tables from ac3.c ac3.c uses tables from ac3tab.c hevc_ps uses tables from hevc_data.c intrax8.c uses tables from msmpeg4data.c Signed-off-by: Matt Oliver <protogonoi@gmail.com>
* lavf/os_support: Use existing WinRT config value.Matt Oliver2017-07-301-13/+1
| | | | Signed-off-by: Matt Oliver <protogonoi@gmail.com>
* win32_dlfcn: Support WinRT/UWP.Matt Oliver2017-07-301-1/+11
| | | | | | | | | This only enables dlls that are packaged with the application to be loaded. Due to the limitations of WinRT/UWP it is not allowed to load external/system dlls so this cannot be used as a complete replacement for normal win32 dll loading. Signed-off-by: Matt Oliver <protogonoi@gmail.com>
* examples/hw_decode: Add a HWAccel decoding example.Jun Zhao2017-07-304-0/+270
| | | | | | | | | Works with VAAPI, VDPAU, DXVA2 and D3D11VA. Signed-off-by: Liu, Kaixuan <kaixuan.liu@intel.com> Signed-off-by: Jun Zhao <jun.zhao@intel.com> Reviewed-by: Steven Liu <lingjiujianke@gmail.com> Signed-off-by: Mark Thompson <sw@jkqxz.net>
* avcodec/dirac_dwt: Fix multiple integer overflows in COMPOSE_DD97iH0()Michael Niedermayer2017-07-291-1/+1
| | | | | | | | Fixes: runtime error: signed integer overflow: 9 * 335544320 cannot be represented in type 'int' Fixes: 2739/clusterfuzz-testcase-minimized-6737297955356672 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/diracdec: Fix integer overflow in divide3()Michael Niedermayer2017-07-291-1/+1
| | | | | | | | Fixes: runtime error: signed integer overflow: -1073746548 * 21845 cannot be represented in type 'int' Fixes: 2729/clusterfuzz-testcase-minimized-5902915464069120 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/takdec: Fix integer overflow in decode_subframe()Michael Niedermayer2017-07-291-1/+1
| | | | | | | | Fixes: runtime error: signed integer overflow: -536870912 - 1972191120 cannot be represented in type 'int' Fixes: 2711/clusterfuzz-testcase-minimized-4975142398590976 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/rtmppkt: Convert ff_amf_get_field_value() to bytestream2Michael Niedermayer2017-07-291-20/+37
| | | | | | | Fixes: out of array accesses Found-by: JunDong Xie of Ant-financial Light-Year Security Lab Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/rtmppkt: Convert ff_amf_tag_size() to bytestream2Michael Niedermayer2017-07-291-20/+48
| | | | | | | | Fixes: out of array accesses Fixes: crash-9238fa9e8d4fde3beda1f279626f53812cb001cb-SEGV Found-by: JunDong Xie of Ant-financial Light-Year Security Lab Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* libavcodec/mips: Improve avc dequant-idct luma dc msa functionKaustubh Raste2017-07-291-34/+32
| | | | | | Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com> Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/diracdec: Fix integer overflow in signed multiplication in ↵Michael Niedermayer2017-07-281-1/+2
| | | | | | | | | | UNPACK_ARITH() Fixes: runtime error: signed integer overflow: 1073741823 * 4 cannot be represented in type 'int' Fixes: 2729/clusterfuzz-testcase-minimized-5902915464069120 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/pixlet: Simplify nbits computationMichael Niedermayer2017-07-281-2/+2
| | | | | | | | | Fixes multiple integer overflows Fixes: runtime error: signed integer overflow: 1 + 2147483647 cannot be represented in type 'int' Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* pthread_frame: revert 2e664b9c1e73c80aab91070c1eb7676f04bdd12d.Wan-Teh Chang2017-07-271-2/+4
| | | | | | | | The patch does not fix the tsan warning it was intended to fix. Reverting the patch moves the av_log() back to the outside of the lock. Signed-off-by: Wan-Teh Chang <wtc@google.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* avcodec/h264_slice: don't sync default_ref[] between threads.Wan-Teh Chang2017-07-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | default_ref[] is unconditionally initialized in h264_initialise_ref_list() (called from ff_h264_build_ref_list(), called from h264_slice_init()). This fixes the following tsan warning when running fate-h264: WARNING: ThreadSanitizer: data race (pid=31070) Write of size 8 at 0x7bbc000082a8 by thread T1 (mutexes: write M1628): #0 memcpy /work/release-test/final/llvm.src/projects/compiler-rt/lib/tsan/../sanitizer_common/sanitizer_common_interceptors.inc:655:5 (ffmpeg+0x10de9d) #1 h264_initialise_ref_list ffmpeg/libavcodec/h264_refs.c:214:29 (ffmpeg+0x1186b3f) #2 ff_h264_build_ref_list ffmpeg/libavcodec/h264_refs.c:306 (ffmpeg+0x1186b3f) #3 h264_slice_init ffmpeg/libavcodec/h264_slice.c:1900:11 (ffmpeg+0x1191149) [..] Previous read of size 8 at 0x7bbc000082a8 by main thread (mutexes: write M1630): #0 memcpy /work/release-test/final/llvm.src/projects/compiler-rt/lib/tsan/../sanitizer_common/sanitizer_common_interceptors.inc:655:5 (ffmpeg+0x10de9d) #1 ff_h264_update_thread_context ffmpeg/libavcodec/h264_slice.c:411:5 (ffmpeg+0x118b7dc) Signed-off-by: Wan-Teh Chang <wtc@google.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* doc/APIChanges: add missing entry for ICC Profile side data type.James Almer2017-07-271-0/+3
|
* avcodec/dnxhdenc: enable frame threadingPaul B Mahol2017-07-271-1/+1
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* fate: update pixfmt_best test to check for endiannessTobias Rapp2017-07-272-1/+15
| | | | Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
* avcodec/dnxhddec: Move mb height check out of non hr branchMichael Niedermayer2017-07-271-2/+6
| | | | | | | | Fixes: out of array access Fixes: poc.dnxhd Found-by: Bingchang, Liu@VARAS of IIE Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* pngdec: fix potential memory leakRostislav Pehlivanov2017-07-261-1/+4
| | | | | | Fixes CID1412026. Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* avcodec/jpeg2000dec: Fix h/vden typoMichael Niedermayer2017-07-271-1/+1
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/s337m: fix potentially undefined pointer arithmeticfoo862017-07-261-10/+10
| | | | | Use integer position instead of pointer for loop variable. Also only skip header fields after header has been fully validated.
* avcodec/dolby_e: fix potentially undefined pointer arithmeticfoo862017-07-261-17/+28
| | | | | | | | Avoid undefined behavior in skip_input() by checking that enough data is available before incrementing input pointer. Check return values of parse_key() and skip_input() and exit early with error if there is not enough data.
* avcodec/dolby_e: add AV_CODEC_CAP_CHANNEL_CONF capabilityfoo862017-07-261-1/+1
|
* avcodec/dolby_e: add 'f' suffixes to floating point literalsfoo862017-07-261-17/+17
|
* lavc/htmlsubtitles: simplify 1-char tags case insensitive testClément Bœsch2017-07-261-1/+1
|
* avcodec/jpeg2000dec: Fix division by zero in jp2_find_codestream()Michael Niedermayer2017-07-261-0/+5
| | | | | | | Fixes: 2707/clusterfuzz-testcase-minimized-5179636394754048 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/hevc_ps: fix integer overflow in log2_parallel_merge_level_minus2Michael Niedermayer2017-07-261-3/+5
| | | | | | | | Fixes: runtime error: signed integer overflow: -2147483647 - 2 cannot be represented in type 'int' Fixes: 2702/clusterfuzz-testcase-minimized-4511932591636480 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/webp: add support for ICCP chunksJames Almer2017-07-261-2/+24
| | | | | | | Export the raw data as ICC Profile frame side data. Reviwed-by: Rostislav Pehlivanov <atomnuker@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* ffprobe: add support for ICC Profile frame side dataJames Almer2017-07-261-0/+5
| | | | | | | Print the name metadata entry and the buffer size. Reviwed-by: Rostislav Pehlivanov <atomnuker@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* avutil/frame: add ICC Profile to av_frame_side_data_nameJames Almer2017-07-261-0/+1
| | | | | Reviwed-by: Rostislav Pehlivanov <atomnuker@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/rdft: reorder calculationMuhammad Faiz2017-07-261-6/+8
| | | | | | | | | | | old: 165188 decicycles in rdft, 65536 runs, 0 skips 165865 decicycles in irdft, 65536 runs, 0 skips new: 142487 decicycles in rdft, 65536 runs, 0 skips 141498 decicycles in irdft, 65536 runs, 0 skips Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* avformat/oggparsecelt: Do not re-allocate os->privateMichael Niedermayer2017-07-251-2/+7
| | | | | | | | | Fixes: double free Fixes: clusterfuzz-testcase-minimized-5080550145785856 Found-by: ClusterFuzz Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* libavcodec/mips: Optimize avc idct 4x4 for msaKaustubh Raste2017-07-252-48/+74
| | | | | | | | Removed memset call and improved performance. Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com> Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* mdct15: simplify prereindexing and forward transform postrotationRostislav Pehlivanov2017-07-251-19/+18
| | | | | | Equivalent. Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* pngdec: decode and expose iCCP chunks as side dataRostislav Pehlivanov2017-07-251-0/+45
| | | | Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* lavu/frame: add new side data type for ICC profilesRostislav Pehlivanov2017-07-252-1/+8
| | | | | | | | Many image formats support embedding of ICC profiles directly in their bitstreams. Add a new side data type to allow exposing them to API users. Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* lavfi/testsrc2: fix completely transparent alpha.Nicolas George2017-07-252-3/+14
|
* avcodec/mpegvideo_enc: fix mixed declarations and code warningJames Almer2017-07-251-1/+1
|
* avformat/hlsenc: improve hls encrypt get key file operationSteven Liu2017-07-251-6/+9
| | | | | | | | get key file only once time is ok, no need more times. Ticket-id: #6545 Found-by: JohnPi Signed-off-by: Steven Liu <lq@onvideo.cn>
* avcodec/ylc: Fix shift overflowMichael Niedermayer2017-07-241-1/+1
| | | | | | | | Fixes: runtime error: shift exponent 32 is too large for 32-bit type 'unsigned int' Fixes: 2698/clusterfuzz-testcase-minimized-4713541443518464 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/aacps: Fix multiple integer overflow in map_val_34_to_20()Michael Niedermayer2017-07-241-4/+4
| | | | | | | | Fixes: avcodec/aacps.c:511:40: runtime error: signed integer overflow: 1509077651 + 758068176 cannot be represented in type 'int' Fixes: 2678/clusterfuzz-testcase-minimized-4702787684270080 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavf/movenc: support GPMF track (gpmd) remuxingClément Bœsch2017-07-242-0/+30
| | | | | See https://github.com/gopro/gpmf-parser for more information on the data stream itself.
* avformat/hlsenc: fix hls fmp4 extention name bugSteven Liu2017-07-241-6/+41
| | | | | | | | | ticket-id: #6541 when use hls fmp4 muxer, the extention name is not .m4s, this code can fix it. Found-by: JohnPi Signed-off-by: Steven Liu <lq@onvideo.cn>
* avcodec/mpegvideo_enc: Use intra/inter scantable matching mb type in ↵Michael Niedermayer2017-07-241-5/+15
| | | | | | quantization Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/aacdec_fixed: fix: left shift of negative value -1Michael Niedermayer2017-07-241-1/+1
| | | | | | | Fixes: 2699/clusterfuzz-testcase-minimized-5631303862976512 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/dirac_vlc: Fix undefined shiftMichael Niedermayer2017-07-241-2/+7
| | | | | | | | Fixes: runtime error: shift exponent 64 is too large for 64-bit type 'residual' (aka 'unsigned long') Fixes: 2674/clusterfuzz-testcase-minimized-4999700518273024 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
OpenPOWER on IntegriCloud