ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-05 12:33:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,887 Commits 37 Branches 400 Tags 496 MiB
1b0d0e6b72
Commit Graph

2923 Commits

Author SHA1 Message Date
Nicolas George
2bd104c72a lavfi/af_aresample: fix layout consistency check. 
If the channel layout is unknown, lswr will internally use
the default one for the corresponding number of channels.
 2013-02-28 19:23:12 +01:00
Michael Niedermayer
21c2e201f6 vf_lut: correct color/comp permutation 
Fixes Ticket2225

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-27 17:09:21 +01:00
Paul B Mahol
e0ccb5fa38 lavfi/hflip: support more formats 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-25 13:07:29 +00:00
Paul B Mahol
eac93932b0 lavfi/geq: improve support for formats with alpha plane 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-25 12:54:40 +00:00
Michael Niedermayer
bb7bc3443d af_biquads: memset(0) cache 
Fixes valgrind warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-25 04:39:26 +01:00
Stefano Sabatini
566560b85c lavfi/abuffersink: fix weird indent and spacing 2013-02-24 23:22:23 +01:00
Stefano Sabatini
b59cd089ff lavfi/abuffersink: add sample_rates field to AVABufferSinkParams 
Allow to select sample rates.
 2013-02-24 23:21:28 +01:00
Michael Niedermayer
c4c702b6d3 avfilter/avfiltergraph.h: Move public field out of the private fields 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-24 20:31:56 +01:00
Michael Niedermayer
71cf094e1b Merge commit '9f1223562e134bac6345a465870b9d56ff7d60cf' 
* commit '9f1223562e134bac6345a465870b9d56ff7d60cf':
  lavfi: connect libavresample options to af_resample via AVFilterGraph

Conflicts:
	doc/APIchanges
	libavfilter/avfiltergraph.c
	libavfilter/avfiltergraph.h
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-24 17:10:55 +01:00
Nicolas George
e568d432b1 lavfi/formats: reindent after last commit. 2013-02-24 12:05:06 +01:00
Nicolas George
2d98dd3d14 lavfi: fix merging of formats and clarify exception. 
The following commit:
b97d61f avfilter/ff_merge_formats: only merge if doing so does not loose chroma or alpha
introduced an exception to avoid lossy conversions.
Add a comment to explain the logic.
Fix the call to avoid applying it on audio formats.
 2013-02-24 11:58:52 +01:00
Nicolas George
bf0712c2f8 libavfilter/af_amerge: fix segfault if init fails. 2013-02-24 11:23:51 +01:00
Justin Ruggles
9f1223562e lavfi: connect libavresample options to af_resample via AVFilterGraph 2013-02-23 17:07:54 -05:00
Michael Niedermayer
73fce258b7 vf_mp: Set pseudo pal 
Fixes ticket2140
Fixes null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-23 19:32:24 +01:00
Michael Niedermayer
cfcab4c507 vf_overlay: silence warning: X may be used uninitialized in this function 
Also ensure that format is valid in query_formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-23 12:10:35 +01:00
Michael Niedermayer
3c14c82b7e avfilter: Silence warning: passing argument 3 of av_image_copy from incompatible pointer type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-23 12:08:05 +01:00
Stefano Sabatini
f30979e095 lavfi/boxblur: add support to named options 2013-02-22 19:57:20 +01:00
Paul B Mahol
47619e41c4 blend filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-21 20:16:23 +00:00
Nicolas George
01649c79c8 lavfi/buffersrc: set channel layout if it is known. 
If buffersrc was configured for frames with an unknown layout,
the incoming frames will have channel_layout = 0.
If the format negotiation has selected a known (and compatible)
channel layout for the link, the frame is assumed to have
that layout, the field must be set before injecting the frame
in the filters.
 2013-02-21 12:36:35 +01:00
Michael Niedermayer
cdb7a1ac63 vf_idet: adapt default scores due to bugfix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-21 01:58:07 +01:00
Michael Niedermayer
dc9edb06b0 vf_idet: Fix macro arguments sideeffect 
Fixes valgrind errors
should improve detection scores

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-21 01:58:07 +01:00
Clément Bœsch
9b9d996b34 lavfi/subtitles: fix recently introduced warning about discarded const qualifier. 2013-02-20 19:47:32 +01:00
Stefano Sabatini
22b06103f0 lavfi/overlay: add format option 
In particular, fix misbehavior in case main and overlay input formats
mismatch (e.g. YUV420 and YUV444).
 2013-02-20 19:39:40 +01:00
