aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fate/flvenc: set bitexact output format flag explicitlyJames Almer2017-08-301-1/+1
| | | | | | Using the encoder flags to set the muxer in bitexact mode is deprecated. Signed-off-by: James Almer <jamrial@gmail.com>
* ffmpeg_opt: add proper deprecation guards to lowres codeJames Almer2017-08-301-1/+3
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* fate/pixlet : add test for rgbMartin Vignali2017-08-313-0/+12
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter/vf_mcdeint: remove usage of deprecated AVCodecContext.me_methodJames Almer2017-08-301-1/+1
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* avfilter/af_adelay: remove requirement that at least one delay should be ↵Paul B Mahol2017-08-302-6/+0
| | | | | | | | provided Such requirement is not necessary and code works without it just fine. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* postproc: remove usage of deprecated QP_STORE_T defineJames Almer2017-08-303-11/+11
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* avfilter/vf_mcdeint: free the AVCodecContext struct properlyJames Almer2017-08-301-4/+1
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* fate: stop using deprecated filter syntax in hls testsJames Almer2017-08-301-3/+3
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* fate: remove usage of deprecated AVCodecContext.me_method in vsynth snow testsJames Almer2017-08-301-2/+2
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* configure: require pkg-config for libvmafAshish Singh2017-08-301-2/+1
| | | | | | | | This patch makes the libvmaf filter use pkg-config to detect and link to libvmaf. Signed-off-by: Ashish Singh <ashk43712@gmail.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* avfilter/vf_libvmaf: fix pre convert to framesync2 bugsAshish Singh2017-08-301-6/+4
| | | | | | | | | | Hi, it fixes the errors while converting to framesync2. libvmaf was changed recently, double *score variable is removed in the new version since it's not used anywhere. This patch fixes all the warnings and segmentation faults. Signed-off-by: Ashish Singh <ashk43712@gmail.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* avcodec/codec_desc: make FITS description longerPaul B Mahol2017-08-301-1/+1
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/vf_lut2: add framesync optionsPaul B Mahol2017-08-301-5/+7
| | | | | | Also stop leaking memory. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* FATE: Add FITS testsParas Chadha2017-08-3022-0/+220
| | | | Signed-off-by: Paras Chadha <paraschadha18@gmail.com>
* Add FITS MuxerParas Chadha2017-08-304-1/+187
| | | | Signed-off-by: Paras Chadha <paraschadha18@gmail.com>
* Add FITS EncoderParas Chadha2017-08-305-2/+133
| | | | Signed-off-by: Paras Chadha <paraschadha18@gmail.com>
* Add FITS DemuxerParas Chadha2017-08-304-1/+234
| | | | Signed-off-by: Paras Chadha <paraschadha18@gmail.com>
* Add FITS DecoderParas Chadha2017-08-3010-2/+616
| | | | Signed-off-by: Paras Chadha <paraschadha18@gmail.com>
* compat/cuda/ptx2c: strip CR from each lineRicardo Constantino2017-08-301-1/+1
| | | | | | | Windows nvcc + cl.exe produce a .ctx file with CR+LF newlines which need to be stripped to work with gcc. Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
* configure: add support for libnpp* from cuda sdk 9Timo Rothenpieler2017-08-301-1/+3
| | | | Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
* avformat/mxfenc: Replace literal numbers by named enum values.Michael Niedermayer2017-08-301-22/+61
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/snowdec: Fix integer overflow in decode_subband_slice_buffered()Michael Niedermayer2017-08-291-1/+1
| | | | | | | | Fixes: runtime error: signed integer overflow: 267 * 8388608 cannot be represented in type 'int' Fixes: 2743/clusterfuzz-testcase-minimized-5820652076400640 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 undefined shift in pcm codeMichael Niedermayer2017-08-291-3/+3
| | | | | | | | Fixes: runtime error: shift exponent -1 is negative Fixes: 3091/clusterfuzz-testcase-minimized-6229767969832960 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/h264idct_template: Fix integer overflow in ff_h264_idct8_add()Michael Niedermayer2017-08-291-14/+14
| | | | | | | | Fixes: 2891/clusterfuzz-testcase-minimized-5881795457318912 Fixes: runtime error: signed integer overflow: 1551827968 - -775913984 cannot be represented in type 'int' Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/mxfenc: Check that the video codec in D-10 is MPEG-2Michael Niedermayer2017-08-291-0/+4
| | | | | | | | Others do not work, but nothing rejects them prior to this patch if the parameters otherwise match Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavfi: bump minor version after change in options.Nicolas George2017-08-291-1/+1
|
* doc/filters: document framesync options.Nicolas George2017-08-292-31/+48
|
* lavfi: remove dualinput.Nicolas George2017-08-292-136/+0
|
* vf_ssim: convert to framesync2.Nicolas George2017-08-292-26/+28
|
* lavfi/vf_psnr: convert to framesync2.Nicolas George2017-08-292-24/+28
|
* lavfi/vf_paletteuse: convert to framesync2.Nicolas George2017-08-292-23/+39
|
* lavfi/vf_lut3d: convert to framesync2.Nicolas George2017-08-292-24/+27
|
* lavfi/vf_libvmaf: convert to framesync2.Nicolas George2017-08-292-21/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After this commit, the code compiles, but on my setup it segfaults before and after. It also prints the very worrying warning: src/libavfilter/vf_libvmaf.c:161:66: warning: passing argument 4 of ‘compute_vmaf’ from incompatible pointer type [-Wincompatible-pointer-types] /tmp/i/include/libvmaf.h:26:8: note: expected ‘int (*)(float *, float *, float *, int, void *)’ but argument is of type ‘int (*)(float *, float *, float *, int, double *, void *)’ ==12116== Thread 6: ==12116== Conditional jump or move depends on uninitialised value(s) ==12116== at 0x526D432: cons_ (ocval.h:1188) ==12116== by 0x526D432: GenericIT (ocval.h:1119) ==12116== by 0x526D432: OC::TranslateForNumPyClassesToArray(OC::Val&) (pickleloader.h:92) ==12116== by 0x5211F5D: loads (pickleloader.h:566) ==12116== by 0x5211F5D: LoadValFromArray (chooseser.h:290) ==12116== by 0x5211F5D: LoadValFromFile (chooseser.h:405) ==12116== by 0x5211F5D: _read_and_assert_model(char const*, OC::Val&, OC::Val&, OC::Val&, OC::Val&, OC::Val&, OC::Val&) (vmaf.cpp:77) ==12116== by 0x5212B0F: VmafRunner::run(Asset, int (*)(float*, float*, float*, int, void*), void*, bool, bool, bool, bool, bool) (vmaf.cpp:149) ==12116== by 0x52165B6: RunVmaf(char const*, int, int, int (*)(float*, float*, float*, int, void*), void*, char const*, char const*, char const*, bool, bool, bool, bool, bool, char const*) (vmaf.cpp:645) ==12116== by 0x518AFFF: compute_vmaf_score (vf_libvmaf.c:161) ==12116== by 0x518AFFF: call_vmaf (vf_libvmaf.c:170) ==12116== by 0x7967493: start_thread (pthread_create.c:333) ==12116== by 0x7F69A8E: clone (clone.S:97) ==12116== ==12116== Conditional jump or move depends on uninitialised value(s) ==12116== at 0x526D432: cons_ (ocval.h:1188) ==12116== by 0x526D432: GenericIT (ocval.h:1119) ==12116== by 0x526D432: OC::TranslateForNumPyClassesToArray(OC::Val&) (pickleloader.h:92) ==12116== by 0x526D50D: OC::TranslateForNumPyClassesToArray(OC::Val&) (pickleloader.h:94) ==12116== by 0x5211F5D: loads (pickleloader.h:566) ==12116== by 0x5211F5D: LoadValFromArray (chooseser.h:290) ==12116== by 0x5211F5D: LoadValFromFile (chooseser.h:405) ==12116== by 0x5211F5D: _read_and_assert_model(char const*, OC::Val&, OC::Val&, OC::Val&, OC::Val&, OC::Val&, OC::Val&) (vmaf.cpp:77) ==12116== by 0x5212B0F: VmafRunner::run(Asset, int (*)(float*, float*, float*, int, void*), void*, bool, bool, bool, bool, bool) (vmaf.cpp:149) ==12116== by 0x52165B6: RunVmaf(char const*, int, int, int (*)(float*, float*, float*, int, void*), void*, char const*, char const*, char const*, bool, bool, bool, bool, bool, char const*) (vmaf.cpp:645) ==12116== by 0x518AFFF: compute_vmaf_score (vf_libvmaf.c:161) ==12116== by 0x518AFFF: call_vmaf (vf_libvmaf.c:170) ==12116== by 0x7967493: start_thread (pthread_create.c:333) ==12116== by 0x7F69A8E: clone (clone.S:97) ==12116== ==12116== Conditional jump or move depends on uninitialised value(s) ==12116== at 0x526D432: cons_ (ocval.h:1188) ==12116== by 0x526D432: GenericIT (ocval.h:1119) ==12116== by 0x526D432: OC::TranslateForNumPyClassesToArray(OC::Val&) (pickleloader.h:92) ==12116== by 0x526D50D: OC::TranslateForNumPyClassesToArray(OC::Val&) (pickleloader.h:94) ==12116== by 0x526D50D: OC::TranslateForNumPyClassesToArray(OC::Val&) (pickleloader.h:94) ==12116== by 0x5211F5D: loads (pickleloader.h:566) ==12116== by 0x5211F5D: LoadValFromArray (chooseser.h:290) ==12116== by 0x5211F5D: LoadValFromFile (chooseser.h:405) ==12116== by 0x5211F5D: _read_and_assert_model(char const*, OC::Val&, OC::Val&, OC::Val&, OC::Val&, OC::Val&, OC::Val&) (vmaf.cpp:77) ==12116== by 0x5212B0F: VmafRunner::run(Asset, int (*)(float*, float*, float*, int, void*), void*, bool, bool, bool, bool, bool) (vmaf.cpp:149) ==12116== by 0x52165B6: RunVmaf(char const*, int, int, int (*)(float*, float*, float*, int, void*), void*, char const*, char const*, char const*, bool, bool, bool, bool, bool, char const*) (vmaf.cpp:645) ==12116== by 0x518AFFF: compute_vmaf_score (vf_libvmaf.c:161) ==12116== by 0x518AFFF: call_vmaf (vf_libvmaf.c:170) ==12116== by 0x7967493: start_thread (pthread_create.c:333) ==12116== by 0x7F69A8E: clone (clone.S:97) ==12116== ==12116== Use of uninitialised value of size 8 ==12116== at 0x518AC79: read_frame_8bit (vf_libvmaf.c:147) ==12116== by 0x52AB5E8: combo (combo.c:149) ==12116== by 0x5212E95: VmafRunner::run(Asset, int (*)(float*, float*, float*, int, void*), void*, bool, bool, bool, bool, bool) (vmaf.cpp:278) ==12116== by 0x52165B6: RunVmaf(char const*, int, int, int (*)(float*, float*, float*, int, void*), void*, char const*, char const*, char const*, bool, bool, bool, bool, bool, char const*) (vmaf.cpp:645) ==12116== by 0x518AFFF: compute_vmaf_score (vf_libvmaf.c:161) ==12116== by 0x518AFFF: call_vmaf (vf_libvmaf.c:170) ==12116== by 0x7967493: start_thread (pthread_create.c:333) ==12116== by 0x7F69A8E: clone (clone.S:97) ==12116== ==12116== Invalid read of size 4 ==12116== at 0x518AC79: read_frame_8bit (vf_libvmaf.c:147) ==12116== by 0x52AB5E8: combo (combo.c:149) ==12116== by 0x5212E95: VmafRunner::run(Asset, int (*)(float*, float*, float*, int, void*), void*, bool, bool, bool, bool, bool) (vmaf.cpp:278) ==12116== by 0x52165B6: RunVmaf(char const*, int, int, int (*)(float*, float*, float*, int, void*), void*, char const*, char const*, char const*, bool, bool, bool, bool, bool, char const*) (vmaf.cpp:645) ==12116== by 0x518AFFF: compute_vmaf_score (vf_libvmaf.c:161) ==12116== by 0x518AFFF: call_vmaf (vf_libvmaf.c:170) ==12116== by 0x7967493: start_thread (pthread_create.c:333) ==12116== by 0x7F69A8E: clone (clone.S:97) ==12116== Address 0x40 is not stack'd, malloc'd or (recently) free'd ==12116== ==12116== ==12116== Process terminating with default action of signal 11 (SIGSEGV) ==12116== Access not within mapped region at address 0x40 ==12116== at 0x518AC79: read_frame_8bit (vf_libvmaf.c:147) ==12116== by 0x52AB5E8: combo (combo.c:149) ==12116== by 0x5212E95: VmafRunner::run(Asset, int (*)(float*, float*, float*, int, void*), void*, bool, bool, bool, bool, bool) (vmaf.cpp:278) ==12116== by 0x52165B6: RunVmaf(char const*, int, int, int (*)(float*, float*, float*, int, void*), void*, char const*, char const*, char const*, bool, bool, bool, bool, bool, char const*) (vmaf.cpp:645) ==12116== by 0x518AFFF: compute_vmaf_score (vf_libvmaf.c:161) ==12116== by 0x518AFFF: call_vmaf (vf_libvmaf.c:170) ==12116== by 0x7967493: start_thread (pthread_create.c:333) ==12116== by 0x7F69A8E: clone (clone.S:97)
* lavfi/vf_blend: convert to framesync2.Nicolas George2017-08-292-23/+29
|
* lavfi/vf_overlay: use framesync2 options.Nicolas George2017-08-291-41/+4
|
* lavfi/framesync2: add common options.Nicolas George2017-08-292-3/+96
| | | | | Also add functions and macros to help filters chaining these options to their own.
* lavfi: search options on child objects.Nicolas George2017-08-291-2/+2
| | | | | The child objects must be allocated and inited in the preinit() callback.
* lavfi: add a preinit callback to filters.Nicolas George2017-08-292-0/+23
| | | | | It is necessary for filters with child objects, to set the class and default options values.
* lavfi/vf_overlay: move to framesync2.Nicolas George2017-08-292-33/+39
|
* lavfi/framesync2: add dualinput helper functions.Nicolas George2017-08-292-21/+103
|
* lavfi/f_streamselect: convert to framesync2.Nicolas George2017-08-292-22/+15
|
* avcodec/snowenc: fix setting motion_est optionJames Almer2017-08-282-5/+9
| | | | | | | | Remove usage of FF_MPV_COMMON_OPTS, and set SnowContext.motion_est directly. Based on code from svq1enc.c Signed-off-by: James Almer <jamrial@gmail.com> Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
* lavf/dump: Remove superfluous cast.Carl Eugen Hoyos2017-08-291-1/+1
|
* hevc: Add names for reserved NAL unit typesMark Thompson2017-08-281-0/+16
| | | | | | | While not yet used, these NAL units do already have some defined semantics and are referred to elsewhere. (cherry picked from commit 3daaa4417317ca732fb00476fdb3308d784f87e4)
* lavc/vaapi_encode: Change the slice/parameter buffers to dynamic alloc.Jun Zhao2017-08-282-16/+32
| | | | | | | | Change the slice/parameter buffers to be allocated dynamically. Signed-off-by: Wang, Yi A <yi.a.wang@intel.com> Signed-off-by: Jun Zhao <jun.zhao@intel.com> Signed-off-by: Mark Thompson <sw@jkqxz.net>
* lavc/vaapi_encode_h265: Enable VBR modeJun Zhao2017-08-281-5/+10
| | | | | | | Follow vaapi_h264 style, enable the VBR mode. Signed-off-by: Jun Zhao <jun.zhao@intel.com> Signed-off-by: Mark Thompson <sw@jkqxz.net>
* libavutil/opencl: fix potential null dereferenceTimo Rothenpieler2017-08-271-1/+1
| | | | | | | Fixes CID 1396840 Reviewed-by: Wei Gao <highgod0401@gmail.com> Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
* avfilter/vf_zoompan: remove AVFILTER_FLAG_SUPPORT_TIMELINE_GENERICMichael Niedermayer2017-08-271-1/+0
| | | | | | | Suggested-by: <durandal_1707> Fixes: assertion failure Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/aacpsdsp_template: Fix undefined integer overflow in ps_add_squares_c()Michael Niedermayer2017-08-271-1/+1
| | | | | | | | Fixes runtime error: signed integer overflow: 1997494407 + 613252359 cannot be represented in type 'int' Fixes: 2014/clusterfuzz-testcase-minimized-5186337030275072 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/sbrdsp_fixed: Fix undefined overflows in autocorrelate()Michael Niedermayer2017-08-271-18/+18
| | | | | | | | Fixes: runtime error: signed integer overflow: 8903997421129740175 + 354481484684609529 cannot be represented in type 'long' Fixes: 2045/clusterfuzz-testcase-minimized-6751255865065472 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>