Commit Graph

5075 Commits

Author SHA1 Message Date
Michael Niedermayer
e0623953e1 avfilter/vf_frei0r: fix build with DEBUG enabled
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-17 15:41:23 +01:00
Michael Niedermayer
353cf95f94 avfilter/vf_frei0r: also set AVFilterLink.frame_rate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-17 14:46:21 +01:00
Michael Niedermayer
a46a23d30f avfilter/vf_framepack: Check and update frame_rate
The frame_rate update was missing leaving the output frame rate
wrong.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-16 22:02:52 +01:00
Clément Bœsch
f532603993 avfilter: add showpalette filter 2015-01-15 16:36:13 +01:00
Clément Bœsch
3b3229aef3 avfilter/edgedetect: fix indent 2015-01-15 11:39:41 +01:00
Paul B Mahol
baea14d860 avfilter: port qp filter from libmpcodecs
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-14 18:46:38 +01:00
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
Clément Bœsch
f888331769 avfilter: add codecview filter 2014-08-24 14:35:11 +02:00
Muhammad Faiz
c82a288f87 avfilter/showcqt: add fontcolor option 2014-08-23 10:01:22 +02:00
Timothy Gu
8495c6086d vidstabutils: improve documentation
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-22 22:19:20 +02:00
Timothy Gu
6e51e746c4 vidstab*: Remove accidentally exported av_2_vs_pixel_format()
Also correctly namespace other functions in vidstabutils, and decrease
difference from Libav.

Initial-patch-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-22 22:18:46 +02:00
Michael Niedermayer
2bfd4ff16d Merge commit '593aaee953f8b07c141ff115e67bae85ef0350c7'
* commit '593aaee953f8b07c141ff115e67bae85ef0350c7':
  setpts: Add missing inttypes.h #include for PRId64

Conflicts:
	libavfilter/setpts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-21 21:47:43 +02:00
Stefano Sabatini
aade9884e9 lavfi/apad: fix logic when whole_len or pad_len options are specified
In particular, allow pad_len and whole_len to have value set to 0, which
means that no padding will be added. Previously a value set to 0 meant
that that the filter had to pad forever.

The new semantics is clearer, also simplifies scripting since the option
value might be automatically computed, so that no checks need to be done
in case it is 0.