Stefano Sabatini
2db0056f96 lavfi/overlay: apply minor consistency fixes 2013-02-20 19:18:17 +01:00
Stefano Sabatini
3d77a27548 lavfi/overlay: implement shortest option 
Force termination when the overlay stream ends. Simplify scripting logic,
for example when an infinite source is used to generate a background for
a composite video.
 2013-02-20 19:17:11 +01:00
Stefano Sabatini
a2a1e20fa2 lavfi/decimate: use named options 2013-02-20 19:07:48 +01:00
Michael Niedermayer
951d39fecd avfilter: fix segfault with setsar/dar 
Reported-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-20 12:34:05 +01:00
Stefano Sabatini
dd37326345 lavfi/hue: reindent after previous commit 2013-02-20 11:29:12 +01:00
Stefano Sabatini
d709a18ac2 lavfi/hue: simplify parsing by making use of option shorthands 2013-02-20 11:28:59 +01:00
Michael Niedermayer
b97d61f924 avfilter/ff_merge_formats: only merge if doing so does not loose chroma or alpha 
Fixes Ticket1280

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-19 15:00:01 +01:00
Paul B Mahol
f2d200d460 lavfi/overlay: yuv444p & yuva444p support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-19 11:11:42 +00:00
Paul B Mahol
480ddf2bc9 lavfi/histogram: overlay display mode for levels histogram mode 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-18 20:13:07 +00:00
Clément Bœsch
f894246304 lavf/showspectrum: add divVerent in the (c) for his recent work on the filter. 2013-02-18 13:34:37 +01:00
Paul B Mahol
f4e29c408c lavfi/noise: switch to AVLFG noise generator 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-17 21:45:21 +00:00
Clément Bœsch
f3147917bf lavf/subtitles: error out in case of bitmap subtitles. 2013-02-17 13:35:35 +01:00
Clément Bœsch
90fb3e9bee lavfi/subtitles: set a different description between ass and subtitles. 2013-02-17 12:58:20 +01:00
Clément Bœsch
2a14b23484 lavfi: rename vf_ass.c to vf_subtitles.c 2013-02-17 12:58:20 +01:00
Clément Bœsch
08d149d688 lavfi/subtitles: support charenc option. 2013-02-17 12:58:20 +01:00
Clément Bœsch
3a0a959dcb lavfi/subtitles: split options between ass and subtitles. 2013-02-17 12:58:20 +01:00
Stefano Sabatini
7ca2f8b113 lavfi/mp: drop mp=kerndeint filter 
The filter has been natively integrated into libavfilter.
 2013-02-17 11:48:45 +01:00
Stefano Sabatini
8c85a9f046 lavfi/mp: drop mp=unsharp filter 
The native filter is equivalent from the point of view of the features
and of performances.
 2013-02-17 11:48:37 +01:00
Stefano Sabatini
89505f2c3f lavfi/unsharp: add missing NULL check 2013-02-17 11:48:31 +01:00
Stefano Sabatini
64e592eef2 lavfi/unsharp: merge definition and declaration in init_filter_param() 2013-02-17 11:48:24 +01:00
Stefano Sabatini
d2cadea3f0 lavfi/unsharp: directly access in-loop variables in apply_unsharp() 
Increase performance, to match mp=unsharp.
 2013-02-17 11:48:12 +01:00
Stefano Sabatini
ef4c71e8f8 lavfi/unsharp: add check on matrix x/y size values oddity 2013-02-17 11:47:39 +01:00
Michael Niedermayer
b4bb996d6f yadif: remove unused variable 
Found by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-16 13:24:43 +01:00
Paul B Mahol
af882e1819 lavfi: port MP noise filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-16 11:42:41 +00:00
Michael Niedermayer
446f7c62a2 Merge commit '64ed397635ef2666b0ca0c8d8c60a8bc44581d82' 
* commit '64ed397635ef2666b0ca0c8d8c60a8bc44581d82':
  vf_yadif: fix out-of line reads

Conflicts:
	libavfilter/vf_yadif.c
	tests/ref/fate/filter-yadif-mode0
	tests/ref/fate/filter-yadif-mode1

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-16 09:09:38 +01:00
Michael Niedermayer
fab8a89abe Merge commit 'ccd70d9c1689990e5aef2de383199bbc7cf60d13' 
* commit 'ccd70d9c1689990e5aef2de383199bbc7cf60d13':
  vf_yadif: factorize initializing the filtering callbacks

Conflicts:
	libavfilter/vf_yadif.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-16 08:48:45 +01:00
