summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* lavfi/vf_lut3d: convert to framesync2.Nicolas George2017-08-29
|
* lavfi/vf_libvmaf: convert to framesync2.Nicolas George2017-08-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-29
|
* lavfi/vf_overlay: use framesync2 options.Nicolas George2017-08-29
|
* lavfi/framesync2: add common options.Nicolas George2017-08-29
| | | | | Also add functions and macros to help filters chaining these options to their own.
* lavfi: search options on child objects.Nicolas George2017-08-29
| | | | | The child objects must be allocated and inited in the preinit() callback.
* lavfi: add a preinit callback to filters.Nicolas George2017-08-29
| | | | | 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-29
|
* lavfi/framesync2: add dualinput helper functions.Nicolas George2017-08-29
|
* lavfi/f_streamselect: convert to framesync2.Nicolas George2017-08-29
|
* avcodec/snowenc: fix setting motion_est optionJames Almer2017-08-28
| | | | | | | | 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-29
|
* hevc: Add names for reserved NAL unit typesMark Thompson2017-08-28
| | | | | | | 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-28
| | | | | | | | 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-28
| | | | | | | 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-27
| | | | | | | 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-27
| | | | | | | 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-27
| | | | | | | | 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-27
| | | | | | | | 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>
* avformat/mvdec: Fix DoS due to lack of eof checkMichael Niedermayer2017-08-27
| | | | | | | Fixes: loop.mv Found-by: Xiaohei and Wangchu from Alibaba Security Team Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/rl2: Fix DoS due to lack of eof check孙浩 and 张洪亮(望初)2017-08-27
| | | | | | | Fixes: loop.rl2 Found-by: Xiaohei and Wangchu from Alibaba Security Team Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/rmdec: Fix DoS due to lack of eof check孙浩 and 张洪亮(望初)2017-08-27
| | | | | | | Fixes: loop.ivr Found-by: Xiaohei and Wangchu from Alibaba Security Team Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/cinedec: Fix DoS due to lack of eof check孙浩 and 张洪亮(望初)2017-08-27
| | | | | | | Fixes: loop.cine Found-by: Xiaohei and Wangchu from Alibaba Security Team Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/asfdec: Fix DoS due to lack of eof check孙浩 and 张洪亮(望初)2017-08-27
| | | | | | | Fixes: loop.asf Found-by: Xiaohei and Wangchu from Alibaba Security Team Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/hls: Fix DoS due to infinite loopMichael Niedermayer2017-08-27
| | | | | | | | | | | Fixes: loop.m3u The default max iteration count of 1000 is arbitrary and ideas for a better solution are welcome Found-by: Xiaohei and Wangchu from Alibaba Security Team Previous version reviewed-by: Steven Liu <lingjiujianke@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavd: implement NewTek NDI input/output device supportMaksym Veremeyenko2017-08-27
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* avdevice/decklink_enc: enable 16 output channelpkviet2017-08-27
| | | | | | | | Decklink devices can output 2, 8 or 16 audio channels along video. The code was limited to 2 or 8 channels. The commit enables 16 audio channels (relevant for SDI outputs). Signed-off-by: Marton Balint <cus@passwd.hu>
* avdevice/decklink_dec: fix signed and unsigned comparison warningMarton Balint2017-08-27
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* avfilter/vf_zoompan: parse zoom,x and y expression during initializationPaul B Mahol2017-08-27
| | | | | | Fixes #6127. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/vf_zoompan: switch to activatePaul B Mahol2017-08-27
| | | | | | Fixes #5182. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/af_amix: do not request samples if inlink reached EOFPaul B Mahol2017-08-27
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avcoec/snowenc: silence some deprecation warningsJames Almer2017-08-26
|
* configure: add avx2 enabled logMartin Vignali2017-08-26
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* avfilter/af_amix: simplify const entries for duration in amix_options[]Paul B Mahol2017-08-26
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/af_amix: switch to activatePaul B Mahol2017-08-26
| | | | | | Really fixes hangs and infinite loops. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* doc/filters: improve pseudocolor examplePaul B Mahol2017-08-26
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavc/sinewin_tablegen: Fix compilation with --enable-hardcoded-tables.Carl Eugen Hoyos2017-08-26
| | | | Reported by irc user JCount_.
* lavc/utils: Calculate frame duration for little-endian G.726.Carl Eugen Hoyos2017-08-26
|
* lavf/rawenc: Add little- and big-endian G.726 muxers.Carl Eugen Hoyos2017-08-26
|
* avfilter/af_surround: make volume configurable for front center and lfe channelPaul B Mahol2017-08-26
|
* ffmpeg options: Enable trailing ? for map_channelpkviet2017-08-25
| | | | | | | | | | | The -map option allows for a trailing ? so that an error is not thrown if the input stream does not exist. This capability is extended to the map_channel option. This allows a ffmpeg command not to break if an input channel does not exist, which can be of use (for instance, scripts processing audio channels with sources having unset number of audio channels). Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/dvbsubdec: Check for duplicate regions in dvbsub_parse_page_segment()Michael Niedermayer2017-08-25
| | | | | | | | Fixes: OOM Fixes: 3051/clusterfuzz-testcase-minimized-5745818336231424 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec: add missing FF_API_DEBUG_MV wrappersJames Almer2017-08-25
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec: make the avcodec_get_chroma_sub_sample deprecation effectiveJames Almer2017-08-25
| | | | Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
* utils: Do not expand a macro with 'defined' in itDerek Buitenhuis2017-08-25
| | | | | | | | | | | | Fixes: libswscale/utils.c:1632:5: warning: macro expansion producing 'defined' has undefined behavior [-Wexpansion-to-defined] #if USE_MMAP ^ libswscale/utils.c:1577:49: note: expanded from macro 'USE_MMAP' #define USE_MMAP (HAVE_MMAP && HAVE_MPROTECT && defined MAP_ANONYMOUS) ^ Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* mjpeg: Add support for ICC side dataDerek Buitenhuis2017-08-25
| | | | | | | | JPEGs store embedded profiles under the APP2 marker, signified with a "ICC_PROFILE" null-terminated string header, and can be split across multiple APP2 markers, out of order. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* doc/filters: add pseudocolor examplePaul B Mahol2017-08-25
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/af_firequalizer: fix minval on cepstrum calculationMuhammad Faiz2017-08-25
| | | | | | The impulse response is scaled with 2/rdft_len. Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* avfilter/src_movie: check ff_insert_outpad() for failurePaul B Mahol2017-08-25
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/split: check ff_insert_outpad() for failurePaul B Mahol2017-08-25
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>