The old semantics was never documented and the logic was broken (the
filter was always adding samples indefinitely), so this should not break
backward compatibility.
2014-08-21 16:59:07 +02:00
Michael Niedermayer
b09ea25fec avfilter/vf_lenscorrection: fix memleak
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-21 13:35:30 +02:00
Diego Biurrun
593aaee953 setpts: Add missing inttypes.h #include for PRId64
Also convert a debug av_log() to av_dlog().
2014-08-21 04:18:24 -07:00
Diego Biurrun
11cd727fbd vsrc_movie: Adjust a silly typo from b977b287f6 2014-08-21 04:18:23 -07:00
Michael Niedermayer
32cb6c1fe2 avfilter/vf_lenscorrection: get rid of floats in init code
The only remaining floats are in the user interface, they are left as they
should not cause a problem in practice

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-21 11:54:30 +02:00
Michael Niedermayer
2450ca0f33 avfilter/vf_lenscorrection: get rid of all floats per frame
there are some still left for 1 time initialization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-21 11:42:57 +02:00
Michael Niedermayer
c1b663bc92 avfilter/vf_lenscorrection: get rid of some floats 2014-08-21 11:42:56 +02:00
Clément Bœsch
e298b2f5d6 avfilter/showwaves: align const mode values (cosmetics) 2014-08-20 22:32:06 +02:00
Clément Bœsch
e35fb5add4 avfilter/showwaves: add split_channels option 2014-08-20 22:18:38 +02:00
Clément Bœsch
ba29746feb avfilter/showwaves: split out draw sample code 2014-08-20 22:18:35 +02:00
Clément Bœsch
f2f6d45dbd avfilter/showwaves: add "cline" mode (centered line) 2014-08-20 22:16:50 +02:00
Michael Niedermayer
a5cbff22b2 avfilter/avf_showspectrum: fix colums typo
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-20 18:49:01 +02:00
Stefano Sabatini
cb0524f7a0 lavfi/apad: fix if_( style 2014-08-20 12:35:16 +02:00
Michael Niedermayer
5a22877e9d Merge commit '67a7695c142561fe60f21adffe89c133385d37c9'
* commit '67a7695c142561fe60f21adffe89c133385d37c9':
  avfilter: Remove unused variable from ff_get_video_buffer()

Conflicts:
	libavfilter/video.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-20 00:23:15 +02:00
Diego Biurrun
67a7695c14 avfilter: Remove unused variable from ff_get_video_buffer() 2014-08-19 09:50:18 -07:00
Diego Biurrun
b977b287f6 vsrc_movie: Avoid a variable indirection in movie_get_frame()
This avoids an unused variable warning with MSVC since the variable is
only used in a debug mode printf statement.
2014-08-19 06:22:08 -07:00
Pavel Koshevoy
6380f2e367 avfilter/atempo: Flush all buffered input samples
Fixes ticket #3829

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-19 12:53:09 +02:00
Timothy Gu
32c712f143 vidstabutils: fix indentation
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-17 11:28:23 +02:00
Reimar Döffinger
a0941c8a2b Use new av_dict_set_int helper function.
Get rid of the many, slightly differing, implementations
of basically the same thing.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-08-16 14:31:41 +02:00
Michael Niedermayer
65f05eff0a avfilter/lavfutils/ff_load_image: Return error if no frame could be decoded
Based-on suggestion by JULIAN GARDNER <joolzg@btinternet.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-16 01:34:34 +02:00
Michael Niedermayer
81a663f49e Drop remaining unneeded != NULL
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 22:47:45 +02:00
Michael Niedermayer
fb33bff990 Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39':
  cosmetics: Write NULL pointer equality checks more compactly

Conflicts:
	cmdutils.c
	ffmpeg_opt.c
	ffplay.c
	libavcodec/dvbsub.c
	libavcodec/dvdsubdec.c
	libavcodec/dvdsubenc.c
	libavcodec/dxa.c
	libavcodec/libxvid_rc.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/rv10.c
	libavcodec/tiffenc.c
	libavcodec/utils.c
	libavcodec/vc1dec.c
	libavcodec/zmbv.c
	libavdevice/v4l2.c
	libavformat/matroskadec.c
	libavformat/movenc.c
	libavformat/sdp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 21:00:50 +02:00
Michael Niedermayer
c6c345ea92 Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
  lavfi/avf_showspectrum: check RDFT context init.
  lavfi/avf_showspectrum: add full frame sliding mode.
  lavfi/avf_showspectrum: use automatic framing.
  lavfi/avf_showspectrum: do not push the frame at EOF.
  lavfi/avf_showspectrum: fix output pts computation.
  lavfi/avf_showspectrum: set output frame rate.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-14 19:42:38 +02:00
Clément Bœsch
37bfeca78c avfilter/select: larger pixel sad computation 2014-08-14 19:11:13 +02:00
Clément Bœsch
10d96d8d66 avfilter/select: re-align a few comments 2014-08-14 18:52:53 +02:00
Nicolas George
638eec2ac3 lavfi/avf_showspectrum: check RDFT context init.
Fix a segfault with large window size.
2014-08-14 15:11:39 +02:00
Nicolas George
7c10e32ae5 lavfi/avf_showspectrum: add full frame sliding mode. 2014-08-14 14:59:23 +02:00
Nicolas George
ec33df6045 lavfi/avf_showspectrum: use automatic framing.
The framework can ensure that each input frame has exactly
the correct number of samples, except the last one.
2014-08-14 14:59:19 +02:00
Nicolas George
d4de6d4fad lavfi/avf_showspectrum: do not push the frame at EOF.
It is always identical to the last pushed frame.
The samples in the last incomplete window were ignored,
this is unchanged.
Possible enhancement: pad the last incomplete window with
silence.
2014-08-14 14:23:59 +02:00
Nicolas George
65b284a4ae lavfi/avf_showspectrum: fix output pts computation. 2014-08-14 14:23:59 +02:00
Nicolas George
a3aaaec891 lavfi/avf_showspectrum: set output frame rate. 2014-08-14 14:23:59 +02:00
Clément Bœsch
c85e0ca68a avfilter/dctdnoiz: add slice threading 2014-08-13 19:32:00 +02:00
Paul B Mahol
e3212bfd14 avfitler/vf_perspective: support slice threading
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-08-13 14:04:21 +00:00
James Almer
7cafdfe9c7 lavfi: duplicate ff_log2_tab
Fixes compilation failures on msvc/icl shared builds

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-13 01:00:38 +02:00
James Almer
744f15b6b3 lavu: rename ff_opencl_set_parameter() to avpriv_opencl_set_parameter()
It was wrongly being exported and used by libavfilter.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-12 03:49:45 +02:00
Daniel Oberhoff
9f617a14a0 avfilter: ported lenscorrection filter from frei0r
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-12 03:33:30 +02:00
James Almer
6985ef7813 lavfi: stop exporting internal functions
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 04:51:19 +02:00
Michael Niedermayer
36bce999f5 libavfilter/af_amerge: Do not depend on SWR_CH_MAX
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 01:08:46 +02:00
Michael Niedermayer
ce1bb4b75d avfilter/af_pan: Do not use SWR_CH_MAX
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 01:08:45 +02:00
Michael Niedermayer
ced765ceb3 avfilter/af_pan: check if the number of channels where sucessfully set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 01:08:45 +02:00
Michael Niedermayer
a57ece0cb4 Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8'
* commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8':
  Bump major versions of all libraries.

Conflicts:
	doc/APIchanges
	libavcodec/version.h
	libavdevice/version.h
	libavfilter/version.h
	libavformat/version.h
	libavutil/version.h
	libswscale/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 00:26:45 +02:00
Michael Niedermayer
3e41d2e612 Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e'
* commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e':
  Postpone API-incompatible changes until the next bump.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-09 22:19:45 +02:00
Clément Bœsch
d7594beede avfilter/dctdnoiz: remove a few indirections in idcts
No change in the generated asm.
2014-08-09 20:34:14 +02:00
Anton Khirnov
1985c2e75c Bump major versions of all libraries. 2014-08-09 16:58:33 +00:00
Anton Khirnov
f4c444e17d Postpone API-incompatible changes until the next bump. 2014-08-09 16:57:10 +00:00
Clément Bœsch
1ba7c6ead2 avfilter/dctdnoiz: use 32-bit (float) operations instead of 64 (double) for DCTs
This makes the code about 1.5x faster without any noticeable difference
in the output.
2014-08-08 20:00:14 +02:00
Clément Bœsch
eb16a6d229 avfilter/dctdnoiz: remove forward declarations after previous commit 2014-08-08 20:00:14 +02:00
Clément Bœsch
aaf82dc0fa avfilter/dctdnoiz: make color [de]correlation less clumsy
This has no impact on overall performance, since the block DCT taking
most of the time anyway.
2014-08-08 20:00:13 +02:00
Muhammad Faiz
94494dab91 avfilter/showcqt: add and extend tlength and volume options
Add a tlength option with frequency and timeclamp variable

Add to the volume option support for frequency and timeclamp variable,
   a_weighting, b_weighting and c_weighting functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08 18:59:02 +02:00
Clément Bœsch
cec59eb63f avfilter/dctdnoiz: add 8x8 dct and make it the default
8x8 is about 5x faster than 16x16 on 1080p input. Since a block size of
8x8 makes the filter almost usable (time wise) and it's not obvious if
8x8 or 16x16 is better from a quality PoV (it really depends on the
input and parameters), the filter now defaults to 8x8, and as a result
libavfilter is micro bumped.
2014-08-07 21:24:12 +02:00
Clément Bœsch
06362ab750 avfilter/dctdnoiz: rewrite [f/i]dct
This removes the avcodec dependency and make the code almost twice as
fast. More to come.

The DCT factorization is based on "Fast and numerically stable
algorithms for discrete cosine transforms" from Gerlind Plonkaa &
Manfred Tasche (DOI: 10.1016/j.laa.2004.07.015).
2014-08-07 19:59:07 +02:00
Clément Bœsch
97478ef5fe avfilter/select: fix "t" eval variable comment 2014-08-05 21:15:13 +02:00
Clément Bœsch
eaeb61c3a6 avfilter/select: remove optional avcodec dependency 2014-08-05 21:05:53 +02:00
Clément Bœsch
164b7ccf21 avfilter/mp_decimate: remove avcodec dependency 2014-08-05 21:05:52 +02:00
Clément Bœsch
def03d3439 avfilter/deshake: remove avcodec dependency 2014-08-05 21:05:52 +02:00
Michael Niedermayer
2569227689 avfilter/vf_noise: make constant things const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 17:04:13 +02:00
mrskman
6f3e15af84 avfilter/avf_showwaves: New p2p mode for showwaves filter
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 14:12:35 +02:00
Michael Niedermayer
71d008ebe4 Merge commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a'
* commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a':
  avcodec: Deprecate dtg_active_format field in favor of avframe side-data

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/mpeg12dec.c
	libavcodec/version.h
	libavfilter/vf_showinfo.c
	libavutil/frame.h
	libavutil/version.h

See: 2a3c36e920
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04 06:11:34 +02:00
Kieran Kunhya
2a3c36e920 Deprecate AFD field and add AFD as side-data
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04 05:36:44 +02:00
Kieran Kunhya
1ef9e83764 avcodec: Deprecate dtg_active_format field in favor of avframe side-data
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-03 15:43:02 -07:00
Michael Niedermayer
a7e87fef21 avfilter/vf_spp: Use dct->get_pixels()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-03 23:36:01 +02:00
Michael Niedermayer
85aaa4e6d5 Merge commit '072916d903d3a925bcd0c864f12254157cab63c1'
* commit '072916d903d3a925bcd0c864f12254157cab63c1':
  filtfmts: Replace deprecated uses of AVFilterPad

Conflicts:
	libavfilter/filtfmts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-03 19:35:08 +02:00
Diego Biurrun
072916d903 filtfmts: Replace deprecated uses of AVFilterPad
Also add missing mem.h header for av_freep().
2014-08-03 03:23:51 -07:00
Diego Biurrun
c6a1ac2dd9 vf_fps: Replace use of deprecated AVFilterBufferRef by AVFrame 2014-08-03 01:29:43 -07:00
Michael Niedermayer
17fef17f67 avfilter/lavfutils: remove redundant variable init
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 20:03:10 +02:00
Michael Niedermayer
e85bc9df87 Merge commit 'f0e959481968b6d906931127237ed981b6414f6e'
* commit 'f0e959481968b6d906931127237ed981b6414f6e':
  af_channelmap: Set the frame channel layout

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 04:47:31 +02:00
Michael Niedermayer
dcd984e24d Merge commit '87efaa97ceb0ad5820870855d6df3e569e6eac7e'
* commit '87efaa97ceb0ad5820870855d6df3e569e6eac7e':
  af_join: Set the output frame format

See: e0dd8cadcc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 04:45:26 +02:00
Luca Barbato
f0e9594819 af_channelmap: Set the frame channel layout
Otherwise the frame would show the first layout matching the
channel count.
2014-08-02 00:58:21 +02:00
Luca Barbato
87efaa97ce af_join: Set the output frame format 2014-08-02 00:58:21 +02:00
Michael Niedermayer
c87f645a75 Merge commit '52269f48e835a52023656f8330262ae70e6061c4'
* commit '52269f48e835a52023656f8330262ae70e6061c4':
  Revert "vf_interlace: deprecate lowpass option"

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-01 16:39:28 +02:00
Michael Niedermayer
9e052df86d avfilter/vf_pullup: 2nd try to workaround gcc 4.4.3 bug on arm
The first try failed to work with some build flags

The gcc version affected is very old and unmaintained AFAIK thus i made no
attempt to report this to the gcc developers.

The workaround is pushed as it may still affect users and does affect one
fate client

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-01 14:17:53 +02:00
Vittorio Giovara
52269f48e8 Revert "vf_interlace: deprecate lowpass option"
This reverts commit 35b05c5184.
A warning is introduced in case this option is used.
2014-08-01 13:02:29 +01:00
Michael Niedermayer
fc19edd8f5 avfilter/trim: remove duplicate assignment
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-31 20:53:15 +02:00
Michael Niedermayer
6f622e5fcb avfilter/f_select: avoid double->int in debug output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-30 17:50:35 +02:00
Michael Niedermayer
bcbfb95b0e avfilter/f_select: Set var_values[VAR_KEY] correctly
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-30 17:49:26 +02:00
Michael Niedermayer
887d8d293f avfilter/f_select: avoid using doubles for equals checks and casts to enums
This might silence some warnings.

Issue found from: a8d803a320
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-30 17:37:09 +02:00
Diego Biurrun
a8d803a320 vf_select: Drop a debug av_log with an unchecked double to enum conversion
CC: libav-stable@libav.org
2014-07-29 09:37:01 -07:00
Michael Niedermayer
a06c14a48e avfilter/vf_spp: support setting dct avoptions from the filter graph string
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-28 05:16:03 +02:00
Michael Niedermayer
cab8fc624b avfilter/vf_scale: fix log message category
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-28 05:15:16 +02:00
Michael Niedermayer
e3fac20824 avfilter/vf_spp: use AVDCT
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-27 17:21:40 +02:00
Michael Niedermayer
c0a586d9d5 reintroduce avpriv_dsputil_init() to maintain ABI until next soname bump
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-26 13:21:07 +02:00
Lukasz Marek
f753956252 lavfi/src_movie: minor simplifications
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-24 04:50:32 +02:00
Lukasz Marek
9739255365 lavfi/src_movie: remove frame from priv context
This variable is used only inside one function.
There is no need to store it in context.

This also may prevent crush by double free frame.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-24 04:48:49 +02:00
Muhammad Faiz
ce385c869c avfilter/biquads: avoid clipping when using floating type
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-21 03:48:18 +02:00
Michael Niedermayer
437da3e349 avfilter/vf_owdenoise: use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-21 03:18:56 +02:00
Michael Niedermayer
d9ddbaa924 avfilter/avfilter: use av_malloc(z)_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-19 19:42:46 +02:00
Andrey Utkin
cb8cb85da7 lavfi/drawtext: add alias "expr_int_format" to expansion function "eif"
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-18 14:24:34 +02:00
Timothy Gu
b64808e9dd kerndeint: remove dead assignments
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-18 04:44:58 +02:00
Michael Niedermayer
3a2d1465c8 Merge commit '2d60444331fca1910510038dd3817bea885c2367'
* commit '2d60444331fca1910510038dd3817bea885c2367':
  dsputil: Split motion estimation compare bits off into their own context

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/arm/Makefile
	libavcodec/dvenc.c
	libavcodec/error_resilience.c
	libavcodec/h264.h
	libavcodec/h264_slice.c
	libavcodec/me_cmp.c
	libavcodec/me_cmp.h
	libavcodec/motion_est.c
	libavcodec/motion_est_template.c
	libavcodec/mpeg4videoenc.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/Makefile
	libavcodec/x86/me_cmp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-17 23:27:40 +02:00