James Darnley
87d359ff8f lavfi/yadif: support 9, 12, and 14 bits per pixel 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-16 00:32:02 +01:00
James Darnley
724061888b lavfi/yadif: remove unnecessary cast 
Finish what 99162f8 started

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-16 00:32:02 +01:00
Stefano Sabatini
f84ef19f3f lavfi/kerndeint: move is_rgb_packed definition to the internal context 
No need to recompute it for each new frame.
 2013-02-16 00:08:31 +01:00
Clément Bœsch
51ba843f19 lavfi/kerndeint: use aligned linesizes for the temporary buffer. 
This improves the performances just enough to match mp=kerndeint.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-02-16 00:08:31 +01:00
Stefano Sabatini
2042cd3769 lavfi/unsharp: extend range for amount values, to reflect the behavior of mp=unsharp 
Also update the documentation accordingly, and suggest a meaningful range.
 2013-02-16 00:08:31 +01:00
Stefano Sabatini
fbcc584d3a lavfi/unsharp: use named options, and add missing checks on matrix size values 
In particular, avoid out-of-buffer access and crashes with too big
values, and rework documentation accordingly.
 2013-02-16 00:08:31 +01:00
Hendrik Leppkes
5ad43af9a6 lavfi/kerndeint: use av_pix_fmt_desc_get instead of directly accessing the table 
Fixes FATE in MSVC DLL builds.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-15 19:07:37 +01:00
sedacca@comcast.net
b64de24fd7 lavfi/ebur128: advance pointer to samples 
Correct the advancement of a pointer to skip over LFE samples as
intended in the loudness computation.

This suggested patch is 3 of 3 for Ticket #2144 "libavfilter ebur128
loudness inaccuracy, irregular time interval, LFE interference".
This suggested patch supersedes the contribution of January 15, 2013
in the thread “[PATCH] lavfi: EBU R.128 irreg time, ch weights, skip
LFE” which combined multiple fixes in one batch.
 2013-02-15 16:39:25 +01:00
David A. Sedacca
de21e6736e lavfi/ebur128: fix channel weights 
Correct the recognition of channel layouts for good channel weight
in the loudness computation.
This suggested patch is 2 of 3 for Ticket #2144 "libavfilter ebur128
loudness inaccuracy, irregular time interval, LFE interference".

Signed-off-by: David A. Sedacca <sedacca at comcast.net>
 2013-02-15 16:38:58 +01:00
Anton Khirnov
64ed397635 vf_yadif: fix out-of line reads 
Some changes in the border pixels, visually indistinguishable.
 2013-02-15 16:08:33 +01:00
Anton Khirnov
ccd70d9c16 vf_yadif: factorize initializing the filtering callbacks 
Do it all in config_props().
 2013-02-15 16:08:00 +01:00
Stefano Sabatini
7ac3ccc5f2 lavfi/unsharp: use the same macros used in the original MP filter 
Remove possibly pointless inconsistency with the ported code.

Also specify parameter value ranges consistent with those of the ported
filter.
 2013-02-15 01:06:56 +01:00
Clément Bœsch
0224375180 lavfi/showspectrum: simplify intensity_color_table declaration. 2013-02-14 23:10:01 +01:00
Clément Bœsch
cf8dec7d64 lavfi/showspectrum: pretty-align constants. 
Binary object unchanged.
 2013-02-14 23:04:20 +01:00
Nicolas George
c557a5b08e lavfi/vf_ass: reindent after last commit. 2013-02-14 16:36:03 +01:00
Nicolas George
bb3303b94c lavfi/vf_ass: ignore subtitles decoding errors. 
A broken packet with invalid data in the middle of the stream
should not prevent from decoding the rest of the file.

Work around trac ticket #2264.
 2013-02-14 16:33:53 +01:00
Paul B Mahol
41ae43cade lavfi: remove softskip libmpcodecs wrapper 
It is supposed to be used with mencoder only and does
nothing when used with ffmpeg.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-14 12:51:56 +00:00
Paul B Mahol
968f8acec8 lavfi: remove dsize libmpcodecs wrapper 
Filter does nothing, and supposed funcionality
is already available with native filter(s).

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-14 12:51:56 +00:00
Paul B Mahol
34126cd090 lavfi/transpose: support more pix fmts 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-13 16:29:47 +00:00
Paul B Mahol
8160864b00 lavfi/amerge: make description consistent with documentation 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-11 14:43:23 +00:00
Stefano Sabatini
3acaea26e5 lavfi/il: filter out hwaccels formats from the list of supported formats 2013-02-10 21:00:56 +01:00
Stefano Sabatini
0b18965434 lavfi/il: move query_formats() definition up 
Respect order of call during the filter lifecycle, improve readability.
 2013-02-10 14:00:19 +01:00
