提交 · 027c682fa07999820a11cbcbf7a7ba9edbb9ecab · 小白菜888 / Ffmpeg

31 8月, 2017 6 次提交
- J
  avfilter/vf_mcdeint: remove usage of deprecated AVCodecContext.me_method · 027c682f
  由 James Almer 提交于 8月 28, 2017
```
Signed-off-by: NJames Almer <jamrial@gmail.com>
```
  027c682f
- P
  avfilter/af_adelay: remove requirement that at least one delay should be provided · 6ccd32c3
  由 Paul B Mahol 提交于 8月 30, 2017
```
Such requirement is not necessary and code works without it just fine.
Signed-off-by: NPaul B Mahol <onemda@gmail.com>
```
  6ccd32c3
- J
  postproc: remove usage of deprecated QP_STORE_T define · 2b7da70a
  由 James Almer 提交于 8月 30, 2017
```
Signed-off-by: NJames Almer <jamrial@gmail.com>
```
  2b7da70a
- J
  avfilter/vf_mcdeint: free the AVCodecContext struct properly · f7d4c60a
  由 James Almer 提交于 8月 30, 2017
```
Signed-off-by: NJames Almer <jamrial@gmail.com>
```
  f7d4c60a
- J
  fate: stop using deprecated filter syntax in hls tests · ec07574a
  由 James Almer 提交于 8月 30, 2017
```
Signed-off-by: NJames Almer <jamrial@gmail.com>
```
  ec07574a
- J
  fate: remove usage of deprecated AVCodecContext.me_method in vsynth snow tests · 350dc01d
  由 James Almer 提交于 8月 30, 2017
```
Signed-off-by: NJames Almer <jamrial@gmail.com>
```
  350dc01d
30 8月, 2017 16 次提交

configure: require pkg-config for libvmaf · 1dc33c12

由 Ashish Singh 提交于 8月 01, 2017

This patch makes the libvmaf filter use pkg-config to detect
and link to libvmaf.
Signed-off-by: NAshish Singh <ashk43712@gmail.com>
Signed-off-by: NRonald S. Bultje <rsbultje@gmail.com>

1dc33c12

avfilter/vf_libvmaf: fix pre convert to framesync2 bugs · 2a4a26fa

由 Ashish Singh 提交于 8月 03, 2017

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: NAshish Singh <ashk43712@gmail.com>
Signed-off-by: NRonald S. Bultje <rsbultje@gmail.com>

2a4a26fa

P
avcodec/codec_desc: make FITS description longer · 2b9fd157
由 Paul B Mahol 提交于 8月 30, 2017
```
Signed-off-by: NPaul B Mahol <onemda@gmail.com>
```
2b9fd157
P
avfilter/vf_lut2: add framesync options · a4d18a3f
由 Paul B Mahol 提交于 8月 30, 2017
```
Also stop leaking memory.
Signed-off-by: NPaul B Mahol <onemda@gmail.com>
```
a4d18a3f
P
FATE: Add FITS tests · 9d99f0af
由 Paras Chadha 提交于 8月 29, 2017
```
Signed-off-by: NParas Chadha <paraschadha18@gmail.com>
```
9d99f0af
P
Add FITS Muxer · df475db9
由 Paras Chadha 提交于 8月 29, 2017
```
Signed-off-by: NParas Chadha <paraschadha18@gmail.com>
```
df475db9
P
Add FITS Encoder · 6e02f66f
由 Paras Chadha 提交于 8月 29, 2017
```
Signed-off-by: NParas Chadha <paraschadha18@gmail.com>
```
6e02f66f
P
Add FITS Demuxer · 207f0cff
由 Paras Chadha 提交于 8月 29, 2017
```
Signed-off-by: NParas Chadha <paraschadha18@gmail.com>
```
207f0cff
P
Add FITS Decoder · 61e4db4b
由 Paras Chadha 提交于 8月 29, 2017
```
Signed-off-by: NParas Chadha <paraschadha18@gmail.com>
```
61e4db4b

compat/cuda/ptx2c: strip CR from each line · 7fbc0825

