Mark Visser
84f571e37f
enabled expressions on x, y, w, h and t parameters for drawgrid and drawbox, added examples
2013-06-25 11:38:59 -04:00
Michael Niedermayer
015cc3239a
lavfi/movie: free packet on decoder error
...
Prevents infinite loop, see Ticket2556
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-25 13:37:40 +02:00
Michael Niedermayer
8a7aabe80b
avfilter/vsrc_testsrc: fix artifacts with odd height
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-24 23:21:17 +02:00
Michael Niedermayer
5d509fbdcf
Merge commit 'eeeb5c291d3f78eaade5b99c2614c7cab0e9be79'
...
* commit 'eeeb5c291d3f78eaade5b99c2614c7cab0e9be79':
vsrc_movie: do not free avoption variables in uninit()
Conflicts:
libavfilter/src_movie.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-21 10:41:41 +02:00
Anton Khirnov
eeeb5c291d
vsrc_movie: do not free avoption variables in uninit()
...
The generic code frees them as well. Since av_free was used to free them
instead of av_freep, this would result in a double free.
2013-06-20 13:27:14 +02:00
Jean Delvare
b08cd2fb94
delogo: Fix function description
...
The algorithm works on src and writes to dst, not the other way
around.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-19 22:13:12 +02:00
Michael Niedermayer
209cb8afe0
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavfi: switch ff_default_get_audio_buffer() to av_frame_get_buffer()
Conflicts:
libavfilter/audio.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-19 08:27:35 +02:00
Michael Niedermayer
602d0bfe67
Merge branch 'frame_num_offset' of https://github.com/mjmvisser/FFmpeg
...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-19 01:25:50 +02:00
Mark Visser
2090abcc43
add the start_number offset to var_values[VAR_N] directly, instead of adding it in func_frame_num
2013-06-18 17:38:17 -04:00
Anton Khirnov
c9c7bc4493
lavfi: switch ff_default_get_audio_buffer() to av_frame_get_buffer()
...
This simplifies the code and avoids using libavcodec-specific
avcodec_fill_audio_frame().
2013-06-18 11:21:16 +02:00
Michael Niedermayer
e41bf19d2c
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavfi: math typo in interlace filter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-18 09:31:05 +02:00
Alexander Strasser
ac604e446b
lavfi/src_movie: Use movie_common_init instead individual wrappers
...
Makes it easier to understand that there is no difference in init
callback for movie and amovie. Also saves a few lines of code.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
2013-06-18 00:02:30 +02:00
Alexander Strasser
c679a1c358
lavfi/src_movie: Check pointer is not NULL before deref
...
Also do not check against empty string, the lower levels should
be able to deal with it.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
2013-06-18 00:02:30 +02:00
Vittorio Giovara
cd0faeee62
lavfi: math typo in interlace filter
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-06-17 12:25:43 +02:00
Mark Visser
0defc77e9d
added start_number parameter to drawtext to permit an offset to n/frame_num var
2013-06-14 17:05:19 -04:00
Clément Bœsch
147adf2c4f
lavfi/spp: fix description.
2013-06-14 06:53:52 +02:00
Jean Delvare
cef42ded8d
drawbox: Respect thickness parameter
...
The drawbox video filter is drawing lines one pixel thinner than
requested. The default thickness is 4 pixel but in fact the lines
drawn by default are only 3 pixel wide.
Change the comparisons in the code to fix this off-by-one bug. Also
change the default thickness from 4 to 3 to minimize the unexpected
changes from the user's perspective.
As I was already touching these lines, I also removed the "maximum" in
the thickness parameter description, as I don't think it was adding
any value and I even found it confusing.
Reviewed-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-14 03:52:32 +02:00
Clément Bœsch
852f74bd85
lavfi/mp: remove mp=spp.
...
The filter was ported to a native libavfilter filter.
2013-06-14 01:27:22 +02:00
Clément Bœsch
a2c547ffec
lavfi: add spp filter.
2013-06-14 01:27:22 +02:00
Stefano Sabatini
e0135a4bcd
lavfi/rotate: add angle command
2013-06-13 01:21:47 +02:00
Stefano Sabatini
dc5e26d67f
lavfi: add rotate filter
...
Based on the libavfilter SOC filter by Vitor Sessak, with the following additions:
* integer arithmetic
* bilinear interpolation
* RGB path
* configurable parametric angle, output width and height
Address trac issue #1500 .
See thread:
Subject: [FFmpeg-devel] [WIP] rotate filter(s)
Date: 2010-10-03 17:35:49 GMT
2013-06-13 01:21:47 +02:00
Michael Niedermayer
d3e89f2641
vf_sab: Fix memleak
...
Fixes CID1030353
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-10 22:00:43 +02:00
Clément Bœsch
b77e58aad3
lavfi/pp: set out frame size.
...
w/h from input frame are not copied in av_frame_copy_props(). This
commit avoids a mismatch between aligned_[wh] and outbuf->{width,height}
(and thus avoids triggering an assert in avfilter because of this).
2013-06-08 23:23:30 +02:00
Clément Bœsch
f97e28ebe5
lavfi/lut3d: add sanity checks.
...
Should fix CID1026775 and CID1026774.
2013-06-07 01:48:41 +02:00
Paul B Mahol
3554238863
lavfi/il: add timeline support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-06-06 17:44:54 +00:00
Paul B Mahol
7d01533371
lavfi/framestep: cosmetics: reindent AVFilter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-06-06 17:19:16 +00:00
Paul B Mahol
27d3d61343
lavfi/framestep: add timeline support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-06-06 17:17:14 +00:00
Michael Niedermayer
2280b539c5
Merge commit '8b7dffc2d6c6c19f8e0a1fedcd0e95dce7a273ff'
...
* commit '8b7dffc2d6c6c19f8e0a1fedcd0e95dce7a273ff':
lavfi doxy: improve/extend AVFilter doxy.
Conflicts:
libavfilter/avfilter.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-05 12:05:41 +02:00
Stefano Sabatini
449558d34a
lavfi/mp: remove mp=sab
...
The filter was ported to a native libavfilter filter.
2013-06-05 00:06:51 +02:00
Stefano Sabatini
841df7bf86
lavfi: port sab filter from libmpcodecs
2013-06-05 00:06:51 +02:00
Anton Khirnov
8b7dffc2d6
lavfi doxy: improve/extend AVFilter doxy.
2013-06-04 17:18:33 +02:00
Michael Niedermayer
43487bc5c1
avfilter/vf_mcdeint: free frame on error
...
Fixes CID1026766
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-03 15:41:29 +02:00
Michael Niedermayer
3ed56b3b39
avfilter/process_options: fix memleak
...
Fixes CID1026765
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-03 15:26:50 +02:00
Michael Niedermayer
7e7d090907
avfilter/af_astats: rename stat()
...
See CID1026741
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-03 14:59:52 +02:00
Nicolas George
50a4d076ce
lavfi/trim: mark link closed on EOF.
...
Fix trac ticket #2620 .
2013-06-02 23:19:42 +02:00
Stefano Sabatini
ec34963276
lavfi/mp: drop mcdeint wrapper
...
It was ported to a native libavfilter filter.
2013-06-01 22:35:20 +02:00
Stefano Sabatini
e89182fc94
lavfi: port mcdeint filter from libmpcodecs
2013-06-01 22:34:57 +02:00
Stefano Sabatini
3a2b9911bf
lavfi/mp/mcdeint: avoid uninited data read
...
Do not read padding or out-of-buffer values when computing the output
value for a pixel close to the image buffer edge.
This avoids non visible artifacts which affected the output checksum.
See thread:
Subject: [FFmpeg-devel] [PATCH] lavfi/mp/mcdeint: avoid uninited data read
Date: Thu, 30 May 2013 18:57:14 +0200
2013-06-01 22:34:50 +02:00
Clément Bœsch
1fb52bf920
lavfi/mptestsrc: fix chroma subsampling with odd sizes.
...
This makes no difference in practice since w & h are hardcoded to 512.
2013-06-01 12:05:55 +02:00
Clément Bœsch
7ba04b3c48
lavfi/pixdesctest: fix chroma subsampling with odd sizes.
2013-06-01 12:05:55 +02:00
Clément Bœsch
7de8a38160
lavfi/vignette: remove extra semi-colon.
2013-05-31 10:22:03 +02:00
Clément Bœsch
2886e8065e
lavfi/vignette: add aspect option.
2013-05-30 20:51:12 +02:00
Clément Bœsch
33620e243f
lavfi/vignette: add some scaling debug.
2013-05-30 20:41:56 +02:00
Clément Bœsch
bfafcc4ebe
lavfi/vignette: simplify dmax definition.
2013-05-30 20:41:37 +02:00
Clément Bœsch
cf6f179044
lavfi/vignette: fix scale with aspects smaller than one.
2013-05-30 20:40:39 +02:00
Clément Bœsch
4a85390d29
lavfi/vignette: make sure a sane sar is set.
2013-05-30 18:13:04 +02:00
Clément Bœsch
0ab9362fcb
lavfi: add vignette filter.
2013-05-30 17:52:52 +02:00
Paul B Mahol
f8f42f4821
lavfi/noise: fix out of array access
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-29 16:54:28 +00:00
Paul B Mahol
83f9735592
lavfi/noise: support slice threading
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-29 16:13:11 +00:00
Clément Bœsch
1f1df07ce5
lavfi/drawutils: attempt to fix subsampling.
2013-05-28 19:20:27 +02:00
Dave Yeo
e615a77799
os2threads: move from lavc to compat/
...
For useage in other places besides lavc. Needed after commit
90f9a5830b
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28 12:49:20 +02:00
Clément Bœsch
160ea26560
lavfi/haldclutsrc: 10l remove size options.
2013-05-27 20:53:25 +02:00
Clément Bœsch
92a2d12a71
lavfi/overlay: remove do_blend forward declaration.
2013-05-27 20:42:46 +02:00
Clément Bœsch
ae5738248a
lavfi/lut3d: move lut3d init to its definition scope.
2013-05-27 20:42:46 +02:00
Clément Bœsch
158d96e3f0
lavfi: add haldclut filter.
...
Fixes Ticket #2517 .
2013-05-27 20:42:28 +02:00
Clément Bœsch
4328602890
lavfi: add dual input helpers.
2013-05-27 20:32:28 +02:00
Clément Bœsch
3cec29cf59
lavfi: add haldclutsrc filter.
2013-05-27 20:32:28 +02:00
Paul B Mahol
a1873f35f8
lavfi/ocv: make use of AVFILTER_DEFINE_CLASS
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27 11:31:52 +00:00
Paul B Mahol
229d5bfdc8
lavfi/frei0r: make use of AVFILTER_DEFINE_CLASS
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27 11:31:52 +00:00
Paul B Mahol
beda41886e
lavfi/channelmap: make use of AVFILTER_DEFINE_CLASS
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27 11:31:52 +00:00
Paul B Mahol
6008b5abbb
lavfi/format: make use of AVFILTER_DEFINE_CLASS
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27 11:17:34 +00:00
Paul B Mahol
e457f2cf1f
lavfi/setpts: make use of AVFILTER_DEFINE_CLASS
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27 11:14:43 +00:00
Paul B Mahol
5fe5bde60a
lavfi/join: make use of AVFILTER_DEFINE_CLASS
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27 11:10:39 +00:00
Paul B Mahol
622c977437
lavfi/hqdn3d: make use of AVFILTER_DEFINE_CLASS
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27 10:58:45 +00:00
Paul B Mahol
d349704eef
lavfi/interlace: make use of AVFILTER_DEFINE_CLASS
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27 10:00:37 +00:00
Paul B Mahol
11cdf9671f
lavfi/trim: make use of AVFILTER_DEFINE_CLASS
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27 09:55:40 +00:00
Paul B Mahol
68def27124
lavfi/interlace: remove request frame hack
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27 09:55:40 +00:00
Paul B Mahol
ed1c83508e
lavfi/trim: remove request frame hack
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27 09:55:40 +00:00
Paul B Mahol
4f8e4b8a54
lavfi/tinterlace: remove request frame hack
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27 09:55:40 +00:00
Paul B Mahol
c63e4e6569
lavfi/idet: remove request_frame hack
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27 09:55:39 +00:00
Clément Bœsch
b439ece51c
lavfi/dctdnoiz: move DC normalization out of loops.
...
Make code slightly faster, simpler, clearer.
The filter is still slow as hell, and that change won't cause any
visible performance improvement (it still takes more than one minute to
process a single 1080p frame on a Core 2 here).
2013-05-26 22:41:02 +02:00
Clément Bœsch
56cea3294a
lavfi/lut3d: faster tetrahedral interpolation.
...
Increase performance by fetching only the necessary points.
1097 → 917 decicyles.
2013-05-26 18:48:51 +02:00
Clément Bœsch
b6ee25e300
lavfi/lut3d: restore original interpolation speed.
...
Call NEXT() only once since it got slower due to the overflow condition
introduced in 91b46145
.
interp_trilinear: 1462 → 1280 decicycles
interp_tetrahedral: 1188 → 1097 decicycles
Tested on a Core2, GCC 4.8.
2013-05-26 18:48:10 +02:00
Paul B Mahol
c8e9c9275f
lavfi/bbox: export bbox info to frame metadata
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-26 14:00:10 +00:00
Paul B Mahol
add8c63ce4
lavfi/bbox: timeline support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-26 14:00:09 +00:00
Paul B Mahol
7aa99a69c7
lavfi/bbox: make min_val user configurable
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-26 14:00:09 +00:00
Paul B Mahol
e9c3851d60
lavfi/bbox: use inlink->frame_count
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-26 14:00:09 +00:00
Paul B Mahol
40a87a6a69
lavfi/noise: use av_image_copy_plane()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-26 10:52:57 +00:00
Michael Niedermayer
4cf7b87551
av_cpu_count: factorize "detected %d logical cores" message
...
Also print the message just once
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26 03:19:55 +02:00
Paul B Mahol
8caf2da320
lavfi/afade: add timeline support
...
For correct precision one may need to use asetnsamples.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-25 13:20:27 +00:00
Paul B Mahol
2c2e69b3a2
lavfi/blend: support slice threading
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-24 21:41:28 +00:00
Michael Niedermayer
e0f2e0fcf0
vf_fade: remove unused function
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 20:50:15 +02:00
Michael Niedermayer
0cbfbdef4a
vf_fade: Support slice threaded alpha
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 20:21:40 +02:00
Michael Niedermayer
a3d62f3377
vf_fade: Fix alpha flag integration
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 20:21:40 +02:00
Paul B Mahol
af12573938
lavfi/blend: fix SW/SH calculation
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-24 17:34:22 +00:00
Michael Niedermayer
bca59d7745
fade: fix slice sizes
...
This more evenly distributes the load between threads
This also fixes the chroma filtering where the filter was applied twice
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 17:47:02 +02:00
Michael Niedermayer
1d08e4b584
yadif: fix slice sizes
...
This more evenly distributes the load between threads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 17:46:57 +02:00
Michael Niedermayer
221f902f1d
avfilter/vf_yadif: fix race condition
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 17:26:20 +02:00
Paul B Mahol
036e9a0417
lavfi/blend: add yuv(j)411p
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-24 14:02:37 +00:00
Michael Niedermayer
b5be1a7e23
avfilter/vf_drawtext: Fix doxygen comment
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 15:36:54 +02:00
Michael Niedermayer
a2abd58a09
avfilter: remove av_opt_set_defaults() from process_options()
...
This is already called from ff_filter_alloc()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 15:25:52 +02:00
Michael Niedermayer
558ce3e5b7
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
vf_fade: support slice threading
vf_yadif: support slice threading
Conflicts:
libavfilter/vf_fade.c
libavfilter/vf_yadif.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 15:24:22 +02:00
Paul B Mahol
2516b393d4
lavfi/field, il, noise: use av_pix_fmt_count_planes()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-24 12:53:23 +00:00
Michael Niedermayer
8d4e969afe
Merge commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f'
...
* commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f':
lavfi: add a slice threading infrastructure
Conflicts:
Changelog
cmdutils.c
doc/APIchanges
libavfilter/Makefile
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/internal.h
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 14:07:00 +02:00
Anton Khirnov
8a994b7406
vf_fade: support slice threading
2013-05-24 09:33:05 +02:00
Anton Khirnov
cb79881b49
vf_yadif: support slice threading
2013-05-24 09:32:07 +02:00
Anton Khirnov
129bb23843
lavfi: add a slice threading infrastructure
...
Mostly based on libavcodec's
2013-05-24 09:28:18 +02:00
Clément Bœsch
a0a41db339
lavfi/testsrc: make nb_decimals available only in testsrc.
2013-05-23 17:22:05 +02:00
Clément Bœsch
288f916643
lavfi/testsrc: move color options to the color scope filter definition.
2013-05-23 17:22:05 +02:00
Paul B Mahol
1f02927d28
lavfi/mp: try to pass interlaced & tff flags
...
This makes mp=softpulldown actually useful.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-22 20:30:09 +00:00
Clément Bœsch
91b461459a
lavfi/lut3d: avoid overread.
2013-05-22 22:12:14 +02:00
Clément Bœsch
12f51c1f9e
lavfi: add lut3d filter.
...
Fixes part of Ticket #2517 .
2013-05-22 18:23:43 +02:00
Clément Bœsch
39dc1bc90f
lavfi/(a)showinfo: use link frame counter instead of local counter.
2013-05-21 22:29:16 +02:00
Stefano Sabatini
a8d98377b1
lavfi/geq: prefer symbolic constants
...
Hopefully enhance readability.
2013-05-21 21:15:08 +02:00
Stefano Sabatini
2210003b7f
lavfi/geq: add aliases for RGB options
2013-05-21 21:15:00 +02:00
Clément Bœsch
b8a9876a8b
lavfi/yadif: add timeline support.
2013-05-21 16:09:42 +02:00
Stefano Sabatini
b7be8ea92a
lavfi/geq: mark timeline support
2013-05-20 01:40:07 +02:00
Stefano Sabatini
66f32a8a7f
lavfi/drawgrid: fix drawgrid options after 4c205f42c8
2013-05-19 19:26:31 +02:00
Paul B Mahol
68c4633fa8
lavfi/histogram: cache log2 of max_hval
...
Instead of calculating same value over and over again.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-19 14:30:42 +00:00
Michael Niedermayer
9f88db5df1
avfilter/vf_deshake: check rx
...
Fixes crash on SSE2
Fixes Ticket2443
Note, its possible to restructure the code to avoid the 16pixel limitation,
and such change is welcome!
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 18:28:59 +02:00
Michael Niedermayer
849bb62c2c
Merge commit 'cebdedca57d95834a8f8098c7b6a322a1163e26b'
...
* commit 'cebdedca57d95834a8f8098c7b6a322a1163e26b':
prores: decode alpha plane when it's present
avfilter: check a malloc in avfilter_link().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 13:41:47 +02:00
Michael Niedermayer
d56ced5fbf
Merge commit 'bf5b5d2b1561535cc013c12ab8033228bb0d0081'
...
* commit 'bf5b5d2b1561535cc013c12ab8033228bb0d0081':
avfilter.c: cosmetics, reformat
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 13:36:49 +02:00
Michael Niedermayer
fb8dde37e4
Merge commit 'd79bd6040599ef017dc45d5997fcc959ab1f71f6'
...
* commit 'd79bd6040599ef017dc45d5997fcc959ab1f71f6':
lavfi: factorize freeing a link
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 13:10:57 +02:00
Michael Niedermayer
dd2eaf57b7
Merge commit '1dd35611433c224e2231ed7ae26b5b560863a3cb'
...
* commit '1dd35611433c224e2231ed7ae26b5b560863a3cb':
vf_format: do not use the AVFilterFormats internals.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 12:47:22 +02:00
Michael Niedermayer
4742edd50e
Merge commit 'c5ab6088ad7b0dac461fb6757b038f5260e638e5'
...
* commit 'c5ab6088ad7b0dac461fb6757b038f5260e638e5':
af_aformat: cosmetics, fix indentation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 12:22:25 +02:00
Michael Niedermayer
74cb7ef851
Merge commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0'
...
* commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0':
lavfi: rename AVFilterFormats.format_count to nb_formats
Conflicts:
libavfilter/avfiltergraph.c
libavfilter/filtfmts.c
libavfilter/formats.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 11:46:09 +02:00
Michael Niedermayer
0718f0cc24
Merge commit 'bc8c1cdc7bfe7b1fe56df812aabdac3de2555cec'
...
* commit 'bc8c1cdc7bfe7b1fe56df812aabdac3de2555cec':
lavfi doxy: add a page for lavfi.
jpegls: check the scan offset
Conflicts:
libavcodec/jpeglsdec.c
libavfilter/avfilter.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-18 11:04:11 +02:00
Anton Khirnov
7e2b15c094
avfilter: check a malloc in avfilter_link().
...
Additionally change sizeof(type) into sizeof(var)
2013-05-17 20:32:27 +02:00
Anton Khirnov
bf5b5d2b15
avfilter.c: cosmetics, reformat
2013-05-17 20:32:18 +02:00
Anton Khirnov
d79bd60405
lavfi: factorize freeing a link
2013-05-17 20:30:25 +02:00
Anton Khirnov
1dd3561143
vf_format: do not use the AVFilterFormats internals.
...
Use the formats.h API instead.
2013-05-17 20:30:17 +02:00
Anton Khirnov
c5ab6088ad
af_aformat: cosmetics, fix indentation
2013-05-17 20:30:02 +02:00
Anton Khirnov
b01f6041f4
lavfi: rename AVFilterFormats.format_count to nb_formats
...
This is more consistent with naming in the rest of Libav.
2013-05-17 20:29:50 +02:00
Anton Khirnov
bc8c1cdc7b
lavfi doxy: add a page for lavfi.
2013-05-17 20:26:11 +02:00
Paul B Mahol
85e8a1169c
lavfi/pad: switch to AV_OPT_TYPE_COLOR
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-17 11:32:54 +00:00
Paul B Mahol
1d2ecf9609
lavfi/drawtext: switch to AV_OPT_TYPE_COLOR
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-17 11:32:54 +00:00
Paul B Mahol
83e892233c
lavfi/life: switch to AV_OPT_TYPE_COLOR
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-17 11:32:54 +00:00
Paul B Mahol
05b7560d39
lavfi/color: switch to AV_OPT_TYPE_COLOR
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-17 11:32:54 +00:00
Michael Niedermayer
1e9a050bc0
Merge commit '16a645adeb758207346a4bbf66766f02734c461e'
...
* commit '16a645adeb758207346a4bbf66766f02734c461e':
vf_pixdesctest: make config_props work properly when called multiple times.
vf_hqdn3d: make config_props work properly when called multiple times.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-17 11:41:14 +02:00
Michael Niedermayer
71fcb6072e
Merge commit '3fb29588a27a711132106b924e27b53789a58dcb'
...
* commit '3fb29588a27a711132106b924e27b53789a58dcb':
vf_drawtext: don't leak the expressions.
vf_crop: make config_props work properly when called multiple times.
vf_setdar: make config_props work properly when called multiple times.
Conflicts:
libavfilter/vf_aspect.c
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-17 11:29:22 +02:00
Michael Niedermayer
c7078f4907
Merge commit '4c205f42c86ccefa093c59434669af34ad14a52b'
...
* commit '4c205f42c86ccefa093c59434669af34ad14a52b':
vf_drawbox: make config_props work properly when called multiple times.
vf_drawtext: do not reset the frame number in config_input.
vf_fps: move initializing pts from config_props to init.
Conflicts:
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-17 11:05:18 +02:00
Michael Niedermayer
d5e5e73c52
Merge commit 'd371c3c2e2830d9783465ecfe1ab7d93351083b7'
...
* commit 'd371c3c2e2830d9783465ecfe1ab7d93351083b7':
vf_frei0r: make config_props work properly when called multiple times.
vf_gradfun: make config_props work properly when called multiple times.
vf_lut: make config_props work properly when called multiple times.
Conflicts:
libavfilter/vf_lut.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-17 10:51:59 +02:00
Anton Khirnov
16a645adeb
vf_pixdesctest: make config_props work properly when called multiple times.
2013-05-17 07:44:23 +02:00
Anton Khirnov
3ba35a346c
vf_hqdn3d: make config_props work properly when called multiple times.
...
Do not leak all the temp buffers.
2013-05-17 07:44:12 +02:00
Anton Khirnov
3fb29588a2
vf_drawtext: don't leak the expressions.
2013-05-17 07:44:04 +02:00
Anton Khirnov
6592cd22a2
vf_crop: make config_props work properly when called multiple times.
...
Do not leak the x/y expressions.
2013-05-17 07:43:57 +02:00
Anton Khirnov
d5c66d9c56
vf_setdar: make config_props work properly when called multiple times.
...
Do not overwrite the variable set through AVOptions.
2013-05-17 07:43:44 +02:00
Anton Khirnov
4c205f42c8
vf_drawbox: make config_props work properly when called multiple times.
...
Do not overwrite the variables set through AVOptions.
2013-05-17 07:43:17 +02:00
Anton Khirnov
90d9a2a04c
vf_drawtext: do not reset the frame number in config_input.
...
Frame number should be incremented normally even if the link properties
change.
2013-05-17 07:43:07 +02:00
Anton Khirnov
7727be79d1
vf_fps: move initializing pts from config_props to init.
...
It should not be reinitialized if the link properties change.
2013-05-17 07:42:55 +02:00
Anton Khirnov
d371c3c2e2
vf_frei0r: make config_props work properly when called multiple times.
...
Do not leak the initialized filter instance.
2013-05-17 07:42:46 +02:00
Anton Khirnov
87c31cfd7a
vf_gradfun: make config_props work properly when called multiple times.
2013-05-17 07:42:39 +02:00
Anton Khirnov
b06848f4de
vf_lut: make config_props work properly when called multiple times.
...
Do not leak the expressions.
2013-05-17 07:42:28 +02:00
Stefano Sabatini
cb0b0266e5
lavfi/drawbox: restore verbal form for drawbox options descriptions
2013-05-17 00:46:32 +02:00
Stefano Sabatini
0aa013fa8a
lavfi: factorize drawgrid and drawbox code
2013-05-17 00:46:32 +02:00
Clément Bœsch
f3962c6264
lavfi/yadif: fix chroma subsampling with odd sizes.
2013-05-16 23:20:02 +02:00
Clément Bœsch
61b268eeda
lavfi/idet: fix chroma subsampling with odd sizes.
2013-05-16 23:20:00 +02:00
Clément Bœsch
d94c907008
lavfi: silence a discarded const qualifier warning.
2013-05-16 18:38:10 +02:00
Michael Niedermayer
af00d68af0
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
vf_pad: use the name 's' for the pointer to the private context
vf_overlay: use the name 's' for the pointer to the private context
vf_lut: use the name 's' for the pointer to the private context
Conflicts:
libavfilter/vf_lut.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-16 17:03:52 +02:00
Michael Niedermayer
df003cbb56
Merge commit '4753f802c00853859b7b4b8fdb79c35e082cb7f8'
...
* commit '4753f802c00853859b7b4b8fdb79c35e082cb7f8':
vf_libopencv: use the name 's' for the pointer to the private context
vf_hqdn3d: use the name 's' for the pointer to the private context
vf_hflip: use the name 's' for the pointer to the private context
vf_gradfun: use the name 's' for the pointer to the private context
Conflicts:
libavfilter/vf_gradfun.c
libavfilter/vf_hflip.c
libavfilter/vf_hqdn3d.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-16 16:45:43 +02:00
Michael Niedermayer
e55092b12b
Merge commit 'f6b6d6ac42c0ee427fcd3fae4c398b2103b491b8'
...
* commit 'f6b6d6ac42c0ee427fcd3fae4c398b2103b491b8':
vf_frei0r: use the name 's' for the pointer to the private context
vf_format: use the name 's' for the pointer to the private context
vf_fieldorder: use the name 's' for the pointer to the private context
vf_fieldorder: cosmetics, remove an extra linebreak
Conflicts:
libavfilter/vf_frei0r.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-16 15:21:31 +02:00
Clément Bœsch
afec02afe7
lavfi/unsharp: remove unused float.h include.
2013-05-16 13:38:26 +02:00
Clément Bœsch
faceb0af0a
lavfi/unsharp: use av_image_copy_plane().
2013-05-16 13:38:03 +02:00
Michael Niedermayer
04dd5ddeda
Merge commit 'c0279956b3ca3e5fd0a6a25253893d6f07000e68'
...
* commit 'c0279956b3ca3e5fd0a6a25253893d6f07000e68':
vf_fade: use the name 's' for the pointer to the private context
vf_drawtext: use the name 's' for the pointer to the private context
vf_drawbox: use the name 's' for the pointer to the private context
Conflicts:
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-16 10:33:31 +02:00
Michael Niedermayer
a134f9676e
Merge commit 'ba09675f44612fad9f7169f71b8276beb50a0dcd'
...
* commit 'ba09675f44612fad9f7169f71b8276beb50a0dcd':
vf_delogo: use the name 's' for the pointer to the private context
vf_cropdetect: use the name 's' for the pointer to the private context
vf_crop: cosmetics, break lines
Conflicts:
libavfilter/vf_delogo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-16 10:14:00 +02:00
Michael Niedermayer
e77647c528
Merge commit '7f83959598b6565baa0091e5739dd9091ab7a990'
...
* commit '7f83959598b6565baa0091e5739dd9091ab7a990':
vf_crop: use the name 's' for the pointer to the private context
vf_boxblur: use the name 's' for the pointer to the private context
vf_blackframe: use the name 's' for the pointer to the private context
Conflicts:
libavfilter/vf_blackframe.c
libavfilter/vf_boxblur.c
libavfilter/vf_crop.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-16 10:08:17 +02:00
Michael Niedermayer
efc08e00cc
Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'
...
* commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110':
vf_aspect: use the name 's' for the pointer to the private context
Remove commented-out debug #define cruft
Conflicts:
libavcodec/4xm.c
libavcodec/dvdsubdec.c
libavcodec/ituh263dec.c
libavcodec/mpeg12.c
libavfilter/avfilter.c
libavfilter/vf_aspect.c
libavfilter/vf_fieldorder.c
libavformat/rtmpproto.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-16 09:56:43 +02:00
Anton Khirnov
3062ac4c47
vf_pad: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:36:10 +02:00
Anton Khirnov
a70519aad1
vf_overlay: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:36:04 +02:00
Anton Khirnov
8d2565c28b
vf_lut: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:35:59 +02:00
Anton Khirnov
4753f802c0
vf_libopencv: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:35:53 +02:00
Anton Khirnov
56e4ce0d13
vf_hqdn3d: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:35:48 +02:00
Anton Khirnov
7af5ae2d07
vf_hflip: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:33:38 +02:00
Anton Khirnov
05fab5530b
vf_gradfun: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:33:29 +02:00
Anton Khirnov
f6b6d6ac42
vf_frei0r: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:33:23 +02:00
Anton Khirnov
cbec213a90
vf_format: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:33:17 +02:00
Anton Khirnov
d64cf54b34
vf_fieldorder: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:33:07 +02:00
Anton Khirnov
9bbf6c681a
vf_fieldorder: cosmetics, remove an extra linebreak
2013-05-16 07:32:49 +02:00
Anton Khirnov
c0279956b3
vf_fade: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:32:43 +02:00
Anton Khirnov
d3735f7ad6
vf_drawtext: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:32:34 +02:00
Anton Khirnov
20e2794eea
vf_drawbox: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:32:27 +02:00
Anton Khirnov
ba09675f44
vf_delogo: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:31:57 +02:00
Anton Khirnov
e16e23d70e
vf_cropdetect: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:31:50 +02:00
Anton Khirnov
671563d9fd
vf_crop: cosmetics, break lines
2013-05-16 07:31:31 +02:00
Anton Khirnov
7f83959598
vf_crop: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:31:11 +02:00
Anton Khirnov
762df56ef9
vf_boxblur: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:30:56 +02:00
Anton Khirnov
a2a696990c
vf_blackframe: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:30:41 +02:00
Anton Khirnov
b3ea76624a
vf_aspect: use the name 's' for the pointer to the private context
...
This is shorter and consistent across filters.
2013-05-16 07:30:28 +02:00
Clément Bœsch
d686517ad1
lavfi/mp: remove mp=ow wrapper.
...
Filter ported natively as owdenoise.
2013-05-16 00:45:45 +02:00
Clément Bœsch
b1e84efa3d
lavfi: port wavelet denoiser filter from libmpcodecs.
2013-05-16 00:45:45 +02:00
Diego Biurrun
2832ea26f3
Remove commented-out debug #define cruft
2013-05-16 00:23:30 +02:00
Paul B Mahol
c45b823bf8
lavfi/histogram: logarithmic mode for levels
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-15 12:38:39 +00:00
Michael Niedermayer
c7c71f95f8
replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_*
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15 11:23:14 +02:00
Michael Niedermayer
ff4680922f
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*
Conflicts:
doc/APIchanges
libavcodec/avpicture.c
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
libavcodec/imgconvert.c
libavcodec/tiffenc.c
libavfilter/vf_pixdesctest.c
libavfilter/vf_scale.c
libavutil/imgutils.c
libavutil/pixdesc.c
libavutil/version.h
libswscale/swscale_internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15 11:10:09 +02:00
Michael Niedermayer
aa6454e6ca
Merge commit '096696ef0dd391d9430376d1444c1a3cde9171fd'
...
* commit '096696ef0dd391d9430376d1444c1a3cde9171fd':
avfiltergraph: simplify inserting conversion filters.
Clarify output of av_get_bits_per_pixel
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-15 10:21:16 +02:00
Anton Khirnov
e6c4ac7b5f
pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*
2013-05-15 07:46:51 +02:00
Anton Khirnov
ffba2053ed
lavfi: fix compatibility code for old vf_scale options syntax
...
Currently it would incorrectly trigger on a string that contains a '='
but does not contain a ':', e.g. flags=<flags>.
2013-05-15 07:46:04 +02:00
Anton Khirnov
096696ef0d
avfiltergraph: simplify inserting conversion filters.
...
There is now no need to explicitly pass 0:0 as width/height to scale,
those are the defaults.
2013-05-15 07:45:51 +02:00
Clément Bœsch
bc1c90eabf
lavfi/dctdnoiz: fix 10l typo in pr_height computation.
2013-05-15 03:19:49 +02:00
Clément Bœsch
7b43120c7c
lavfi: add dctdnoiz filter.
2013-05-15 00:54:00 +02:00
Michael Niedermayer
640e524ff6
libavfilter/Makefile: unbreak make alltools
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-14 21:58:56 +02:00
Stefano Sabatini
2a1b7dee6d
tools: add zmqsend tool, useful to test the zmq filters
2013-05-14 20:10:55 +02:00
Stefano Sabatini
7ddb0ef9af
lavfi: add zmq filters
2013-05-14 20:10:44 +02:00
Paul B Mahol
b24530019f
lavfi/blend: timeline support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-14 17:41:50 +00:00
Paul B Mahol
811b17fbad
lavfi: cosmetics: fix vertical alignment for pads in some filters
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-14 15:31:56 +00:00
Michael Niedermayer
6b13f54262
vf_colorchannelmixer: round lut entries to nearest
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-14 12:51:22 +02:00
James Darnley
d10499a32a
yadif: correct strides in filter_edges_16bit
...
The C code treats the data as arrays of uint16_t so strides must not
be in bytes but in pixels.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-05-14 09:24:13 +02:00
James Darnley
b0ef0ae776
yadif: restore speed of the C filtering code
...
Always use the special filter for the first and last 3 columns (only).
Changes made in 64ed397
slowed the filter to just under 3/4 of what it
was. This commit restores the speed while maintaining identical output.
For reference, on my Athlon64:
1733222 decicycles in old
2358563 decicycles in new
1727558 decicycles in this
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-05-14 09:23:55 +02:00
Andrey Utkin
47a628bfb3
avfilter: Add 'drawgrid' video filter
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-13 21:34:15 +02:00
Clément Bœsch
0122300c86
lavfi/hqdn3d: restore timeline feature.
2013-05-12 13:07:47 +02:00
Clément Bœsch
0652111833
lavfi/hqdn3d: use macros instead of hardcoded indexes.
2013-05-12 13:07:47 +02:00
Clément Bœsch
1776177b7f
lavfi: replace passthrough_filter_frame with a flag.
...
With the introduction of AVFilterContext->is_disabled, we can simplify
the custom passthrough mode in filters.
This commit is technically a small compat break, but the timeline was
introduced very recently.
Doxy by Stefano Sabatini.
2013-05-12 13:07:47 +02:00
Clément Bœsch
60f0e30431
lavfi/vflip: use FF_CEIL_RSHIFT for chroma w/h rounding.
2013-05-12 12:59:00 +02:00
Clément Bœsch
59d33eafd1
lavfi/lut: use FF_CEIL_RSHIFT for chroma w/h rounding.
2013-05-12 12:59:00 +02:00
Paul B Mahol
91cae60ecb
lavfi/select: unbreak compatibility with older PICT_TYPE syntax
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-12 10:52:26 +00:00
Michael Niedermayer
44f69c0df8
avfilter/af_astats: fix 64bit printf type
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-11 19:10:39 +02:00
Michael Niedermayer
bb0d3a4393
avfilter/vf_mp: remove unused function
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-11 19:08:42 +02:00
Michael Niedermayer
efaa2e01e6
vf_copy: silence "incompatible pointer type" warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-11 15:51:27 +02:00
Clément Bœsch
a9705e4de9
lavfi/curves: avoid ctx pointer indirection.
2013-05-10 23:47:28 +02:00
Michael Niedermayer
2a7d719848
Merge commit '16a4a18db089af8c432f1cdec62155000585b72c'
...
* commit '16a4a18db089af8c432f1cdec62155000585b72c':
af_asyncts: fix offset calculation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-10 23:03:50 +02:00
Paul B Mahol
4868855b13
lavfi/select: set forgotten VAR_PICT_TYPE_BI
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-10 17:39:09 +00:00
Paul B Mahol
005ee7a586
lavfi: avectorscope filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-10 17:11:54 +00:00
Clément Bœsch
50e66726a2
lavfi: use ceil right shift for chroma width/height.
...
This should fix several issues with odd dimensions inputs.
lut, vflip, pad and crop video filters also need to be checked for such
issues. It's possible sws is also affected.
2013-05-10 17:20:06 +02:00
Paul B Mahol
d751a2526f
lavfi/anull: remove redundant lines
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-10 15:08:12 +00:00
highgod0401
63e8fc4d8f
lavfi: modify names of deshake_kernel.h and unsharp_kernel.h
...
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-10 12:44:04 +02:00
Stefano Sabatini
5c4c929878
lavfi/avfiltergraph: fix style
2013-05-10 10:33:00 +02:00
Stefano Sabatini
e1332ff324
lavfi/avfilter.h: fix typo
2013-05-10 10:33:00 +02:00
Anton Khirnov
16a4a18db0
af_asyncts: fix offset calculation
...
delta is in samples, not bytes. Also the sample format is not guaranteed
to be planar.
CC:libav-stable@libav.org
2013-05-10 09:31:27 +02:00
Clément Bœsch
4db84bac13
lavfi/opencl: replace SHIFTUP with FF_CEIL_RSHIFT.
2013-05-09 16:59:43 +02:00
Clément Bœsch
f0250cc463
lavfi/overlay: simpler up-rounded w/h computations.
2013-05-09 16:59:43 +02:00
Clément Bœsch
570d63eef3
lavu: add FF_CEIL_RSHIFT and use it in various places.
2013-05-09 16:59:42 +02:00
Paul B Mahol
88e0e2054d
lavfi: remove alphaextract special code
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-09 14:53:21 +00:00
Michael Niedermayer
696f5f98e2
Merge commit '6e9f8d6a7d7392a236df19fef6f4eba41f18167e'
...
* commit '6e9f8d6a7d7392a236df19fef6f4eba41f18167e':
x86: vf_yadif: Remove stray dsputil_mmx #include
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-09 11:51:40 +02:00
Michael Niedermayer
e4723a82f7
avfilter: fix 2 warnings about discarding const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 23:55:06 +02:00
Michael Niedermayer
1e1015f330
avfilter/af_apad: Support AVFILTER_FLAG_SUPPORT_TIMELINE
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 23:55:06 +02:00
Michael Niedermayer
df9f9caba5
avfilter: Make enabled/disabled state available as a field of the AVFilterContext
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 23:55:06 +02:00
Paul B Mahol
c4a5499d25
lavfi/extractplanes: packed rgb support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-08 19:28:30 +00:00
Paul B Mahol
8245520b88
lavfi/colorchannelmixer: remove now redudant code
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-08 19:24:23 +00:00
Paul B Mahol
deef4b1ac9
lavfi/drawutils: add 16 bit rgb and planar rgb to ff_fill_rgba_map()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-08 19:24:23 +00:00
Diego Biurrun
6e9f8d6a7d
x86: vf_yadif: Remove stray dsputil_mmx #include
2013-05-08 18:18:23 +02:00
Paul B Mahol
8e2972274e
lavfi/null: remove redudant lines
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-08 12:48:05 +00:00
Paul B Mahol
94ff68ccb3
lavfi/lut: add support for YUVA422P and YUVA444P
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-08 12:48:05 +00:00
Paul B Mahol
1f2baec7bd
lavfi: add gbrap support to some filters
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-08 12:48:05 +00:00
Stefano Sabatini
ae0ce99ca4
lavfi/unsharp: use verbal form in help message options
2013-05-08 01:39:12 +02:00
Nicolas George
4582e4c086
lavfi: add comments to explain the negotiation loop.
2013-05-07 18:40:51 +02:00
Nicolas George
78d16b6a51
lavfi: fix filter format negotiation loop.
...
query_formats() returning EAGAIN is not considered a progress
in the format negotiation.
If the filter returns EAGAIN but did set some of its formats
lists, it could be considered a partial success and counted
as progress in the negotiation. Not counting it is not a
problem because it currently only happens in the first round,
where there will always be some progress on the other filters.
2013-05-07 18:40:51 +02:00
Clément Bœsch
d3f7b98f87
lavfi/overlay: reindent fix.
2013-05-07 15:43:28 +02:00
Clément Bœsch
5043d8d213
lavfi/alphaextract: copy width and not linesize.
...
Padding data is not supposed to be copied.
2013-05-07 15:33:49 +02:00
Michael Niedermayer
fe5b089596
Merge commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110'
...
* commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110':
vf_scale: add endianness conversion pixel format in query_formats
Conflicts:
libavfilter/vf_scale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 11:27:44 +02:00
Janne Grunau
5f87c277bd
vf_scale: add endianness conversion pixel format in query_formats
2013-05-06 21:48:15 +02:00
Michael Niedermayer
f4341c64be
avfilter: add av_cold to uninit()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 16:55:06 +02:00
highgod0401
b02f073ad4
lavfi/deshake_opencl: use ff_opencl_set_parameter
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 16:30:22 +02:00
highgod0401
e215cb5e96
lavfi/unsharp_opencl: use av_opencl_errstr
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 12:08:22 +02:00
highgod0401
9a09a9fc43
lavfi/unsharp: fix opencl crash on 64bit linux
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 11:45:40 +02:00
Michael Niedermayer
a1f234be11
make the ordering of the return type and av_cold consistent
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 13:13:00 +02:00
Michael Niedermayer
e7f8493fd8
Merge commit '20c86571ccc71412781d4a4813e4693e0c42aec6'
...
* commit '20c86571ccc71412781d4a4813e4693e0c42aec6':
lavfi: let gcc realign the stack on public graph driving functions
Conflicts:
libavfilter/buffersink.c
libavfilter/buffersrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 12:48:25 +02:00
Michael Niedermayer
a8ff830b79
Merge commit '093804a93cc5da3f95f98265a5df116912443cec'
...
* commit '093804a93cc5da3f95f98265a5df116912443cec':
avfilter: Add av_cold attributes to init/uninit functions
Conflicts:
libavfilter/af_ashowinfo.c
libavfilter/af_volume.c
libavfilter/src_movie.c
libavfilter/vf_lut.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 11:42:18 +02:00
Michael Niedermayer
adaa7743f5
src_movie: fix scanf string
...
Fixes out of array accesses
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 00:56:39 +02:00
Hendrik Leppkes
20c86571cc
lavfi: let gcc realign the stack on public graph driving functions
...
The functions which actually drive the filter graph by pushing
frames through it need to ensure an aligned stack for SIMD functions.
This fixes a crash in YADIF filter when using a mingw build in a MSVC
application.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-05-04 23:40:13 +03:00
Diego Biurrun
093804a93c
avfilter: Add av_cold attributes to init/uninit functions
2013-05-04 21:10:05 +02:00
Stefano Sabatini
f51aa92b0f
lavfi/testsrc: add support for color interactive command
2013-05-03 18:37:54 +02:00
Paul B Mahol
ce322f4c19
extractplanes filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-03 16:30:39 +00:00
Clément Bœsch
e85ea7d387
lavfi/frei0r: fix crash when parameters are not set.
2013-05-03 17:08:33 +02:00
Paul B Mahol
a64c9afe3d
lavfi/blend: merge config_input_top into config_output
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-02 12:22:18 +00:00
Paul B Mahol
990b13806d
lavfi/blend: use correct way to check number of planes
...
This fix crash with gray, as its marked as pseudopal,
and thus have extra plane.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-02 12:22:18 +00:00
Michael Niedermayer
1a94d7c7c8
avfilter/trim: improve rounding precission
...
Note, the design is still flawed, dont expect this to be frame
accurate. float/double first needs to be removed and frames
itself trimmed instead of drop vs nodrop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 13:55:30 +02:00
Michael Niedermayer
3319679d0a
Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876'
...
* commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876':
lavfi: add trim and atrim filters.
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 11:34:34 +02:00
Michael Niedermayer
1cba7fa364
Merge commit 'b472938233b98178ed6c1353c37e0dc7ab585902'
...
* commit 'b472938233b98178ed6c1353c37e0dc7ab585902':
lavfi: add an asetpts filter
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/f_setpts.c
libavfilter/setpts.c
libavfilter/version.h
libavfilter/vf_setpts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 10:59:21 +02:00
Michael Niedermayer
0061ba044a
Merge commit '2548834b2248ad4d7da9bd0afed09d7d0cddeeb0'
...
* commit '2548834b2248ad4d7da9bd0afed09d7d0cddeeb0':
vf_setpts: cosmetics, reformat
Conflicts:
libavfilter/f_setpts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 10:24:45 +02:00
Michael Niedermayer
e41d3aba01
Merge commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8'
...
* commit 'c22263d3e813d442df8fa5f5ba8993573fe775d8':
graphparser: only print filter arguments if they are non-NULL
af_channelmap: ensure the output channel layout is valid.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 10:16:31 +02:00
Michael Niedermayer
a1b8879714
Merge commit '949c603ed9210df0e1b8e1aa82c71b93543d8071'
...
* commit '949c603ed9210df0e1b8e1aa82c71b93543d8071':
af_channelmap: remove now unnecessary goto
vf_split: fix description
Conflicts:
libavfilter/split.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 10:11:01 +02:00
Anton Khirnov
a1e05b0487
lavfi: add trim and atrim filters.
2013-04-30 11:24:57 +02:00
Anton Khirnov
b472938233
lavfi: add an asetpts filter
2013-04-30 11:17:57 +02:00
Anton Khirnov
2548834b22
vf_setpts: cosmetics, reformat
2013-04-30 11:17:23 +02:00
Anton Khirnov
c22263d3e8
graphparser: only print filter arguments if they are non-NULL
2013-04-30 11:16:57 +02:00
Anton Khirnov
8aaab1113c
af_channelmap: ensure the output channel layout is valid.
2013-04-30 11:16:37 +02:00
Anton Khirnov
949c603ed9
af_channelmap: remove now unnecessary goto
...
Options are freed from the generic code now, there is no need to call
av_opt_free() from the filter.
2013-04-30 11:16:22 +02:00
Anton Khirnov
1012155722
vf_split: fix description
...
It now allows an arbitrary number of inputs, not just two.
2013-04-30 11:16:16 +02:00
Paul B Mahol
2bdd434931
lavfi/stereo3d: add support for alternating frames input & output format
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-30 09:13:36 +00:00
Clément Bœsch
d558e46469
lavfi: add two opencl headers to SKIPHEADERS.
...
Fix make checkheaders.
2013-04-30 00:34:58 +02:00
Paul B Mahol
c645659988
lavfi/showwaves: fix crash in case of negative linesize
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-29 19:28:12 +00:00
Paul B Mahol
32d4641219
lavfi/showspectrum: fix crash in case of negative linesize
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-29 19:27:15 +00:00
Michael Niedermayer
e92862e75f
avfilter/vf_tinterlace: fix handling of not so even sizes
...
Fixes green bottom line
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-29 12:26:15 +02:00
Stefano Sabatini
0400176772
lavfi/mp: remove mp=tinterlace wrapper
...
From various tests, there is no evidence that the filter is faster than
the native tinterlace, and it has several more limitations and a few
bugs.
See thread:
Subject: [FFmpeg-devel] [NOPATCH] lavfi/mp: drop tinterlace wrapper
Date: Wed, 5 Sep 2012 00:26:01 +0200
2013-04-28 13:16:40 +02:00
Stefano Sabatini
75070d9fa0
lavfi/transpose: apply grammar consistency fixes to transpose dir option
2013-04-28 13:16:40 +02:00
Stefano Sabatini
028c73358a
lavfi/transpose: reindent constants
2013-04-27 20:33:54 +02:00
Stefano Sabatini
d33c77b14a
lavfi/transpose: restore validity of values in range 4-7
...
They were lost in commit a4e0defa75
.
2013-04-27 20:33:48 +02:00
Paul B Mahol
cc5c155959
astats filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-27 12:40:34 +00:00
Paul B Mahol
785eb5fc57
lavfi/negate: unbreak negate alpha
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-26 23:45:24 +00:00
Clément Bœsch
039c2b7828
lavfi/hqdn3d: remove timeline flag.
...
The filter stores some temporal data, which needs to be done with the
passthrough callback system when timeline is enabled. Until then,
timeline support is disabled.
2013-04-26 21:27:02 +02:00
Paul B Mahol
6a8d05061f
lavfi/stereo3d: avoid division when changing aspect ratio
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-26 10:13:50 +00:00
Paul B Mahol
42d61fd968
lavfi/afade: fix AVOptions descriptions
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-26 10:04:16 +00:00
Paul B Mahol
09250e3445
lavfi/curves: add support for more rgb formats
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-26 09:37:28 +00:00
Paul B Mahol
1a530f9ed8
lavfi: support timeline for colorbalance and colorchannelmixer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-26 09:37:28 +00:00
highgod0401
cd134963e8
lavfi/unsharp: add opencl unsharp filter
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 03:05:26 +02:00
Paul B Mahol
89b5ed5f15
lavfi/noise: remove get_video_buffer, its redundant now
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-25 17:05:42 +00:00
Paul B Mahol
e86ed98f43
lavfi/noise: add missing emms_c()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-25 17:01:40 +00:00
Paul B Mahol
00acfdd926
lavfi/telecine: show time base change too
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-25 16:52:29 +00:00
Clément Bœsch
035a3792c2
lavfi/subtitles: zero-init AVSubtitle.
...
This avoids invalid free when the stream id doesn't match the packet
stream index.
Ticket #2501
2013-04-25 00:56:38 +02:00
Clément Bœsch
73050df240
lavfi: add timeline support in {de,remove}logo.
...
Both don't change anything in the context between frames.
2013-04-24 20:13:01 +02:00
Clément Bœsch
1f6aa7de3e
lavfi: add vidstabutils.h to SKIPHEADERS.
...
Fix checkheaders when vid.stab is not available.
2013-04-24 19:38:06 +02:00
Clément Bœsch
c7d2a3abf0
lavfi/vidstabdetect: fix direct path.
...
The frame must be writable if the show option is set, otherwise pass the
frame unchanged.
2013-04-24 18:30:43 +02:00
Clément Bœsch
c82f6e58da
lavfi/vidstab: remove mention of defaults for consistency with other filters.
2013-04-24 18:30:43 +02:00
Clément Bœsch
111ac10b60
lavfi/vidstab: make use of direct variable.
2013-04-24 18:30:42 +02:00
Clément Bœsch
9273cc8eb5
lavfi/vidstab: add missing flags for 2 options.
2013-04-24 18:30:42 +02:00
Clément Bœsch
cdc48775aa
lavfi/vidstab: consistent descriptions.
2013-04-24 18:30:42 +02:00
Clément Bœsch
017051266b
lavfi/vidstab: miscelenaous cosmetics and typo fixes.
2013-04-24 18:30:42 +02:00
Georg Martius
4364e1f150
lavfi: add video stabilization plugins using vid.stab library
...
vidstabdetect and vidstabtransform common functions for interfacing
vid.stab are in libavfilter/vidstabutils.c
Signed-off-by: Georg Martius <martius@mis.mpg.de>
2013-04-24 18:30:42 +02:00
Stefano Sabatini
638ffb2413
lavfi/hue: rework logic for setting commands
...
In particular, fix h/H commands in case h and H are not specified as
initial parameters.
2013-04-23 22:33:53 +02:00
Michael Niedermayer
8f04220df8
avfilter/geq: rgb support
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-23 16:06:37 +02:00