Commits · 7302d5e325977d4a8ff61422fdabdae0dc504ec0 · Linshizhi / ffmpeg.wasm-core

29 Aug, 2017 17 commits

lavfi: bump minor version after change in options. · 7302d5e3
Nicolas George authored Aug 29, 2017

7302d5e3
doc/filters: document framesync options. · 844bc0d8
Nicolas George authored Aug 10, 2017

844bc0d8
lavfi: remove dualinput. · 607900c9
Nicolas George authored Jul 31, 2017

607900c9
vf_ssim: convert to framesync2. · ef217647
Nicolas George authored Jul 31, 2017

ef217647
lavfi/vf_psnr: convert to framesync2. · 3bd11df4
Nicolas George authored Jul 31, 2017

3bd11df4
lavfi/vf_paletteuse: convert to framesync2. · 23000c3d
Nicolas George authored Jul 31, 2017

23000c3d
lavfi/vf_lut3d: convert to framesync2. · eacb3ec9
Nicolas George authored Jul 31, 2017

eacb3ec9

lavfi/vf_libvmaf: convert to framesync2. · a8ab52fa

Nicolas George authored Jul 31, 2017

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)

a8ab52fa

lavfi/vf_blend: convert to framesync2. · c1d8d33a
Nicolas George authored Jul 31, 2017

c1d8d33a
lavfi/vf_overlay: use framesync2 options. · 878fd054
Nicolas George authored Jul 30, 2017

878fd054
lavfi/framesync2: add common options. · 05a23b25
Nicolas George authored Jul 30, 2017
```
Also add functions and macros to help filters chaining these
options to their own.
```
05a23b25
lavfi: search options on child objects. · dfa3aaa2
Nicolas George authored Jul 30, 2017
```
The child objects must be allocated and inited in the
preinit() callback.
```
dfa3aaa2
lavfi: add a preinit callback to filters. · f8d7b5fe
Nicolas George authored Jul 30, 2017
```
It is necessary for filters with child objects, to set the class
and default options values.
```
f8d7b5fe
lavfi/vf_overlay: move to framesync2. · 19804024
Nicolas George authored Jul 17, 2017

19804024
lavfi/framesync2: add dualinput helper functions. · 0ae8df41
Nicolas George authored Jul 17, 2017

0ae8df41
lavfi/f_streamselect: convert to framesync2. · 6bde475c
Nicolas George authored Jul 31, 2017

6bde475c

avcodec/snowenc: fix setting motion_est option · 95a6de56

James Almer authored Aug 26, 2017

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>

95a6de56

28 Aug, 2017 4 commits

lavf/dump: Remove superfluous cast. · d4fbe99d
Carl Eugen Hoyos authored Aug 28, 2017

d4fbe99d

hevc: Add names for reserved NAL unit types · b264810e

Mark Thompson authored May 14, 2017

While not yet used, these NAL units do already have some defined
semantics and are referred to elsewhere.

(cherry picked from commit 3daaa441)

b264810e

lavc/vaapi_encode: Change the slice/parameter buffers to dynamic alloc. · e4a6eb70

Jun Zhao authored Aug 24, 2017

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>

e4a6eb70

lavc/vaapi_encode_h265: Enable VBR mode · 385cafb0

Jun Zhao authored Aug 25, 2017

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>

385cafb0

27 Aug, 2017 17 commits

libavutil/opencl: fix potential null dereference · ef0c6d9b

Timo Rothenpieler authored Jun 11, 2017

Fixes CID 1396840
Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>

ef0c6d9b

avfilter/vf_zoompan: remove AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC · aa26258f
Michael Niedermayer authored Aug 27, 2017
```
Suggested-by: <durandal_1707>
Fixes: assertion failure
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
aa26258f

avcodec/aacpsdsp_template: Fix undefined integer overflow in ps_add_squares_c() · 0181b202

Michael Niedermayer authored Aug 26, 2017

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/ffmpegSigned-off-by: Michael Niedermayer <michael@niedermayer.cc>

0181b202

avcodec/sbrdsp_fixed: Fix undefined overflows in autocorrelate() · eefb68c9

Michael Niedermayer authored Aug 26, 2017

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/ffmpegSigned-off-by: Michael Niedermayer <michael@niedermayer.cc>

eefb68c9

avformat/mvdec: Fix DoS due to lack of eof check · 4f05e2e2

Michael Niedermayer authored Aug 24, 2017

Fixes: loop.mv

Found-by: Xiaohei and Wangchu from Alibaba Security Team
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

4f05e2e2

avformat/rl2: Fix DoS due to lack of eof check · 96f24d1b

孙浩 and 张洪亮(望初) authored Aug 24, 2017

Fixes: loop.rl2

Found-by: Xiaohei and Wangchu from Alibaba Security Team
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

96f24d1b

avformat/rmdec: Fix DoS due to lack of eof check · 124eb202

孙浩 and 张洪亮(望初) authored Aug 24, 2017

Fixes: loop.ivr

Found-by: Xiaohei and Wangchu from Alibaba Security Team
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

124eb202

avformat/cinedec: Fix DoS due to lack of eof check · 7e80b63e

孙浩 and 张洪亮(望初) authored Aug 24, 2017

Fixes: loop.cine

Found-by: Xiaohei and Wangchu from Alibaba Security Team
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

7e80b63e

avformat/asfdec: Fix DoS due to lack of eof check · 7f9ec559

孙浩 and 张洪亮(望初) authored Aug 25, 2017

Fixes: loop.asf

Found-by: Xiaohei and Wangchu from Alibaba Security Team
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

7f9ec559

avformat/hls: Fix DoS due to infinite loop · 7ec41489

Michael Niedermayer authored Aug 25, 2017

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>

7ec41489

lavd: implement NewTek NDI input/output device support · 2634927f
Maksym Veremeyenko authored Aug 18, 2017
```
Signed-off-by: Marton Balint <cus@passwd.hu>
```
2634927f

avdevice/decklink_enc: enable 16 output channel · 84ee6512

pkviet authored Jul 02, 2017

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>

84ee6512

avdevice/decklink_dec: fix signed and unsigned comparison warning · 76a8b5e7
Marton Balint authored Aug 27, 2017
```
Signed-off-by: Marton Balint <cus@passwd.hu>
```
76a8b5e7
avfilter/vf_zoompan: parse zoom,x and y expression during initialization · bf39f7ea
Paul B Mahol authored Aug 27, 2017
```
Fixes #6127.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
bf39f7ea
avfilter/vf_zoompan: switch to activate · 2ce43274
Paul B Mahol authored Aug 27, 2017
```
Fixes #5182.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
2ce43274
avfilter/af_amix: do not request samples if inlink reached EOF · 99b6e684
Paul B Mahol authored Aug 27, 2017
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
99b6e684
avcoec/snowenc: silence some deprecation warnings · 257f0d09
James Almer authored Aug 27, 2017

257f0d09

26 Aug, 2017 2 commits
- configure: add avx2 enabled log · 435dd2ee
  Martin Vignali authored Aug 26, 2017
```
Signed-off-by: James Almer <jamrial@gmail.com>
```
  435dd2ee
- avfilter/af_amix: simplify const entries for duration in amix_options[] · 7f5c6558
  Paul B Mahol authored Aug 26, 2017
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  7f5c6558