Arwa Arif
8c7e512ad9
lavfi: remove mp=pp7
...
The filter was ported to a native libavfilter filter in
a299cd5ab3
.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2015-01-13 13:13:04 +01:00
Stefano Sabatini
57ede2a507
lavfi: use ff_norm_qscale(), factorize
2015-01-13 13:12:58 +01:00
Michael Niedermayer
0b52bdfb3b
avfilter/vf_pp7: Add GBRP pixel format
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-10 16:19:16 +01:00
Michael Niedermayer
1673436d85
avfilter/vf_pp7: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-10 16:19:16 +01:00
Michael Niedermayer
bdb136d302
avfilter/internal: add fixme to ff_norm_qscale() to document obvious scaling issue
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-10 02:27:49 +01:00
Arwa Arif
4df01d5d44
avfilter: Factorize the use of norm_qscale in pp7
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-10 02:22:02 +01:00
James Almer
da02ee127a
x86/vf_pp7: port dctB_mmx to yasm
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-01-09 20:02:27 -03:00
Arwa Arif
a299cd5ab3
lavfi: port mp=pp7 to libavfilter
...
The only difference with mp=pp7 is that default mode is "medium", as stated
in the MPlayer docs, rather than "hard".
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2015-01-09 17:26:31 +01:00
Carl Eugen Hoyos
26ac6d5435
lavfi/boxblur: Readd 8bit colour spaces on big-endian.
2015-01-08 15:24:59 +01:00
Michael Niedermayer
f2f88b952d
Merge commit '4438c256387a5845e5cdc5c14c43f4047b68301b'
...
* commit '4438c256387a5845e5cdc5c14c43f4047b68301b':
vf_interlace: remove the warning tag in the message
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-07 00:03:10 +01:00
Michael Niedermayer
82b1bcd7f9
Merge commit '15ea222778caaec0877b3f9938140b707c931d96'
...
* commit '15ea222778caaec0877b3f9938140b707c931d96':
vf_interlace: merge FIELD_LOWER check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-06 23:50:51 +01:00
Michael Niedermayer
6279cb3597
Merge commit '046f75a970701b4c947d38bfd2186dcc5f2ddae2'
...
* commit '046f75a970701b4c947d38bfd2186dcc5f2ddae2':
vf_interlace: also assert for height
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-06 23:40:16 +01:00
Michael Niedermayer
ac3f6429ba
vfilter/vf_tinterlace: Fix issues with linesize and cols
...
Based on patch by Vittorio Giovara <vittorio.giovara@gmail.com> from 696141e898
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-06 23:21:28 +01:00
Michael Niedermayer
f931b1ef45
Merge commit '696141e898193311c994b399a8dc60713709092f'
...
* commit '696141e898193311c994b399a8dc60713709092f':
vf_interlace: use image width rather than linesize
Conflicts:
libavfilter/vf_interlace.c
See: f043965cd5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-06 22:46:10 +01:00
Michael Niedermayer
da0dadbee4
avfilter/buffer: use av_freep() to avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-06 15:07:50 +01:00
Paul B Mahol
145a84717b
lavfi: check av_strdup() return value
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-06 10:02:11 +00:00
Michael Niedermayer
a79ac73b63
avfilter/vf_idet: Add analyze_interlaced_flag mode
...
This should allow us to insert idet before scale and let scale have interl=-1 as default in that case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-06 01:21:19 +01:00
Michael Niedermayer
42411a85b7
avfilter/vf_yadif: detect telecine content
...
Fixes: yadif with interlaced_flag_switch.mpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-06 00:31:37 +01:00
Michael Niedermayer
0e1c827e84
Merge remote-tracking branch 'origin/master'
...
* origin/master:
libavfilter/vf_blend: do not unconditionally compile both filters
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-05 15:55:47 +01:00
Vittorio Giovara
4438c25638
vf_interlace: remove the warning tag in the message
...
The log level is already a warning.
2015-01-05 15:35:46 +01:00
Vittorio Giovara
15ea222778
vf_interlace: merge FIELD_LOWER check
2015-01-05 15:35:46 +01:00
Vittorio Giovara
046f75a970
vf_interlace: also assert for height
2015-01-05 15:35:46 +01:00
Vittorio Giovara
696141e898
vf_interlace: use image width rather than linesize
...
Based on a patch by Michael Niedermayer <michaelni@gmx.at>.
2015-01-05 15:35:46 +01:00
Paul B Mahol
91bdb24400
libavfilter/vf_blend: do not unconditionally compile both filters
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-05 14:14:54 +00:00
Michael Niedermayer
0f931b29f7
Factorize avpriv_mirror() out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-05 01:45:49 +01:00
Michael Niedermayer
9bff052b51
avfilter/vf_sab: fix filtering tiny images
...
Fixes out of array reads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-05 00:49:42 +01:00
Michael Niedermayer
d25d929600
avfilter/vf_idet: Add 9, 12 and 14 bit pixel formats
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-01 05:56:53 +01:00
Michael Niedermayer
18802bc81c
avfilter/vf_idet: Use frame_requested instead of prev
...
This is more robust if the delay is not constant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-01 02:30:16 +01:00
Michael Niedermayer
a288d08d84
avfilter/vf_cropdetect: adjust Default threshold based on bit depth
...
Also allow specifying thresholds that are bit depth independant
Previous version reviewed by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-31 00:33:33 +01:00
Michael Niedermayer
081567397e
avfilter/vf_yadif: add >8bit planar rgb formats
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-30 22:52:45 +01:00
Michael Niedermayer
eb465b8c56
avfilter/vf_uspp: clear AVPacket to not leave uninitialized memory
...
Fixes CID1260707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-30 15:15:36 +01:00
Clément Bœsch
39e18b1f40
avfilter/framepack: use FF_CEIL_RSHIFT()
2014-12-30 14:25:41 +01:00
Michael Niedermayer
e405a8a73e
avfilter/vf_cropdetect: extend limit to cover 16bit pixel formats
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-30 05:33:43 +01:00
Michael Niedermayer
a2e2a9f240
avfilter/vf_cropdetect: fix ; typos
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-30 05:32:14 +01:00
Michael Niedermayer
6ab4812f31
avfilter/vf_cropdetect: support 9-16bit planar formats
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-30 05:31:24 +01:00
Michael Niedermayer
5c7227bbb3
avfilter/vf_cropdetect: Unroll 3 & 4 bytes per sample loop
...
19484 -> 10266 decicycles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-30 02:39:36 +01:00
Michael Niedermayer
60e2c3110a
avfilter/vf_cropdetect: Unroll 1byte per sample loop
...
12807 -> 6336 decicycles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-30 02:32:00 +01:00
Michael Niedermayer
17dc83ab5e
avfilter/vf_cropdetect: add RGB & RGBA support
...
These where already supported in the code but not listed in the supported
pixel formats.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-30 02:19:05 +01:00
Michael Niedermayer
3b1f747238
avfilter/vf_cropdetect: add max_outliers parameter
...
Fixes Ticket3030
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-28 18:10:49 +01:00
Michael Niedermayer
cc91488588
avfilter/vf_cropdetect: Factorize duplicated code using a macro
...
This simplifies subsequent changes
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-27 19:09:05 +01:00
Michael Niedermayer
ed96830afc
avfilter/vf_blend: Fix AVClass
...
Fixes infinite loop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-27 19:01:07 +01:00
Stefano Sabatini
d4fd3f24e8
lavfi: add tblend filter
2014-12-27 16:15:24 +01:00
Michael Niedermayer
fa0e5ffb89
avfilter/vf_cropdetect: add yuv440p and yuv410p support
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-27 05:06:14 +01:00
Michael Niedermayer
a4b13dbd02
avfilter/vf_fspp: Add GBRP and gray8 support
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-26 23:47:15 +01:00
James Almer
a4f876a1a2
x86/vf_fspp: move pxor in store slice functions out of the loop
...
m7 is not overwritten, so we only need to clear it once.
Found by Christophe Gisquet.
Signed-off-by: James Almer <jamrial@gmail.com>
2014-12-26 17:15:34 -03:00
James Almer
466e32bf25
x86/vf_fspp: port inline asm to yasm
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2014-12-26 15:39:51 -03:00
Michael Niedermayer
9224c7f0dd
avfilter/vf_fspp: clarify comment
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-26 18:17:12 +01:00
Michael Niedermayer
4bc0dbfc9f
avfilter/vf_boxblur: generate supported pixfmt list instead of hardcoding
...
This adds support for several more >8bit planar formats
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-26 15:09:59 +01:00
Stefano Sabatini
afaa4a8946
lavfi/blend: add difference128 mode
2014-12-26 11:24:48 +01:00
Clément Bœsch
6e6b0a8eed
avfilter/xbr: reindent after previous commit
2014-12-25 23:50:25 +01:00
Clément Bœsch
87984d2fe2
avfilter/xbr: refactor px calculation in FILT[234]
2014-12-25 23:50:25 +01:00
Clément Bœsch
20cac72a4f
avfilter/xbr: move alpha blend assignment out of the macros
2014-12-25 23:50:25 +01:00
Clément Bœsch
006caf03d7
avfilter/xbr: remove unused mask
2014-12-25 23:50:25 +01:00
Clément Bœsch
2188df96cf
avfilter/xbr: refactor alpha blending macros
2014-12-25 23:50:25 +01:00
Kieran Kunhya
1515bfb313
vf_scale: Use correct chroma positions for YUV420P
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-25 02:53:29 +01:00
James Almer
b94e85453e
avfilter/vf_fspp: add missing inline asm guards
2014-12-24 15:44:06 -03:00
Stefano Sabatini
a51c78c65d
lavfi/mp: drop mp=fspp filter
...
It has been ported to libavfilter.
2014-12-24 16:29:18 +01:00
Arwa Arif
bdc4db0ee3
lavfi: port mp=fspp to a native libavfilter filter
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2014-12-24 16:29:18 +01:00
Clément Bœsch
ecafde6606
avfilter/showwaves: fix height range for cline mode
2014-12-24 15:13:31 +01:00
Clément Bœsch
f6950a077c
avfilter/showwaves: use INT16_MAX instead of a self defined macro
2014-12-24 15:13:31 +01:00
Michael Niedermayer
341bd6ec6a
avfilter/vf_uspp: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-23 22:52:56 +01:00
Michael Niedermayer
c73b288927
avfilter/vf_boxblur: Support 10bit planar formats
2014-12-21 16:12:03 +01:00
Michael Niedermayer
34f103b171
avfilter/vf_boxblur: add gbrp pixfmt
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-21 03:12:02 +01:00
Michael Niedermayer
6706a2986c
avfilter/vf_spp: Fix overflow in 8bit store slice
...
Fixes regression with
ffplay -f lavfi -i testsrc=640x480 -vf format=gray,boxblur=20:10,geq="'mod(lum(X,Y),16)*15'",boxblur=10,geq="'abs(mod(lum(X,Y),15)-7)*32'",spp=4:40
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-21 01:48:19 +01:00
Michael Niedermayer
f622ff16cd
avfilter/vf_boxblur: avoid one addition per line
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-21 00:59:23 +01:00
Michael Niedermayer
7cdce8cb55
avfilter/vf_boxblur: factor rounder offset out
...
3322 -> 3204 cycles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-21 00:58:56 +01:00
Michael Niedermayer
1ac5abb1d0
avfilter/vf_spp: fix overflows with depth > 8
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-20 20:39:13 +01:00
Michael Niedermayer
988ca9bd53
avfilter/vf_spp: add support for 9bit YUV and GBR as well as GBRP10
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-20 18:33:52 +01:00
Michael Niedermayer
649c158e8c
Add FFMPEG_VERSION into the binary libs
...
This simplifies identifying from which revision a binary of a lib came from
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19 19:32:40 +01:00
Michael Niedermayer
b44ae59b70
avfilter/vsrc_life: Use av_freep() avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19 15:04:56 +01:00
Michael Niedermayer
4d48ea3c4b
avfilter/vf_libopencv: use av_freep() avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19 15:04:34 +01:00
Vittorio Giovara
63be97ec40
lavfi: always check av_expr_parse_and_eval() return value
...
CC: libav-stable@libav.org
Bug-Id: CID 703624
2014-12-18 23:27:14 +01:00
Yayoi
0463df6f42
avfilter/lut: reduce dereference in the inner loop
...
For rgb, with a 1080p source, 69 to 74fps on core i5(2 core, 1.8GHz),
and 136 to 160 fps on an core i7(4770R, 3.2Ghz)
Changed the yuv code for consistency, even though the performance
increase is not as obvious as rgb
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-18 21:54:23 +01:00
Michael Niedermayer
19ecd675c5
avfilter/vf_spp: add gbrp support
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-18 17:46:35 +01:00
Michael Niedermayer
4a06215c1a
avfilter/vf_spp: add gray8 support
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-18 17:43:10 +01:00
Michael Niedermayer
3ff8ef62bb
avfilter/vf_spp: Fix pointer type warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-18 16:54:18 +01:00
Paul B Mahol
5f90ef6611
lavfi: add colorlevels filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-12-16 10:10:04 +00:00
Michael Niedermayer
838aa08d75
avfilter/vf_spp: support 10bit per sample
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-15 18:49:35 +01:00
Michael Niedermayer
6de2f027cd
avfilter/vf_dctdnoiz: use av_freep() to avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-14 15:56:32 +01:00
Michael Niedermayer
eb055295bd
avfilter/f_sendcmd: Use av_freep() to avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-14 15:54:45 +01:00
Michael Niedermayer
609a73b6ff
avfilter/vf_uspp: fix gray pixfmt handling
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-13 17:16:49 +01:00
Michael Niedermayer
3dd5f7aaa0
avfilter/vf_uspp: fix used chroma subsampling factors
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-13 16:54:13 +01:00
Michael Niedermayer
354fda7698
avfilter/vf_uspp: fix used pix_fmt
...
Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-13 16:38:44 +01:00
Michael Niedermayer
43fb40c3c3
avfilter/vf_kerndeint: use av_freep(), avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-13 14:18:30 +01:00
Michael Niedermayer
498396f80c
avfilter/vf_unsharp: use av_freep() avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-13 14:18:30 +01:00
Michael Niedermayer
792a5004a1
avfilter/vf_uspp: Add grayscale support
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-13 05:48:28 +01:00
Michael Niedermayer
b898c49ba1
avfilter/vf_uspp: assert that the qp_type is valid
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-13 05:48:28 +01:00
Arwa Arif
9f85c273a3
Delete mp=uspp
2014-12-12 18:28:31 +00:00
Michael Niedermayer
2a8eb0d156
avfilter/vf_spp: The qp array width is qp_stride not stride/16
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-12 18:14:15 +01:00
Michael Niedermayer
e8dbecb995
avfilter/vf_spp: Allocate qp storage after qp_stride is known
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-12 18:13:13 +01:00
Michael Niedermayer
30d2ac4bf9
avfilter/vf_spp: change temporary to unsigned
...
More consistent with uspp and allows for future 10bit support
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-12 13:34:18 +01:00
Michael Niedermayer
e07c82688e
avfilter/vf_uspp: fix integer overflow in intermediate
...
Fixes Ticket3596
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-12 04:28:34 +01:00
Michael Niedermayer
13c3a97bf1
avfilter/vf_uspp: remove YUV 411/422/440
...
snow doesnt support 422/411/440 currently, so these do not work yet
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-12 02:00:31 +01:00
Michael Niedermayer
e1540cdf07
avfilter/vf_uspp: use the average QP instead of QP[0]
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-12 02:00:31 +01:00
Michael Niedermayer
5172782352
avfilter/vf_uspp: The qp array width is qp_stride not stride/16
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-12 02:00:04 +01:00
Michael Niedermayer
d2d8ac24b8
avfilter/vf_uspp: Allocate qp storage after qp_stride is known
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-12 02:00:04 +01:00
Michael Niedermayer
327c5292f2
avfilter/version: bump for uspp
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-12 01:58:52 +01:00
Clément Bœsch
e93abe1f40
avfilter/uspp: use AVFILTER_DEFINE_CLASS()
2014-12-12 01:52:19 +01:00
Clément Bœsch
397859c4a8
avfilter/uspp: make src const in store_slice_c()
2014-12-12 01:45:29 +01:00
Clément Bœsch
73d88109c0
avfilter/uspp: misc style fixes
2014-12-12 01:42:25 +01:00
Arwa Arif
100fc395b6
lavfi: USPP Filter
...
Previous version reviewed by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-12 01:03:44 +01:00
Michael Niedermayer
a2fa1889a6
avfilter/vf_perspective: add av_assert0() to help gcc see that there are no uninitialized variables
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-10 13:40:20 +01:00
Vittorio Giovara
d0b224054f
vf_frei0r: do not increment string if it reached the end
...
Bug-Id: 778
CC: libav-stable@libav.org
2014-12-08 13:30:38 +00:00
Михаил Муковников
71f29410e7
lavfi: Increase drawtext font size limits
...
Raise the maximum font size to a larger value.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-12-07 13:15:03 +01:00
Michael Niedermayer
7ad742b224
avfilter/vf_signalstats: fix avframe leak on error
...
Fixes CID1257014
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-06 17:05:20 +01:00
Michael Niedermayer
8280b7db47
avfilter/buffersrc: add context to av_log() call
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-06 15:31:05 +01:00
Michael Niedermayer
b4ece54947
avfilter/avcodec: use NULL instead of 0 for pointer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-06 15:29:23 +01:00
Michael Niedermayer
46b64e3098
Revert "avfilter/vf_interlace: more accurate pts calculation"
...
This reverts commit df8248f66e
.
the revert produces a timebase and timestamps that are more close
to what users expect
Hoped-by: koda
2014-12-02 18:48:03 +01:00
Michael Niedermayer
59f1f764d6
avfilter/vf_tinterlace: Favor using standard timebases for the output
...
Reported-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Inspired by discussion with Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-02 18:28:06 +01:00
Neil Birkbeck
e4788e9cd9
avfilter/vf_yadif: fix extra leading dup frame when deint=1
...
Logic for handling single frame in yadif (0f9f24c9
), caused deint=1 (e.g., yadif=0👎 1) to output extra duplicate leading frame:
ffmpeg -i fate-suite/ffmpeg-synthetic/vsynth1/%02d.pgm -vf yadif=0👎 1,showinfo -f null -y /dev/null
[Parsed_showinfo_1 @ 0x1d967d0] n:0 pts:0 pts_time:0 pos:-1 fmt:gray sar:0/1 s:352x432 i:P iskey:1 type:I checksum:E457EEA0 plane_checksum:[E457EEA0] mean:[126] stdev:[46.6]
[Parsed_showinfo_1 @ 0x1d967d0] n:1 pts:0 pts_time:0 pos:-1 fmt:gray sar:0/1 s:352x432 i:P iskey:1 type:I checksum:E457EEA0 plane_checksum:[E457EEA0] mean:[126] stdev:[46.6]
(Outputs 51 frames)
After patch, vf "yadif=0👎 1" behaves correctly (like "yadif=0👎 0") and outputs 50 frames, first two:
[Parsed_showinfo_1 @ 0x1e307d0] n:0 pts:0 pts_time:0 pos:-1 fmt:gray sar:0/1 s:352x432 i:P iskey:1 type:I checksum:68E8D1EB plane_checksum:[68E8D1EB] mean:[126] stdev:[46.0]
[Parsed_showinfo_1 @ 0x1e307d0] n:1 pts:2 pts_time:0.04 pos:-1 fmt:gray sar:0/1 s:352x432 i:P iskey:1 type:I checksum:4E674BC7 plane_checksum:[4E674BC7] mean:[125] stdev:[46.0]
(Outputs 50 frames)
Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-29 21:59:47 +01:00
Neil Birkbeck
dd5d617956
avfilter/vf_idet: Fixing idet for single-frame inputs.
...
Handle single frame inputs similar to yadif (e.g., 0f9f24c9cf
and 681e008d06
)
Example:
ffmpeg -r 1 -t 1 -i fate-suite/ffmpeg-synthetic/vsynth1/%02d.pgm -vf idet,showinfo -f null -y /dev/null
Previously:
Output file is empty, nothing was encoded (check -ss / -t / -frames parameters if used)
[Parsed_idet_0 @ 0x36389d0] Repeated Fields: Neither: 0 Top: 0 Bottom: 0
After patch:
[Parsed_showinfo_1 @ 0x1909810] n:0 pts:0 pts_time:0 pos:-1 fmt:gray sar:0/1 s:352x432 ...
[Parsed_idet_0 @ 0x18f9bb0] Repeated Fields: Neither: 1 Top: 0 Bottom: 0
Fate looks good.
Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-28 23:38:59 +01:00
Kieran Kunhya
96fda42a8f
vf_interlace: get rid of useless loads
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-11-27 13:57:50 +01:00
Clément Bœsch
c2ea7069c4
avfilter/signalstats: re-use yuv/yuvu/yuvv vars in diff
2014-11-26 21:29:09 +01:00
Clément Bœsch
9cb1d81a60
avfilter/signalstats: localize a few variables
2014-11-26 21:29:09 +01:00
Clément Bœsch
82dda8e4ea
avfilter/signalstats: add threading in compute_sat_hue_metrics
2014-11-26 21:29:09 +01:00
Clément Bœsch
7acbd56a8a
avfilter/signalstats: isolate sat hue computation metrics in a function
...
This will be useful for the following commit
2014-11-26 21:29:09 +01:00
Clément Bœsch
9db78a296c
avfilter/signalstats: add slice threading for subfilters
2014-11-26 21:29:09 +01:00
Clément Bœsch
fad6865748
avfilter/signalstats: fix repitition/repetition typo
2014-11-26 21:29:09 +01:00
Clément Bœsch
cc5c667eb1
avfilter/signalstats: reindent after previous commit
2014-11-26 21:29:08 +01:00
Clément Bœsch
56b98dfc4f
avfilter/signalstats: integrate height loop into subfilters
2014-11-26 21:29:08 +01:00
Clément Bœsch
c7e8f610f2
avfilter/signalstats: remove pointless sub filter init system
2014-11-26 21:29:08 +01:00
Clément Bœsch
b424e67abf
avfilter/signalstats: fix different buffers for out frame if burn is enabled
...
This was the original intend.
2014-11-26 21:29:08 +01:00
Michael Niedermayer
ca59b5b6ec
avfilter/x86/vf_interlace: remove redundant instructions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-25 12:37:19 +01:00
Michael Niedermayer
3fe3c8abb1
Merge commit 'ca5c3ff90972a5c97aabda2ace57ba72dcd7d83b'
...
* commit 'ca5c3ff90972a5c97aabda2ace57ba72dcd7d83b':
vf_interlace: x86: improve asm performance
Conflicts:
libavfilter/x86/vf_interlace.asm
See: 05e4b25e9b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-25 12:31:45 +01:00
Michael Niedermayer
ca5c3ff909
vf_interlace: x86: improve asm performance
...
4775 decicycles -> 3688 decicycles
2014-11-25 02:00:06 +00:00
Michael Niedermayer
9146a47600
avfilter/graphparser: Use av_freep(), avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-22 18:56:37 +01:00
Michael Niedermayer
7df2981f04
avfilter/avf_concat: Use av_freep(), avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-22 18:47:26 +01:00
Michael Niedermayer
b9ffafbfcc
avfilter/formats: Alloc NULL fmts in SET_COMMON_FORMATS()
...
This avoids null pointer dereferences in case memory allocation has failed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-21 22:15:32 +01:00
Michael Niedermayer
75819fafd8
avfilter/formats: free the correct pointer in ADD_FORMAT()
...
Also only free it when it was not previously allocated to return to the
state prior to the failing function call
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-21 22:13:44 +01:00
Michael Niedermayer
42f3cb419a
Merge commit '863ee8a855b8ce27ffef41479eb66da58763faed'
...
* commit '863ee8a855b8ce27ffef41479eb66da58763faed':
lavfi: clean memory on error in ADD_FORMAT()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-21 22:12:46 +01:00
Vittorio Giovara
863ee8a855
lavfi: clean memory on error in ADD_FORMAT()
...
CC: libav-stable@libav.org
Bug-Id: CID 1250334
2014-11-21 12:27:07 +00:00
Michael Niedermayer
9e526213a2
avfilter/af_volume: Use avpriv_float_dsp_alloc()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-18 12:38:38 +01:00
Michael Niedermayer
aa97223f14
avfilter/af_amix: Use avpriv_float_dsp_alloc()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-18 12:24:16 +01:00
Matthew Oliver
70205f1799
mpcodecs: Use _INLINE guards for inline asm.
...
Enabled compilation with compiler without inline asm support.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-17 15:16:34 +01:00
Michael Niedermayer
08ee02deca
avfilter/vf_tinterlace: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-16 01:06:18 +01:00
Clément Bœsch
77204f7366
avfilter/xbr: fix style in FILT4() calls
2014-11-15 22:48:22 +01:00
Clément Bœsch
7eece06934
avfilter/xbr: clarify default "interpolated" pixels assignments
2014-11-15 22:46:19 +01:00
Clément Bœsch
bca3c2cfc0
avfilter/xbr: refactor xbr[234]x into a single function
...
No speed difference.
2014-11-15 22:35:29 +01:00
Clément Bœsch
8bc1553cdb
avfilter/xbr: add slice threading
2014-11-15 22:15:32 +01:00
Clément Bœsch
454b714283
avfilter/xbr: add video and filtering flags to options
...
Fixes ffmpeg -h filter=xbr
2014-11-15 21:22:00 +01:00
Clément Bœsch
be96201e5b
avfilter/xbr: use function pointers for xbr[234]x
2014-11-15 21:18:18 +01:00
Clément Bœsch
c4fb79a3db
avfilter/xbr: remove FATE test entry from @todo
...
See 57688aecbd
2014-11-15 21:13:18 +01:00
Clément Bœsch
9a796f7f18
avfilter/xbr: consistent copyright header
2014-11-15 21:06:13 +01:00
Clément Bœsch
d1529273fb
avfilter/xbr: make xbr[234]x a bit more consistent
2014-11-15 21:06:13 +01:00
Clément Bœsch
a99004a926
avfilter/xbr: misc style fixes
2014-11-15 21:01:40 +01:00
Clément Bœsch
fda209b741
avfilter/xbr: simplify left/up conditions
2014-11-15 21:01:40 +01:00
Clément Bœsch
a3c3ee6973
avfilter/xbr: misc cleanup in FILT[234] macros
2014-11-15 21:01:40 +01:00
Clément Bœsch
7e91f77547
avfilter/xbr: refactor src/dst pointers definitions into a macro
2014-11-15 21:01:39 +01:00
Clément Bœsch
18e4bf4f54
avfilter/xbr: refactor the 21 pixels definition into a macro
2014-11-15 21:01:39 +01:00
Clément Bœsch
6bf9786a9b
avfilter/xbr: mark source pointers as const
2014-11-15 21:01:36 +01:00
Clément Bœsch
e070484040
avfilter/xbr: simplify width overread checks
2014-11-15 20:31:41 +01:00
Clément Bœsch
55f05ac0f1
avfilter/xbr: use different macro names for each dimension
2014-11-15 20:31:41 +01:00
Clément Bœsch
9f9c741771
avfilter/xbr: avoid unecessary macro redirections
2014-11-15 20:31:41 +01:00
Clément Bœsch
086487b633
avfilter/xbr: localize some filtering variables
2014-11-15 20:31:41 +01:00
Clément Bœsch
08bb6f919c
avfilter/xbr: do not pass unchanging r2y to macros
2014-11-15 20:31:41 +01:00
Stefano Sabatini
aea7616d39
lavfi/xbr: remove relicensing notice from copyright header
...
The log is good enough for tracking those changes.
2014-11-15 20:13:53 +01:00
Arwa Arif
a2f05d3337
lavfi : change xBR filter to LGPL
...
Hyllian's message : "Hi, Put lgpl on this and use it as you wish. It's free!"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 18:54:54 +01:00
Michael Niedermayer
05e4b25e9b
avfilter/x86/vf_interlace: rewrite asm
...
4775 decicycles -> 3688 decicycles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 04:09:03 +01:00
Michael Niedermayer
fb3eb57369
avfilter/tinterlace: add Support for ff_lowpass_line_avx() & ff_lowpass_line_sse2()
...
Based-on: 2e1704059a
by Kieran Kunhya
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 04:02:33 +01:00
Michael Niedermayer
18b46ecc93
avfilter/tinterlace: Move lowpass_line to a separate function and call it through a function pointer
...
This permits replacing it by a optimized implementation
Based-on / Idea-from: 2e1704059a
by Kieran Kunhya
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 03:25:43 +01:00
Michael Niedermayer
9d548fce24
avfilter/tinterlace: split context definition into seperate header so it can be used by future optimizations
...
Idea from 2e1704059a
from Kieran Kunhya
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 03:22:35 +01:00
Michael Niedermayer
f043965cd5
avfilter/vf_tinterlace: fix linesize vs. width
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 03:03:58 +01:00
Michael Niedermayer
05e0ea6050
avfilter/vf_tinterlace: Fix output top field first flag for MODE_INTERLACEX2
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 02:45:13 +01:00
Michael Niedermayer
6f373d75e8
Merge commit '2e1704059ae8625beda2ffde847ad22c5ba416dc'
...
* commit '2e1704059ae8625beda2ffde847ad22c5ba416dc':
vf_interlace: Add SIMD for lowpass filter
Conflicts:
libavfilter/vf_interlace.c
libavfilter/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-15 02:39:49 +01:00
Kieran Kunhya
2e1704059a
vf_interlace: Add SIMD for lowpass filter
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-11-15 00:35:31 +01:00
Peter Ross
b186b7131e
avfilter/vf_lut: gammaval709()
...
See http://www.itu.int/rec/R-REC-BT.709
Item 1.2, overall opto-electronic transfer characteristics at source
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-14 02:55:15 +01:00
Aleksey Vasenev
8349001638
avfilter/vf_tinterlace: fix frame rate
...
Signed-off-by: Aleksey Vasenev <margtu-fivt@ya.ru>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-13 22:35:15 +01:00
Aleksey Vasenev
df8248f66e
avfilter/vf_interlace: more accurate pts calculation
...
Signed-off-by: Aleksey Vasenev <margtu-fivt@ya.ru>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-13 22:35:15 +01:00
Stefano Sabatini
73f74f6b16
lavfi/xbr: apply misc cosmetical fixes
2014-11-10 11:55:53 +01:00
Clément Bœsch
30466cac9d
avfilter/xbr: drop yet another x2 reference
2014-11-10 06:34:11 +01:00
Clément Bœsch
937ebb8435
avfilter/xbr: fix filter description field
2014-11-10 06:32:27 +01:00
Clément Bœsch
548a5f7ef6
avfilter/xbr: fix TODO entry
2014-11-10 06:28:44 +01:00
Clément Bœsch
fc0a91e3cd
avfilter/xbr: consistent use of @see
2014-11-10 06:26:45 +01:00
Michael Niedermayer
064a237669
avfilter/vf_xbr: Uppercase first letter of context type for consistency
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-10 03:45:00 +01:00
Arwa Arif
19d0949d31
lavfi: add xbr filter xBR
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-10 03:45:00 +01:00
Marton Balint
86476c510e
avfilter/avf_showwaves: fix off by one error in loop condition
...
It caused segfaults.
Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-09 16:44:10 +01:00
Michael Niedermayer
d70e503ebc
avfilter/af_aresample: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-06 15:58:28 +01:00
Kevin Mitchell
fdf22f973d
avfilter/vf_idet: add a repeated field detection
...
This can be useful for determining telecine.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-05 12:10:42 +01:00
Michael Niedermayer
09024fe681
avfilter/af_aresample: Limit data per inserted packet
...
This avoids creating unwieldy large packets, which is allowed but
does not seem to be a good idea
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-04 17:17:24 +01:00
Michael Niedermayer
97da68172a
avfilter/af_aresample: split flushing code out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-04 17:17:23 +01:00
Michael Niedermayer
898635ad9e
avfilter/vf_idet: use exp2()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-03 17:22:33 +01:00
Michael Niedermayer
4bbd8f05f7
avfilter/vf_idet: use av_rescale()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-03 17:22:16 +01:00
Michael Niedermayer
5d590d87b3
avfilter/vf_idet: fix rounding of av_dict_set_fxp()
...
fixes the remainder overflowing beyond .999
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-03 17:14:29 +01:00
Kevin Mitchell
fe6f5f2908
avfilter/vf_idet: add a "half_life" option for statistics
...
This can be useful for videos in which the interlacing pattern changes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-03 16:31:26 +01:00
Michael Niedermayer
013c3eb05c
avfilter/vf_drawtext: use gm_time_r() for thread saftey
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-02 19:20:26 +01:00
Kevin Mitchell
ae6118de19
avfilter/idet: add current frame classification to metadata
...
Fixes ticket 3832
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-01 18:04:35 +01:00
Kevin Mitchell
2847843868
avfilter/idet: add metadata to "current" frame instead of "next" frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-01 18:03:38 +01:00
Michael Niedermayer
4360c6ff61
Merge commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6'
...
* commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6':
drawtext: Remove the ifdef for localtime_r
Conflicts:
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-26 03:12:37 +01:00
Martin Storsjö
6b9b42cc55
drawtext: Remove the ifdef for localtime_r
...
If it isn't available in the system, we've got a fallback to
the normal localtime function, so normal code can assume it is
available as long as time_internal.h is included.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-26 00:14:54 +03:00
Michael Niedermayer
0d96d44c4f
avfilter: Read errno before av_log() as the callback from av_log() might affect errno
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-25 13:28:51 +02:00
Michael Niedermayer
1945db1f13
Merge commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435'
...
* commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435':
avfilter: check filter link validity
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-25 03:08:19 +02:00
Vittorio Giovara
ac84c1ce24
avfilter: check filter link validity
...
Remove now redundant check.
CC: libav-stable@libav.org
Bug-Id: CID 700371
2014-10-24 23:42:19 +01:00
Neil Birkbeck
ad5c43bb36
avfilter/vf_idet: Fixes issue with idet not flushing last frame.
...
Uses a similar approach as vf_yadif to flush the last frame in idet.
Quick test with 50 frames from vsynth1:
./ffmpeg.old -i fate-suite/ffmpeg-synthetic/vsynth1/%02d.pgm -vf idet -f mp4 -y /dev/null 2>&1 | grep Multi
(gives) [Parsed_idet_0 @ 0x261ebb0] Multi frame detection: TFF:0 BFF:0 Progressive:48 Undetermined:1
./ffmpeg -i fate-suite/ffmpeg-synthetic/vsynth1/%02d.pgm -vf idet -f mp4 -y /dev/null 2>&1 | grep Multi
(gives) [Parsed_idet_0 @ 0x35a0bb0] Multi frame detection: TFF:0 BFF:0 Progressive:49 Undetermined:1
Fate tests have been updated.
(In testing, it seems this filter will also need a subsequent patch for single frame input)
Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-22 15:07:36 +02:00
Stefano Sabatini
843d7bb3a6
lavfi/concat: accept a single segment
...
Simplify scripting operations, so that n=1 is not to be considered as a
special case.
2014-10-21 13:28:40 +02:00
Stefano Sabatini
7ba2e134fb
lavfi/afade: fix cur_sample computation
...
Use the correct timebase conversion.
2014-10-21 13:28:08 +02:00
Michael Niedermayer
2e0ac145d5
Merge commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04'
...
* commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04':
vf_format: check input validity
See: ee16e0cacc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-20 22:02:45 +02:00
Kevin Mitchell
ff68ceb1b5
avfilter/vf_idet: add both multiple and single frame detection metadata
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-20 14:52:27 +02:00
Vittorio Giovara
d1afd3e1d6
vf_format: check input validity
...
CC: libav-stable@libav.org
2014-10-20 10:38:38 +01:00
Nicholas Robbins
22cfa1f759
libavfi: added option to vf_perspective to specify transformation by giving destinations of corners of source.
...
Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-19 17:59:53 +02:00
Kevin Mitchell
9d51bad625
avfilter/vf_idet: add counts to frame metadata
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-19 15:03:13 +02:00
Michael Niedermayer
733db64ce0
Merge commit '0d989dbfc4bc5bc1d563e967449116a7a9865258'
...
* commit '0d989dbfc4bc5bc1d563e967449116a7a9865258':
af_resample: check av_opt_set_dict return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-18 22:04:36 +02:00
Michael Niedermayer
3a4c22f806
Merge commit '6d96c7ea89600655b1f18a3b12f3f041fa714152'
...
* commit '6d96c7ea89600655b1f18a3b12f3f041fa714152':
vf_showinfo: Forward the av_image_get_linesize error
Conflicts:
libavfilter/vf_showinfo.c
See: 2aecfd4f20
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-18 21:50:34 +02:00
Michael Niedermayer
0b2f860db5
Merge commit 'f401792595dd7760f531e8a3bd2336e9033bd45a'
...
* commit 'f401792595dd7760f531e8a3bd2336e9033bd45a':
vf_drawtext: Do not leak the mmapped textfile
Conflicts:
libavfilter/vf_drawtext.c
See: 6956b048d8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-18 21:33:04 +02:00
Vittorio Giovara
0d989dbfc4
af_resample: check av_opt_set_dict return value
...
CC: libav-stable@libav.org
Bug-Id: CID 1087076
2014-10-18 16:15:10 +01:00
Vittorio Giovara
6d96c7ea89
vf_showinfo: Forward the av_image_get_linesize error
...
CC: libav-stable@libav.org
Bug-Id: CID 1087086
2014-10-18 16:15:10 +01:00
Luca Barbato
f401792595
vf_drawtext: Do not leak the mmapped textfile
...
And validate its size while at it.
CC: libav-stable@libav.org
Bug-Id: CID 1244189
2014-10-18 16:15:09 +01:00
Michael Niedermayer
17d16008be
Merge commit '6cbbf0592f4f3940aac7f687850d1b726a2ea836'
...
* commit '6cbbf0592f4f3940aac7f687850d1b726a2ea836':
resample: Avoid off-by-1 errors in PTS calcs.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-18 12:47:37 +02:00
Timothy B. Terriberry
6cbbf0592f
resample: Avoid off-by-1 errors in PTS calcs.
...
The rounding used in the PTS calculations in filter_frame() does
not actually match the number of samples output by the resampler.
This leads to off-by-1 errors in the timestamps indicating gaps and
underruns, even when the input timestamps are all contiguous.
Bug-Id: 753
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-10-18 05:01:59 +02:00
James Almer
864f9326fb
x86/vf_noise: move asm code to a separate file
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2014-10-17 00:44:35 -03:00
Michael Niedermayer
4f1a252fd3
avfilter/vf_noise: Use a separate seed for each plane
...
This should reduce the correlation between planes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-16 15:05:17 +02:00
Michael Niedermayer
ed3efbcd0c
avfilter/vf_noise: use per component rand_shift
...
This allows using different shifts per plane
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-16 15:04:49 +02:00
Michael Niedermayer
aba61b22f7
avfilter/vf_noise: move shift calculation to filter_frame()
...
This makes the temporal noise case deterministic with threads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-16 14:28:47 +02:00
Michael Niedermayer
411be72dcb
avfilter/vf_noise: fix high resolution support
...
Fixes Ticket4017
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-16 13:23:39 +02:00
Michael Niedermayer
5ee6fb7583
avfilter/vf_pp: add gbrp support
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-14 17:15:56 +02:00
Michael Niedermayer
b8c50becc8
avfilter/vf_pp: support AV_PIX_FMT_GRAY8
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-13 01:56:14 +02:00
Michael Niedermayer
9a460db63b
avfilter/vf_pp: add yuv 4:4:0 support
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-12 22:22:39 +02:00
James Almer
59d8050df1
avfilter: remove obsolete FF_API_DRAWTEXT_OLD_TIMELINE cruft
2014-10-12 15:54:58 -03:00
Karl Kiniger
903156aa8a
vf_drawtext: add missing clear of pointers after av_expr_free()
...
Fixes segfault when using sendcmd with drawtext.
Since LIBAVFILTER_VERSION_MAJOR 5 FF_API_DRAWTEXT_OLD_TIMELINE
evaluates to 0.
Signed-off-by: Karl Kiniger <karl.kiniger@med.ge.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-11 23:16:31 +02:00
Clément Bœsch
abaf4245a1
avfilter: add w/h parameters in timeline
...
Fixes Ticket #4008 .
2014-10-07 15:05:50 +02:00
Michael Niedermayer
2d6f31730c
avfilter/af_adelay: use av_freep(), do not leave stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-07 13:44:26 +02:00
Derek Buitenhuis
23c9ebffb5
avfilter: Properly check for failed format query
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2014-10-02 12:22:49 +01:00
Derek Buitenhuis
1dbc3e8ac8
avfilter/aresample: Check for memory alloc failure for out sample rates
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2014-10-02 12:22:37 +01:00
Paul B Mahol
bfdf0f078a
avfilter/signalstats: add more pixel formats
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-09-27 07:28:06 +00:00
Reynaldo H. Verdejo Pinochet
a9ea79bb49
libavfilter/af_amix: avoid derreferencing possible null
...
ff_all_channel_layouts() might return null on alloc failure.
Fixes CID1241516
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
2014-09-26 18:42:39 -03:00
Reynaldo H. Verdejo Pinochet
32288234a2
libavfilter/af_channelmap: avoid derreferencing possible null
...
ff_all_channel_layouts() might return null on alloc failure.
Fixes CID1241517
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
2014-09-26 18:42:39 -03:00
Reynaldo H. Verdejo Pinochet
e3e051c42c
libavfilter/af_join: avoid derreferencing possible null
...
ff_all_channel_layouts() might return null on alloc failure.
Fixes CID1241518
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
2014-09-26 18:42:39 -03:00
Michael Niedermayer
e927682e1b
avfilter/vf_scale: Allow chroma samples to be above and to the left of luma samples
...
Found-by: Kierank
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-21 12:24:03 +02:00
Pascal Massimino
7ac6b8cfa7
avfilter/idet: typo fix: PROGRSSIVE -> PROGRESSIVE
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-20 12:09:14 +02:00
Andreas Cadhalpun
739f179dd6
vf_deshake: rename Transform.vector to Transform.vec to avoid compiler confusion
...
The token 'vector' is a keyword in the Vector/SIMD Multimedia Extension data types and thus should not be used as a variable name.
This fixes building on powerpc/ppc64el.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-18 00:48:15 +02:00
James Almer
fffc9a077d
avfilter: remove obsolete FF_API_FILL_FRAME cruft
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2014-09-17 15:23:26 -03:00
James Almer
d1c49bcae9
avfilter: remove obsolete FF_API_ACONVERT_FILTER cruft
...
Signed-off-by: James Almer <jamrial@gmail.com>
2014-09-17 07:43:03 +00:00
Clément Bœsch
4b58349bc8
avfilter/ass: add shaping option
...
The documentation is mostly based on ass.h public header.
2014-09-16 21:23:33 +02:00
Clément Bœsch
8a9c5db29e
avfilter/ass: better log level mapping
2014-09-16 21:23:33 +02:00
Clément Bœsch
a87527ad67
avfilter/ass: make sure the log level are in available range
2014-09-16 21:23:33 +02:00
James Almer
ad1dadac86
avfilter: remove obsolete FF_API_BUFFERSRC_BUFFER cruft
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2014-09-15 15:54:06 -03:00
Pascal Massimino
649b7a9946
av_filter/x86/idet: use HADDD where appropriate
...
Signed-off-by: James Almer <jamrial@gmail.com>
2014-09-09 19:02:49 -03:00
Pascal Massimino
e3fd6a3a4e
av_filter/x86/idet: MMX/SSE2 implementation of 16bits filter_line()
...
tested on http://ps-auxw.de/10bit-h264-sample/10bit-eldorado.mkv
MMX: ~30% faster decoding overall
SSE2:~40% faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-09 16:47:22 +02:00
Michael Niedermayer
02946120fc
avfilter/vf_cropdetect: Do not check lines or columns twice on black frames
...
Idea from patch by: hjiodjf 97xgw46 <jfbvxt@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-09 02:06:17 +02:00
Michael Niedermayer
1b2390e2bc
avfilter/af_silenceremove: remove dead code
...
Fixes CID1237284
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-06 21:36:56 +02:00
Clément Bœsch
b2c0b80f62
avfilter/ebur128: rework channel weighting definition code
...
Should fix CID1194399 (Bad bit shift operation)
2014-09-06 13:47:59 +02:00
Paul B Mahol
422619646e
add silenceremove filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-09-05 17:30:57 +00:00
James Darnley
db8970d7b6
vfi/x86/vf_idet: fix incorrect use of paddq
...
paddq is an SSE2 instruction so it cannot be used for MMX.
This was probably just a typo because the sums are dwords anyway.
Reviewed-by: Pascal Massimino <pascal.massimino@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05 12:49:34 +02:00
Pascal Massimino
161fc0f463
avfilter/x86/idet: fix license header (GPL -> LGPL)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05 12:22:36 +02:00
skal
406a9ccffe
avfilter/vf_idet: MMX/MMXEXT/SSE2 implementation of idet's filter_line()
...
integration by Neil Birkbeck, with help from Vitor Sessak.
core SSE2 loop by Skal (pascal.massimino@gmail.com )
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-04 22:19:00 +02:00
Reimar Döffinger
098af26067
vf_deshake: Avoid doing a malloc+free for every single frame.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-09-02 19:20:28 +02:00
Reimar Döffinger
4ea8406e38
vf_deshake: reduce stack usage.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-09-02 19:20:28 +02:00
Reimar Döffinger
6d7aa437e1
vf_drawtext: move "static const" before "struct".
...
This is consistent with all other occurrences.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-08-31 10:41:42 +02:00
Reimar Döffinger
c9a4ec7969
lavfi: add const/static const to pix_fmts arrays.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-08-31 10:25:36 +02:00
Michael Niedermayer
0daff3ce76
avfilter/vf_mp: remove incorrect usage of AVFrame.type
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-30 12:16:46 +02:00
Reimar Döffinger
d9e2aceb7f
Add missing "const" all over the place.
...
Only "./configure --enable-gpl" on x86 was tested.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-08-29 18:57:25 +02:00