x/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-08-12 13:23:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
87,253 Commits 40 Branches 432 Tags
4d41db7a31db0c426294ee692fb816faba39eba3
Commit Graph
6572 Commits
Author SHA1 Message Date
Paul B Mahol 4d41db7a31 avfilter: add generic FFT video convolve filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-09 17:09:37 +02:00
Clément Bœsch f8519529cf lavfi/coreimage: reduce dependency scope from QuartzCore to CoreImage 
What is required by the filter is CoreImage, there is no QuartzCore
usage. QuartzCore/CoreImage.h is simply an include to
CoreImage/CoreImage.h.
 2017-09-08 18:55:19 +02:00
Paul B Mahol cf0eed2525 avfilter: add Haas stereo enhancer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-08 18:29:53 +02:00
Nicolas George 5ba2aef6ec lavfi/buffersrc: add av_buffersrc_close(). 2017-09-08 10:31:01 +02:00
Nicolas George f5a9c63401 lavfi: guess a timestamp for compat status change. 
Use the earliest input with the same status.
If that fails, print a warning and use the earliest source.
With this change, simple filter forward correctly the timestamp
of EOF.
Filters that are supposed to change it should be updated to
actually forward it.
 2017-09-08 10:21:59 +02:00
Paul B Mahol e1524de454 avfilter/vf_zoompan: fix specific corner case when no frame was ever requested from input 
Reported-by: Nicolas George
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-07 16:49:46 +02:00
Pavel Koshevoy 25b5096400 lavfi/atempo: Avoid false triggering an assertion failure 
Steps to reproduce:
1. revert 4240e5b047
2. ./ffmpeg -f lavfi -i sine=d=1 -af aselect=e=0,atempo=0.5 -y atempo.wav

Signed-off-by: Marton Balint <cus@passwd.hu>
 2017-09-06 23:57:59 +02:00
Pavel Koshevoy edb4ba5bd4 Revert "lavfi/atempo: avoid false triggering an assertion failure" 
This reverts commit 4240e5b047.

Fixes ticket #6540.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2017-09-06 23:57:54 +02:00
Paul B Mahol eea69a9f25 avfilter/af_dcshift: add direct path 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-06 11:46:24 +02:00
Michael Niedermayer d8bc198d09 avfilter/vf_overlay: Restore shorthand option order 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-09-05 23:55:19 +02:00
James Almer 9a174d203a avfilter/lavfutils: remove usage of AVStream->codec 
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-09-05 14:21:41 -03:00
Paul B Mahol a5e6cd79ec avfilter/avf_avectorscope: fix mistake in previous commit 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-05 11:55:23 +02:00
Paul B Mahol 2c10f054c2 avfilter/avf_avectorscope: add possibility to auto zoom 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-05 11:43:49 +02:00
Paul B Mahol 6faa1275a2 avfilter: add despill filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-05 08:46:48 +02:00
Paul B Mahol b43cd67862 avfilter/vf_fftfilt: make it possible to evaluate expressions per frame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-04 19:30:44 +02:00
Paul B Mahol 4705a80fb0 avfilter/vf_fftfilt: add generic timeline support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-04 19:04:31 +02:00
Paul B Mahol 2170ca41f4 avfilter/vf_fftfilt: add support for more pixel formats 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-04 18:36:37 +02:00
Paul B Mahol 2726b2d7e8 avfilter/vf_fftfilt: cache rdft contexts 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-04 18:24:00 +02:00
Paul B Mahol 833a38dbe5 avfilter/vf_datascope: make it possible for output window to automatically change position 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-04 14:20:29 +02:00
Paul B Mahol f3c0f34f53 avfilter/vf_datascope: add timeline support to pixscope and oscilloscope 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-03 20:42:04 +02:00
Paul B Mahol e6e58de03d avfilter/vf_displace: add mirror edge mode 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-03 14:15:33 +02:00
Paul B Mahol 06ed3768c8 avfilter/vf_displace: remove useless requirement that SAR matches between input streams 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-03 13:37:43 +02:00
Paul B Mahol f19e4118e9 avfilter/vf_subtitles: enable processing of alpha channel 
Fixes #6605.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-09-03 13:12:48 +02:00
James Almer 3ec6d9c6b2 avfilter: remove duplicate and disabled trace log function 
It's already defined and actually enabled depending on compiler options
elsewhere.