Stefano Sabatini
63a9962287 lavfi/il: simplify/generalize linesize computation 
Rely on generic utilities for computing each plane linesize.

In particular, add support to NV12/21 formats and avoid use of
PIX_FMT_PLANAR pixdesc flag, whose semantics is questionable.

It also fixes various crashes.
 2013-02-10 14:00:19 +01:00
Paul B Mahol
969039eb6e lavfi/il: fix typo in Copyright 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-09 21:56:04 +00:00
Paul B Mahol
c0a8918f2a lavfi: remove mp=il filter 
Native il video filter is now available.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-09 21:43:39 +00:00
Paul B Mahol
6e9abce5e2 lavfi: port MP il filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-09 21:41:53 +00:00
Paul B Mahol
4fa9defc7f lavfi/histogram: make waveform mode more useful 
Now it displays all color components (not just luma)
either in parade or overlay and also works with RGB colorspace.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-09 16:05:28 +00:00
Paul B Mahol
e5670cb8a1 lavfi/histogram: make it C90 compliant 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-09 12:27:49 +00:00
Paul B Mahol
29a92c0114 histogram filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-09 11:45:56 +00:00
Stefano Sabatini
c0a4871c16 lavfi/select: correctly set prev_t and prev_pts 
In particular, fix trac ticket #2248.
 2013-02-07 21:28:46 +01:00
Stefano Sabatini
872855e2a5 lavfi/select: avoid double -> int lossy conversion in debug log 2013-02-07 21:00:54 +01:00
Michael Niedermayer
a00c4b4db0 af_biquad: avoid subtraction in loop 
17% faster
Note the speedup is smaller if its done before
storing in the context (gcc 4.6.3 core i7)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-07 19:46:02 +01:00
Michael Niedermayer
9f956611e3 af_biquad: unroll loop, remove variable copies 
This makes the code about 7% faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-07 19:03:22 +01:00
Nicolas George
b5884db437 lavfi: fix missing space in error message. 2013-02-07 12:22:09 +01:00
Nicolas George
3dea8b375e lavfi: remove disabled code. 2013-02-07 12:22:09 +01:00
Michael Niedermayer
6e9f3f3b65 Merge commit '238614de679a71970c20d7c3fee08a322967ec40' 
* commit '238614de679a71970c20d7c3fee08a322967ec40':
  cdgraphics: do not rely on get_buffer() initializing the frame.
  svq1: replace struct svq1_frame_size with an array.
  vf_yadif: silence a warning.

Conflicts:
	libavcodec/svq1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-06 14:53:49 +01:00
Anton Khirnov
99162f8d46 vf_yadif: silence a warning. 
clang says:
libavfilter/vf_yadif.c:192:28: warning: incompatible pointer types assigning to
'void (*)(uint8_t *, uint8_t *, uint8_t *, uint8_t *, int, int, int, int, int)'
from 'void (uint16_t *, uint16_t *, uint16_t *, uint16_t *, int, int, int, int, int)'
 2013-02-06 10:21:51 +01:00
Michael Niedermayer
2b20397e1f libmpcodecs/vd_ffmpeg.h: remove, its unused and removed upstream 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 15:54:39 +01:00
multiple authors
81e357db62 libmpcodecs/vf_pullup: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 15:41:19 +01:00
multiple authors
13afcdd00e libmpcodecs/vf_uspp: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 15:41:00 +01:00
multiple authors
3ce3d4cc3c libmpcodecs/vf_unsharp: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 15:40:43 +01:00
multiple authors
7a4885600f libmpcodecs/vf_spp: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 14:53:53 +01:00
multiple authors
14132599a3 libmpcodecs/vf_sab: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 14:47:33 +01:00
multiple authors
fe8bc6ddfc libmpcodecs/pullup: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 14:47:13 +01:00
multiple authors
8f7e3e678b libmpcodecs/vf_noise: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 14:18:15 +01:00
multiple authors
3ca46d0c10 libmpcodecs/vf_pp7:update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 14:17:28 +01:00
multiple authors
fdd574ed3f libmpcodecs/vf_qp: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 14:17:17 +01:00
multiple authors
b7e6622971 libmpcodecs/vf_mcdeint: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 14:00:20 +01:00
multiple authors
25ed6e99d7 libmpcodecs/vf_ilpack: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 13:59:47 +01:00
multiple authors
011702f5a9 libmpcodecs/vf_ivtc: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 13:59:34 +01:00
multiple authors
0b36a05c17 libmpcodecs/vf_fspp: update to latest version from mplayer 
Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-05 13:44:53 +01:00