由 Ricardo Constantino 提交于 8月 29, 2017

Windows nvcc + cl.exe produce a .ctx file with CR+LF newlines which
need to be stripped to work with gcc.
Signed-off-by: NTimo Rothenpieler <timo@rothenpieler.org>

7fbc0825

T
configure: add support for libnpp* from cuda sdk 9 · 1ac03c8d
由 Timo Rothenpieler 提交于 8月 29, 2017
```
Signed-off-by: NTimo Rothenpieler <timo@rothenpieler.org>
```
1ac03c8d
M
avformat/mxfenc: Replace literal numbers by named enum values. · f762555a
由 Michael Niedermayer 提交于 8月 29, 2017
```
Signed-off-by: NMichael Niedermayer <michael@niedermayer.cc>
```
f762555a

avcodec/snowdec: Fix integer overflow in decode_subband_slice_buffered() · 732f9764

由 Michael Niedermayer 提交于 8月 28, 2017

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

732f9764

avcodec/hevc_ps: Fix undefined shift in pcm code · 2a83866c

由 Michael Niedermayer 提交于 8月 27, 2017

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

2a83866c

avcodec/h264idct_template: Fix integer overflow in ff_h264_idct8_add() · 6def8b8d

由 Michael Niedermayer 提交于 8月 17, 2017

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

6def8b8d

avformat/mxfenc: Check that the video codec in D-10 is MPEG-2 · 429f3266

由 Michael Niedermayer 提交于 8月 29, 2017

Others do not work, but nothing rejects them prior to this patch if the
parameters otherwise match
Reviewed-by: NMatthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: NMichael Niedermayer <michael@niedermayer.cc>

429f3266

29 8月, 2017 18 次提交

N

lavfi: bump minor version after change in options. · 7302d5e3
由 Nicolas George 提交于 8月 29, 2017

7302d5e3
N

doc/filters: document framesync options. · 844bc0d8
由 Nicolas George 提交于 8月 10, 2017

844bc0d8
N

lavfi: remove dualinput. · 607900c9
由 Nicolas George 提交于 7月 31, 2017

607900c9
N

vf_ssim: convert to framesync2. · ef217647
由 Nicolas George 提交于 7月 31, 2017

ef217647
N

lavfi/vf_psnr: convert to framesync2. · 3bd11df4
由 Nicolas George 提交于 7月 31, 2017

3bd11df4
N

lavfi/vf_paletteuse: convert to framesync2. · 23000c3d
由 Nicolas George 提交于 7月 31, 2017

23000c3d
N

lavfi/vf_lut3d: convert to framesync2. · eacb3ec9
由 Nicolas George 提交于 7月 31, 2017

eacb3ec9

lavfi/vf_libvmaf: convert to framesync2. · a8ab52fa

由 Nicolas George 提交于 7月 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

N

lavfi/vf_blend: convert to framesync2. · c1d8d33a
由 Nicolas George 提交于 7月 31, 2017

c1d8d33a
N

lavfi/vf_overlay: use framesync2 options. · 878fd054
由 Nicolas George 提交于 7月 30, 2017

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

lavfi/vf_overlay: move to framesync2. · 19804024
由 Nicolas George 提交于 7月 17, 2017

19804024
N

lavfi/framesync2: add dualinput helper functions. · 0ae8df41
由 Nicolas George 提交于 7月 17, 2017

0ae8df41
N

lavfi/f_streamselect: convert to framesync2. · 6bde475c
由 Nicolas George 提交于 7月 31, 2017

6bde475c

avcodec/snowenc: fix setting motion_est option · 95a6de56

由 James Almer 提交于 8月 25, 2017

Remove usage of FF_MPV_COMMON_OPTS, and set SnowContext.motion_est directly.
Based on code from svq1enc.c
Signed-off-by: NJames Almer <jamrial@gmail.com>
Reviewed-by: NMichael Niedermayer <michael@niedermayer.cc>

95a6de56

C

lavf/dump: Remove superfluous cast. · d4fbe99d
由 Carl Eugen Hoyos 提交于 8月 29, 2017

d4fbe99d