Tree:
567c20f781
master
n4.4-jackoutdev
oldabi
release/0.10
release/0.11
release/0.5
release/0.6
release/0.7
release/0.8
release/0.9
release/1.0
release/1.1
release/1.2
release/2.0
release/2.1
release/2.2
release/2.3
release/2.4
release/2.5
release/2.6
release/2.7
release/2.8
release/3.0
release/3.1
release/3.2
release/3.3
release/3.4
release/4.0
release/4.1
release/4.2
release/4.3
release/4.4
v0.6.1
v0.6
v0.5.3
v0.5.2
v0.5.1
v0.5
n4.5-dev
n4.4-dev
n4.3-dev
n4.2-dev
n4.1-dev
n3.5-dev
n3.4-dev
n3.3-dev
n3.2-dev
n3.1-dev
n2.9-dev
n2.8-dev
n2.7-dev
n2.6-dev
n2.5-dev
n2.4-dev
n2.3-dev
n2.2-dev
n2.1-dev
n1.3-dev
n1.2-dev
n1.1-dev
n0.12-dev
n0.11-dev
n4.4
n4.3.2
n4.3.1
n4.3
n4.2.4
n4.2.3
n4.2.2
n4.2.1
n4.2
n4.1.6
n4.1.5
n4.1.4
n4.1.3
n4.1.2
n4.1.1
n4.1
n4.0.6
n4.0.5
n4.0.4
n4.0.3
n4.0.2
n4.0.1
n4.0
n3.4.8
n3.4.7
n3.4.6
n3.4.5
n3.4.4
n3.4.3
n3.4.2
n3.4.1
n3.4
n3.3.9
n3.3.8
n3.3.7
n3.3.6
n3.3.5
n3.3.4
n3.3.3
n3.3.2
n3.3.1
n3.3
n3.2.15
n3.2.14
n3.2.13
n3.2.12
n3.2.11
n3.2.10
n3.2.9
n3.2.8
n3.2.7
n3.2.6
n3.2.5
n3.2.4
n3.2.3
n3.2.2
n3.2.1
n3.2
n3.1.11
n3.1.10
n3.1.9
n3.1.8
n3.1.7
n3.1.6
n3.1.5
n3.1.4
n3.1.3
n3.1.2
n3.1.1
n3.1
n3.0.12
n3.0.11
n3.0.10
n3.0.9
n3.0.8
n3.0.7
n3.0.6
n3.0.5
n3.0.4
n3.0.3
n3.0.2
n3.0.1
n3.0
n2.8.17
n2.8.16
n2.8.15
n2.8.14
n2.8.13
n2.8.12
n2.8.11
n2.8.10
n2.8.9
n2.8.8
n2.8.7
n2.8.6
n2.8.5
n2.8.4
n2.8.3
n2.8.2
n2.8.1
n2.8
n2.7.7
n2.7.6
n2.7.5
n2.7.4
n2.7.3
n2.7.2
n2.7.1
n2.7
n2.6.9
n2.6.8
n2.6.7
n2.6.6
n2.6.5
n2.6.4
n2.6.3
n2.6.2
n2.6.1
n2.6
n2.5.11
n2.5.10
n2.5.9
n2.5.8
n2.5.7
n2.5.6
n2.5.5
n2.5.4
n2.5.3
n2.5.2
n2.5.1
n2.5
n2.4.14
n2.4.13
n2.4.12
n2.4.11
n2.4.10
n2.4.9
n2.4.8
n2.4.7
n2.4.6
n2.4.5
n2.4.4
n2.4.3
n2.4.2
n2.4.1
n2.4
n2.3.6
n2.3.5
n2.3.4
n2.3.3
n2.3.2
n2.3.1
n2.3
n2.2.16
n2.2.15
n2.2.14
n2.2.13
n2.2.12
n2.2.11
n2.2.10
n2.2.9
n2.2.8
n2.2.7
n2.2.6
n2.2.5
n2.2.4
n2.2.3
n2.2.2
n2.2.1
n2.2
n2.2-rc2
n2.2-rc1
n2.1.8
n2.1.7
n2.1.6
n2.1.5
n2.1.4
n2.1.3
n2.1.2
n2.1.1
n2.1
n2.0.7
n2.0.6
n2.0.5
n2.0.4
n2.0.3
n2.0.2
n2.0.1
n2.0
n1.2.12
n1.2.11
n1.2.10
n1.2.9
n1.2.8
n1.2.7
n1.2.6
n1.2.5
n1.2.4
n1.2.3
n1.2.2
n1.2.1
n1.2
n1.1.16
n1.1.15
n1.1.14
n1.1.13
n1.1.12
n1.1.11
n1.1.10
n1.1.9
n1.1.8
n1.1.7
n1.1.6
n1.1.5
n1.1.4
n1.1.3
n1.1.2
n1.1.1
n1.1
n1.0.10
n1.0.9
n1.0.8
n1.0.7
n1.0.6
n1.0.5
n1.0.4
n1.0.3
n1.0.2
n1.0.1
n1.0
n0.11.5
n0.11.4
n0.11.3
n0.11.2
n0.11.1
n0.11
n0.10.16
n0.10.15
n0.10.14
n0.10.13
n0.10.12
n0.10.11
n0.10.10
n0.10.9
n0.10.8
n0.10.7
n0.10.6
n0.10.5
n0.10.4
n0.10.3
n0.10.2
n0.10.1
n0.10
n0.9.4
n0.9.3
n0.9.2
n0.9.1
n0.9
n0.8.15
n0.8.14
n0.8.13
n0.8.12
n0.8.11
n0.8.10
n0.8.9
n0.8.8
n0.8.7
n0.8.6
n0.8.5
n0.8.4
n0.8.3
n0.8.2
n0.8.1
n0.8
n0.7.17
n0.7.16
n0.7.15
n0.7.14
n0.7.13
n0.7.12
n0.7.11
n0.7.10
n0.7.9
n0.7.8
n0.7.7
n0.7.6
n0.7.5
n0.7.4
n0.7.3
n0.7.2
n0.7.1
n0.6.7
n0.6.6
n0.6.5
n0.6.4
ffmpeg-0.6.3
n0.5.15
n0.5.14
n0.5.13
n0.5.12
n0.5.11
n0.5.10
n0.5.9
n0.5.8
n0.5.7
n0.5.6
n0.5.5
N
4 Commits (567c20f78109588620c57696ab39ff314fe12d6c)
4 Commits (567c20f78109588620c57696ab39ff314fe12d6c)
| Author | SHA1 | Message | Date |
|---|---|---|---|
 Nicolas George
|
5f5dcf44e3 | lavfi: rename framesync2 to framesync. | 7 years ago |
 Ashish Singh
|
2a4a26fa4f |
avfilter/vf_libvmaf: fix pre convert to framesync2 bugs
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> |
7 years ago |
|
Nicolas George
|
a8ab52fae7 |
lavfi/vf_libvmaf: convert to framesync2.
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) |
7 years ago |
|
Ashish Singh
|
615479d51c |
avfilter: add LIBVMAF filter
This one changes the previous vmaf patch to libvmaf to keep it separate from the native implementation of vmaf inside ffmpeg later. Signed-off-by: Ashish Singh <ashk43712@gmail.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> |
8 years ago |