Signed-off-by: James Almer <jamrial@gmail.com>
 2017-09-01 14:06:14 -03:00
James Almer 027c682fa0 avfilter/vf_mcdeint: remove usage of deprecated AVCodecContext.me_method 
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-08-30 21:49:14 -03:00
Paul B Mahol 6ccd32c367 avfilter/af_adelay: remove requirement that at least one delay should be provided 
Such requirement is not necessary and code works without it just fine.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-08-30 20:24:28 +02:00
James Almer f7d4c60ac4 avfilter/vf_mcdeint: free the AVCodecContext struct properly 
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-08-30 14:36:01 -03:00
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>
 2017-08-30 09:19:15 -04:00
Paul B Mahol a4d18a3f54 avfilter/vf_lut2: add framesync options 
Also stop leaking memory.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-08-30 12:13:02 +02:00
Nicolas George 7302d5e325 lavfi: bump minor version after change in options. 2017-08-29 15:46:36 +02:00
Nicolas George 607900c905 lavfi: remove dualinput. 2017-08-29 10:19:04 +02:00
Nicolas George ef2176473d vf_ssim: convert to framesync2. 2017-08-29 10:19:04 +02:00
Nicolas George 3bd11df459 lavfi/vf_psnr: convert to framesync2. 2017-08-29 10:19:04 +02:00
Nicolas George 23000c3de5 lavfi/vf_paletteuse: convert to framesync2. 2017-08-29 10:19:04 +02:00
Nicolas George eacb3ec961 lavfi/vf_lut3d: convert to framesync2. 2017-08-29 10:19:04 +02:00
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)
 2017-08-29 10:19:04 +02:00
Nicolas George c1d8d33a51 lavfi/vf_blend: convert to framesync2. 2017-08-29 10:19:04 +02:00
Nicolas George 878fd0545a lavfi/vf_overlay: use framesync2 options. 2017-08-29 10:19:04 +02:00
Nicolas George 05a23b2565 lavfi/framesync2: add common options. 
Also add functions and macros to help filters chaining these
options to their own.
 2017-08-29 10:19:04 +02:00
Nicolas George dfa3aaa22a lavfi: search options on child objects. 
The child objects must be allocated and inited in the
preinit() callback.
 2017-08-29 10:19:04 +02:00
Nicolas George f8d7b5febb lavfi: add a preinit callback to filters. 
It is necessary for filters with child objects, to set the class
and default options values.
 2017-08-29 10:19:04 +02:00
Nicolas George 19804024d5 lavfi/vf_overlay: move to framesync2. 2017-08-29 10:19:04 +02:00
Nicolas George 0ae8df4109 lavfi/framesync2: add dualinput helper functions. 2017-08-29 10:19:04 +02:00
Nicolas George 6bde475cf2 lavfi/f_streamselect: convert to framesync2. 2017-08-29 10:19:04 +02:00
Michael Niedermayer aa26258faa avfilter/vf_zoompan: remove AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC 
Suggested-by: <durandal_1707>
Fixes: assertion failure

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-08-27 20:41:56 +02:00
Paul B Mahol bf39f7eadc avfilter/vf_zoompan: parse zoom,x and y expression during initialization 
Fixes #6127.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-08-27 17:13:52 +02:00
Paul B Mahol 2ce43274e3 avfilter/vf_zoompan: switch to activate 
Fixes #5182.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-08-27 17:13:21 +02:00
Paul B Mahol 99b6e68441 avfilter/af_amix: do not request samples if inlink reached EOF 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-08-27 08:53:50 +02:00
Paul B Mahol 7f5c655833 avfilter/af_amix: simplify const entries for duration in amix_options[] 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-08-26 21:17:27 +02:00
Paul B Mahol 15e9c4afdc avfilter/af_amix: switch to activate 
Really fixes hangs and infinite loops.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-08-26 20:59:21 +02:00