Stefano Sabatini
1f467220cf
lavfi/alphaextract: drop cur_linesize = out_linesize branch in draw_slice()
...
The code causes uninitialized data copy, and may be actually slower than
a loop over each line in case the padding is big.
2012-12-07 19:09:47 +01:00
Carl Eugen Hoyos
24b20087bd
Fix compilation with yasm 0.6.2.
2012-12-07 00:26:45 +01:00
Stefano Sabatini
da9a45b681
lavfi/tinterlace: drop redundant NULL checks in uninit()
2012-12-06 22:32:03 +01:00
Stefano Sabatini
c6a216771f
lavfi/tinterlace: add support to option parsing
...
Simplify code, and provide introspection through the AVOption system.
2012-12-06 22:31:42 +01:00
Stefano Sabatini
fef7b2e0be
lavfi/tinterlace: switch to filter_frame API
...
Also add missing NULL checks.
2012-12-06 22:30:59 +01:00
Clément Bœsch
bbd44f6ca4
lavfi/mp: switch to ff_filter_frame.
2012-12-06 21:11:28 +01:00
Clément Bœsch
eaa47e7454
lavfi/deshake: small align prettifying.
2012-12-06 16:20:31 +01:00
Clément Bœsch
03778575b9
lavfi/deshake: switch inverted comments.
2012-12-06 16:20:31 +01:00
Clément Bœsch
0678641b7c
lavfi/deshake: remove unecessary check before unref.
2012-12-06 16:20:31 +01:00
Clément Bœsch
e7b0e83e96
lavfi/deshake: switch to filter_frame.
2012-12-06 16:20:31 +01:00
Michael Niedermayer
54a71f2e6c
Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'
...
* commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56':
pixdesc: fix yuva 10bit bit depth
avconv: deprecate the -vol option
x86: af_volume: add SSE2/SSSE3/AVX-optimized s32 volume scaling
x86: af_volume: add SSE2-optimized s16 volume scaling
Conflicts:
ffmpeg.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-06 15:55:47 +01:00
Michael Niedermayer
1bb547192f
lavfi: rename af_volume to af_volume_stefano
...
This matches the naming style of the new af_volume_justin filter.
Note, Yes i would too prefer having one filter instead of 2.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-06 15:29:23 +01:00
Michael Niedermayer
b38c79bf23
Merge commit 'b384e031daeb1ac612620985e3e5377bc587559c'
...
* commit 'b384e031daeb1ac612620985e3e5377bc587559c':
lavfi: add volume filter
Conflicts:
Changelog
libavfilter/Makefile
libavfilter/af_volume.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-06 15:18:59 +01:00
Clément Bœsch
a0b2e8e155
lavfi/silencedetect: use eval builtin to parse dB.
...
Also update FATE test to use the dB form.
2012-12-06 15:08:38 +01:00
Stefano Sabatini
c3fa6add58
lavfi/field: switch to filter_frame API
2012-12-06 13:51:34 +01:00
Stefano Sabatini
3942294fd5
lavfi/drawtext: make use of outlink variable in filter_frame()
...
Fix warning.
2012-12-06 13:51:27 +01:00
Clément Bœsch
1e85fd6a47
lavfi/mp: remove dead extern vf_info_t declarations.
2012-12-06 12:52:58 +01:00
anonymous
de42d2a347
lavfi/mp: add ff_ prefix to exported symbols
2012-12-06 12:38:37 +01:00
Justin Ruggles
b384e031da
lavfi: add volume filter
...
Based on the volume filter in FFmpeg written by Stefano Sabatini
<stefasab@gmail.com>.
2012-12-05 11:23:37 -05:00
Justin Ruggles
b30a363331
x86: af_volume: add SSE2/SSSE3/AVX-optimized s32 volume scaling
2012-12-05 11:23:37 -05:00
Justin Ruggles
f96f1e06a4
x86: af_volume: add SSE2-optimized s16 volume scaling
2012-12-05 11:23:37 -05:00
Michael Niedermayer
99efd59626
Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'
...
* commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967':
Remove pointless #undefs of previously forbidden functions.
fate: Add dependencies for bmp, cdxl, dfa, mp3
Conflicts:
doc/examples/muxing.c
libavfilter/filtfmts.c
libavutil/des.c
libavutil/eval.c
libavutil/log.c
libavutil/parseutils.c
tests/fate/mp3.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-05 13:34:45 +01:00
Clément Bœsch
ab5497df15
lavfi/subtitles: 10l close codec before format.
...
Fix invalid memory accesses.
2012-12-04 23:56:02 +01:00
Anton Khirnov
cb45553f57
Remove pointless #undefs of previously forbidden functions.
2012-12-04 21:40:22 +01:00
Nicolas George
0444733b78
lavfi/drawtext: add the reload option.
2012-12-04 19:06:22 +01:00
Clément Bœsch
359cd12a43
lavfi/mp: fix invalid read with filters with no argument.
2012-12-04 03:47:16 +01:00
Clément Bœsch
ef1868351d
lavfi/removelogo: switch to ff_filter_frame.
2012-12-04 02:31:40 +01:00
Clément Bœsch
3313e46c4a
lavfi: add subtitles filter.
2012-12-04 01:49:03 +01:00
Clément Bœsch
b5eb630e21
lavfi: remove some video w/h settings after avfilter_copy_buffer_ref_props.
...
video->[wh] will be set with the same values as the input after
avfilter_copy_buffer_ref_props. These filters don't change the size of
the input so there is no need for this code.
2012-12-03 21:47:03 +01:00
Clément Bœsch
d91388367f
lavfi/gradfun: remove check for AV_PERM_PRESERVE.
...
This check does not make sense in this context, see
doc/filter_design.txt for details about the usage of such flag.
2012-12-03 20:38:29 +01:00
Stefano Sabatini
5148147b26
lavfi/bbox: switch to ff_filter_frame() API
2012-12-02 18:13:49 +01:00
Stefano Sabatini
255be0734d
lavfi/alphamerge: fix leak introduced in 217163eb
2012-12-02 18:04:57 +01:00
Nicolas George
ddd87236f0
lavfi/vf_super2xsai: fix output ref size.
2012-12-02 17:08:17 +01:00
Stefano Sabatini
bd465fdc73
lavfi/framestep: switch to ff_filter_frame API
2012-12-02 15:02:05 +01:00
Stefano Sabatini
fbc339ff41
lavfi/super2xsai: switch to ff_filter_frame() API
2012-12-02 15:01:56 +01:00
Clément Bœsch
adfd9ca3fa
lavfi/hue: move to ff_filter_frame.
2012-12-02 14:44:31 +01:00
Nicolas George
24cb1f9718
lavfi/vf_tile: forward errors.
2012-12-02 13:53:41 +01:00
Nicolas George
3b316247fb
lavfi/vf_tile: cosmetic after last commit.
2012-12-02 13:53:41 +01:00
Nicolas George
6f3d2fb18b
lavfi/vf_tile: switch to filter_frame.
...
Also add error check on buffer allocation.
2012-12-02 13:53:41 +01:00
Stefano Sabatini
3d72820722
lavfi/decimate: switch to ff_filter_frame() API
2012-12-02 12:42:29 +01:00
Stefano Sabatini
217163eb98
lavfi/alphamerge: switch to ff_filter_frame() API
2012-12-02 12:42:29 +01:00
Stefano Sabatini
83ab46a57e
lavfi/blackdetect: switch to new ff_filter_frame() API
2012-12-02 12:42:29 +01:00
Clément Bœsch
9e1914dfba
lavfi/hqdn3d: avoid use of uninitialized variable.
2012-12-02 02:53:22 +01:00
Clément Bœsch
a3554bb457
lavfi/gradfun: avoid use of uninitialized variable.
2012-12-02 02:42:07 +01:00
Clément Bœsch
f61369d762
lavfi/vsrc: switch to ff_filter_frame.
2012-12-02 00:23:45 +01:00
Stefano Sabatini
13c39e9676
lavfi/geq: add T variable and example
2012-12-01 16:05:15 +01:00
Clément Bœsch
a7eabbb20d
lavfi/concat: prefer av_asprintf() over stack allocated buffer.
2012-11-29 12:55:56 +01:00
Clément Bœsch
b99f1303ad
lavfi/concat: switch to filter_frame.
2012-11-29 12:55:56 +01:00
Clément Bœsch
ea3bad0e9e
lavfi/smartblur: switch to filter_frame.
2012-11-29 12:49:03 +01:00
Clément Bœsch
9262f13269
lavfi/show{spectrum,waves}: use ff_filter_frame().
2012-11-29 11:44:20 +01:00
Michael Niedermayer
3fd8e07265
vsrc_mandelbrot: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 05:52:31 +01:00
Clément Bœsch
9236e9f1e1
lavfi/ebur128: use ff_filter_frame() everywhere.
2012-11-29 03:48:14 +01:00
Michael Niedermayer
1eb8809a41
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
vf_fieldorder: require write permissions
vf_fieldorder: reindent
Conflicts:
libavfilter/vf_fieldorder.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 02:54:50 +01:00
Michael Niedermayer
87b9dc0982
Merge commit '565e4993c63f797e2d50ad2f1e8f62fdbe299666'
...
The commit has already been split and commited, this merge is just for metadata.
What has not been merged is the removial of some start/end_frame / draw_slice
related functions that are still in use. They can be removed once they are
unused.
* commit '565e4993c63f797e2d50ad2f1e8f62fdbe299666':
lavfi: merge start_frame/draw_slice/end_frame
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 02:51:22 +01:00
Clément Bœsch
031d644878
lavfi/ass: switch to filter_frame.
2012-11-29 02:36:34 +01:00
Anton Khirnov
9178235ffb
avfilter: mark start_frame/end_frame/draw_slice as deprecated
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 02:30:11 +01:00
Clément Bœsch
502ecc9cc2
lavfi/colormatrix: 10l fix forgotten buffer unref.
2012-11-29 02:21:16 +01:00
Clément Bœsch
269cd07702
lavfi/colormatrix: switch to filter_frame.
2012-11-29 02:16:33 +01:00
Anton Khirnov
88f8af26a9
vf_format: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 02:09:40 +01:00
Anton Khirnov
7c42814782
vf_copy: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 02:09:22 +01:00
Anton Khirnov
ece5decbe0
vf_null: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 02:09:01 +01:00
Michael Niedermayer
015c2b4066
libavfilter: default to filter_frame when neither it nor start/slice/end is set.
...
this is needed for vf_null and a few others.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 02:08:49 +01:00
Anton Khirnov
60e50dd960
buffersrc: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 01:55:26 +01:00
Anton Khirnov
b5ecfa1d8d
buffersink: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 01:55:26 +01:00
Clément Bœsch
5d796270c5
lavfi/thumbnail: re-use ctx instead of inlink->dst.
2012-11-29 01:43:28 +01:00
Clément Bœsch
782993d9e4
lavfi/thumbnail: use avfilter_unref_bufferp() where appropriate.
2012-11-29 01:38:08 +01:00
Clément Bœsch
24f425319d
lavfi/thumbnail: switch to filter_frame.
2012-11-29 01:34:55 +01:00
Anton Khirnov
69d4420aea
libavfilter/split: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 01:20:53 +01:00
Michael Niedermayer
94fdef818e
vf_scale: switch to filter_frame
...
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 01:20:53 +01:00
Clément Bœsch
3860e34b08
lavfi/sendcmd: expose the options for both filters.
2012-11-29 00:52:00 +01:00
Clément Bœsch
0b70ffa4ac
lavfi/sendcmd: add FLAGS to AVOption array.
2012-11-29 00:50:37 +01:00
Clément Bœsch
a5b765236b
lavfi: add priv_class for some forgotten filters.
...
This allows to print the options available when using commands such as
ffmpeg -help full.
2012-11-29 00:50:37 +01:00
Clément Bœsch
8a12c96d27
lavfi/mptestsrc: add FLAGS to AVOption array.
2012-11-29 00:50:37 +01:00
Anton Khirnov
0a767ad796
vf_blackframe: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 00:32:08 +01:00
Anton Khirnov
8f21cfc6b3
vf_aspect: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 00:31:50 +01:00
Anton Khirnov
aa61728d0a
vf_cropdetect: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 00:15:56 +01:00
Anton Khirnov
71f82c3805
vf_crop: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 00:15:40 +01:00
Anton Khirnov
a42b89910b
vf_drawbox: switch to filter frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 00:09:53 +01:00
Anton Khirnov
267290ce3b
vflip: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-29 00:09:31 +01:00
Michael Niedermayer
8c1f98d954
Merge commit 'bb6c67bb36b136de10256f0999128df4a42f9ffc'
...
* commit 'bb6c67bb36b136de10256f0999128df4a42f9ffc':
lavfi: remove vf_slicify
Conflicts:
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/vf_slicify.c
tests/lavfi-regression.sh
tests/ref/lavfi/crop_scale_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 23:59:15 +01:00
Anton Khirnov
5f648ce43e
vf_yadif: switch to filter_frame, this filter did not support slices
...
signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 23:47:01 +01:00
Anton Khirnov
9a65b8c0a2
vf_fade: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 23:47:01 +01:00
Clément Bœsch
2d9d444051
lavfi: convert remaining input/output list compound literals to named objects.
...
This is following 568c70e79e
.
2012-11-28 23:19:20 +01:00
Anton Khirnov
bff576c779
vf_lut: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 22:39:35 +01:00
Anton Khirnov
eb7e7e82e1
vf_hflip: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 22:39:16 +01:00
Anton Khirnov
dabb993c44
f_setpts: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 22:27:51 +01:00
Anton Khirnov
bb56436cfd
f_settb: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 22:19:43 +01:00
Michael Niedermayer
eb1424b4fe
src_movie: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 21:58:45 +01:00
Anton Khirnov
f7f6f281dd
vsrc_testsrc: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 21:58:39 +01:00
Anton Khirnov
c262e8cff6
vsink_nullsink: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 21:49:04 +01:00
Anton Khirnov
45eed9b197
vf_unsharp: switch to filter_frame, this filter did not support slices
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 21:47:39 +01:00
Michael Niedermayer
afded1816b
vf_transpose: switch to filter_frame
...
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 21:46:23 +01:00
Anton Khirnov
2c3b665379
vf_select: switch to filter_frame
...
The new code reads the input frame when its ready, the previous
code did read the input frame during start_frame at which point it
may not yet be available.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 21:28:02 +01:00
Anton Khirnov
0663a9eab8
vf_showinfo: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 21:28:02 +01:00
Michael Niedermayer
6be0df5080
vf_pad: switch to filter_frame
...
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 21:28:02 +01:00
Michael Niedermayer
e42b7ff2b2
vf_pixdesctest: switch to filter_frame
...
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 20:25:55 +01:00
Anton Khirnov
1f94f86ab5
vf_libopencv: switch to filter_frame, this filter did not support slices
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 20:25:55 +01:00
Clément Bœsch
5d170b09d3
lavfi/geq: switch to filter_frame.
2012-11-28 20:20:40 +01:00
Anton Khirnov
2a06bc10e7
vf_gradfun: switch to filter_frame, this filter did not support slices
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 20:06:06 +01:00
Anton Khirnov
6325957b28
vf_frei0r: switch to filter_frame, the filter did not support slices
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 20:06:06 +01:00
Clément Bœsch
57d9c86bf3
lavfi/edgedetect: switch to filter_frame.
2012-11-28 20:03:01 +01:00
Anton Khirnov
92b57e8dac
vf_fps: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 19:28:41 +01:00
Anton Khirnov
e67fdbffe5
vf_fieldorder: switch to filter_frame, this filter did not support real slices
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 19:23:32 +01:00
Michael Niedermayer
59907340e1
libavfilter/fifo: fix indent
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 19:18:24 +01:00
Michael Niedermayer
b5572ab861
vf_boxblur: cosmetics to reduce diff to qatar
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 19:18:24 +01:00
Michael Niedermayer
7bfa2f25c0
vf_drawtext: switch to filter_frame, this filter did not support slices
...
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 18:07:51 +01:00
Michael Niedermayer
384641468b
vf_delogo: switch to filter_frame, this filter did not support slices
...
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 18:07:33 +01:00
Michael Niedermayer
ed547e2ce5
vf_hqdn3d: fix permissions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 18:05:09 +01:00
Michael Niedermayer
46a4e72bc5
vf_delogo: fix order of operations in apply_delogo()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 18:03:03 +01:00
Anton Khirnov
250b122e3a
vf_boxblur: switch to filter_frame, boxblur did not support slices
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 17:33:42 +01:00
Anton Khirnov
05945c7f88
libavfilter/fifo: switch to filter_frame, the filter did not support slices.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 17:33:42 +01:00
Anton Khirnov
1b43fc127c
vf_hqdn3d: switch to filter_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 16:43:34 +01:00
Michael Niedermayer
8227a0b7df
libavfilter: update doxy for filter_frame
...
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 16:43:34 +01:00
Michael Niedermayer
3ed483cdfa
libavfilter: Support using filter_frame for video
...
With this we can mix filters using filter_frame OR start/draw_slice/end
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 16:43:34 +01:00
Michael Niedermayer
a0b8eec719
default_filter_frame: fix argument name
...
Based on code by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 16:43:34 +01:00
Michael Niedermayer
f6dd145533
avfilter: check that filter_frame and slice variants are not both used
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 16:43:34 +01:00
Michael Niedermayer
cd7febd33f
lavfi: replace filter_samples by filter_frame
...
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 16:43:34 +01:00
Michael Niedermayer
42d3fea65f
Merge commit 'af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1'
...
* commit 'af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1':
asink_nullsink: plug a memory leak.
x86: h264_idct: port to cpuflags
x86: cpu: Drop unused HAVE_RWEFLAGS condition
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28 13:32:17 +01:00
Anton Khirnov
4c973de9a5
vf_fieldorder: require write permissions
...
This filter modifies the input frame.
2012-11-28 08:50:24 +01:00
Anton Khirnov
49dd71a6f1
vf_fieldorder: reindent
2012-11-28 08:50:24 +01:00
Anton Khirnov
565e4993c6
lavfi: merge start_frame/draw_slice/end_frame
...
Any alleged performance benefits gained from the split are purely
mythological and do not justify added code complexity.
2012-11-28 08:50:19 +01:00
Anton Khirnov
bb6c67bb36
lavfi: remove vf_slicify
...
The following commit will make it useless.
The crop_scale_vflip FATE test changes because of off-by-one differences
in output when vflipped slices are passed to sws.
2012-11-28 08:44:01 +01:00
Anton Khirnov
af7d13ee4a
asink_nullsink: plug a memory leak.
2012-11-28 08:43:54 +01:00
Stefano Sabatini
2ac6a3d1bf
lavfi/drawtext: add support to expansion of generic expressions
2012-11-27 23:27:50 +01:00
Mark Himsley
13c6252536
lavfi/overlay: enable yuva420p as overlay background
...
Same calculation as for RGBA etc to create unpremultiplied output.
Useful for creating an intermediate "Mix/Effects bank", in vision mixer
(switcher) terminology.
Example command:
ffmpeg -i input.mov -vf
"[in]scale=iw:ih:interl=1,format=yuv420p[bg];movie=BBC_blocks_watermark.png,scale=iw:ih:interl=1,format=yuva420p[dog];movie=Kickabout_strap.mov,scale=iw:ih:interl=1,format=yuva420p[strap];[strap][dog]overlay=0:0[me1];[bg][me1]overlay=0:0,scale=0:0:interl=1[out]"
-b:v 3M -an output.mov
Fix trac ticket #549 .
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2012-11-27 10:44:42 +01:00
Michael Niedermayer
8d231e37af
af_aresample: consistently use ROUNDED_DIV
...
This fixes issues with negative timestamps
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-26 21:09:15 +01:00
Michael Niedermayer
4b5a12a2cb
af_aresample: fix rounding of negative timestamps
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-26 16:25:47 +01:00
Michael Niedermayer
69d45d2ecb
avfiltergraph: add aresample_swr_opts
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-26 03:51:08 +01:00
Michael Niedermayer
8f507feecb
avfiltergraph: add AVOption table
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-25 14:36:22 +01:00
Michael Niedermayer
014058abea
af_aresample: check ff_get_audio_buffer() failure
...
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-24 17:33:32 +01:00
Michael Niedermayer
0efcf16a3e
replace av_log(0, by av_log(NULL,
...
The first parameter is a pointer and NULL is more correct
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-23 18:10:02 +01:00
Michael Niedermayer
c322f19855
vf_mandelbrot: give all av_log a context
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-23 18:05:16 +01:00
Stefano Sabatini
f67ebf5b77
lavfi/avfiltergraph: improve error message in graph_check_validity()
...
Fix trac ticket #1944 .
2012-11-22 13:14:20 +01:00
Stefano Sabatini
eb87b340e8
lavfi/drawtext: add support for printing frame numbers
...
Fix trac ticket #1949 .
2012-11-22 13:14:19 +01:00
Michael Niedermayer
494945cb66
Merge commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480'
...
* commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480':
avcodec: split avpicture from imgconvert
pixdesc: add PIX_FMT_ALPHA flag
Conflicts:
libavcodec/imgconvert.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-21 15:37:01 +01:00
Michael Niedermayer
c44a028e19
af_aresample: allocate at least 1 sample buffer. Fix null ptr dereference.
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-19 15:55:54 +01:00
Michael Niedermayer
27d39c225b
liavfi/avcodec: allow channel layouts with fewer channels than actually available.
...
This fixes the regression with Ticket1726, where some audio was lost.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-18 22:54:18 +01:00
Stefano Sabatini
158763312f
lavfi/frei0r: in init() check path loop, free resources in a single point
2012-11-18 16:52:46 +01:00
Stefano Sabatini
6c7ae49330
lavfi/frei0r: extend load_path() to support arbitrarily long paths
2012-11-18 16:52:46 +01:00
Clément Bœsch
f6be711a69
lavfi/mp/pp: use PP_CPU_CAPS_AUTO.
2012-11-18 16:21:59 +01:00
Nicolas George
c437c251b8
lavfi/drawtext: implement more generic expansion.
...
The new expansion mechanism uses the %{...} notation.
For compatibility reasons, it must be enabled explicitly,
but a warning is printed if a conflict is likely to happen.
2012-11-18 15:55:47 +01:00
Nicolas George
29e388abcb
lavfi/drawtext: use bprint for the expanded text.
2012-11-17 19:47:56 +01:00
Clément Bœsch
b3bf9b1d97
lavfi/geq: fix GPL license header.
...
100l: original code is GPL, header miscopied. LICENSE file and configure
dependency are fine.
2012-11-15 21:48:39 +01:00
Stefano Sabatini
334a0d15c6
lavfi/frei0r: add additional trailing slash in FREI0R_PATH paths
...
Allow to accept paths with no ending trailing slash.
Based on a patch by rogerdpack <rogerpack2005@gmail.com>.
2012-11-13 22:54:29 +01:00
Stefano Sabatini
9a2028d4f4
lavfi/frei0r: correctly handle paths longer than 1023 chars
2012-11-13 22:41:01 +01:00
Paul B Mahol
1acd2f6ba7
Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h
...
Also remove it in once case when it is not needed.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-13 13:21:21 +00:00
Stefano Sabatini
7945665200
lavfi: store and propagate number of channels information in audio buffer properties
...
The channels field is required since the channel layout is not always
available.
2012-11-13 12:15:27 +01:00
Michael Niedermayer
03b078721c
Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'
...
* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88':
doc: git-howto: Leave reviewers time to react before pushing patches
Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h
Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
doc/git-howto.texi
ffmpeg_filter.c
libavcodec/flacdec.c
libavcodec/imc.c
libavcodec/mpegaudiodec.c
libavcodec/utils.c
libavfilter/asrc_anullsrc.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/buffer.c
libavutil/Makefile
libavutil/audioconvert.h
libavutil/channel_layout.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 11:32:11 +01:00
Clément Bœsch
3a7f00810c
lavfi: remove mp=geq filter.
...
Native geq video filter is now available.
2012-11-11 23:18:12 +01:00
Clément Bœsch
8eecbaf5e4
lavfi: add geq filter.
2012-11-11 23:12:54 +01:00
Clément Bœsch
2b3597f0d1
lavfi: remove mp=fixpts filter.
...
lavfi/f_setpts.c should allow everything mp=fixpts supports, with a lot
of additional control.
2012-11-11 22:49:53 +01:00
Clément Bœsch
84aed3faf0
lavfi: remove mp=tile filter.
...
The native tile video filter is now feature equivalent.
2012-11-11 22:43:18 +01:00
Clément Bœsch
7582012058
lavfi/tile: extend shorthand parameters.
...
This makes the syntax similar to mp=tile.
2012-11-11 22:43:18 +01:00
Clément Bœsch
4a90e7124d
lavfi/tile: add nb_frames option.
2012-11-11 22:43:18 +01:00
Clément Bœsch
ecfaff350f
lavfi/tile: add margin and padding options.
2012-11-11 22:43:17 +01:00
Clément Bœsch
aa5a029091
lavfi/tile: allow named arguments.
2012-11-11 22:43:17 +01:00
Justin Ruggles
a903f8f087
Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
...
Also reorder some other #include when applicable.
2012-11-11 13:35:12 -05:00
Michael Niedermayer
47ca2487ae
lavfi/avcodec: check that injected avframes use a supported channel layout
...
This fixes out of array accesses.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-10 21:45:34 +01:00
Michael Niedermayer
a150bad406
lavfi/avcodec: check avfilter_copy_frame_props() return code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-10 21:37:40 +01:00
Stefano Sabatini
2b442ff5f5
lavfi/movie: return proper error code in case of av_get_token() allocation failure
...
Also slightly clarify logic, and should fix coverity issue CID 717771.
2012-11-06 23:31:16 +01:00
Stefano Sabatini
b5436f4b5d
lavfi/showwaves: return error in case of allocation failure in filter_samples()
2012-11-06 22:48:54 +01:00
Stefano Sabatini
5f634480d1
lavfi/showwaves: simplify check in filter_samples()
...
Also fix Coverity issue CID 733743: Dereference after null check
2012-11-06 22:48:17 +01:00
Michael Niedermayer
44e9d7f182
vf_drawbox: dont move uninitialized and then unused colors around
...
Fixes CID741419
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-06 21:40:23 +01:00
Paul B Mahol
e870a7dd4a
lavfi: stop using -1 instead use AV_PIX_FMT_NONE/AV_SAMPLE_FMT_NONE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-11-05 13:34:08 +00:00
Stefano Sabatini
1ba2459fbb
lavfi/scale: declare the filter private class
...
Allow to show the supported options in the ffmpeg -h full output.
2012-11-04 18:01:16 +01:00
Michael Niedermayer
4a2599b0e6
transform: give avfilter_transform() a return value for returning an error
...
Fixes CID703674
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-04 01:30:16 +01:00
Stefano Sabatini
d034847f7a
lavfi/earwax: add missing NULL check in filter_samples()
2012-11-04 00:17:27 +01:00
Michael Niedermayer
37e81996dc
Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f'
...
* commit '9221efef7968463f3e3d9ce79ea72eaca082e73f':
lavf: fix av_interleaved_write_frame() doxy.
lavf: clarify the lifetime of demuxed packets.
avconv: do not free muxed packet on streamcopy.
crc: move doxy to the header
vf_drawtext: do not use deprecated av_tree_node_size
x86: Refactor PSWAPD fallback implementations and port to cpuflags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-03 14:24:11 +01:00
Michael Niedermayer
ac2a3a7a05
vf_tinterlace: check av_image_get_linesize() return value
...
Fixes CID703717
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-03 02:38:30 +01:00
Michael Niedermayer
03764f6735
af_earwax: remove unused pointer value
...
Fixes CID703849
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-03 02:38:23 +01:00
Anton Khirnov
b68aac7ea3
vf_drawtext: do not use deprecated av_tree_node_size
2012-11-02 18:28:55 +01:00
Michael Niedermayer
4695ee71b0
lavfi/fifo: add assert to ensure request was successfull.
...
We would crash a moment later anyway if this fails.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-01 18:02:23 +01:00
Michael Niedermayer
add7513e64
Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'
...
* commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415':
x86: h264_chromamc_10bit: drop pointless PAVG %define
x86: mmx2 ---> mmxext in function names
swscale: do not forget to swap data in formats with different endianness
Conflicts:
libavcodec/x86/dsputil_mmx.c
libavfilter/x86/gradfun.c
libswscale/input.c
libswscale/utils.c
libswscale/x86/swscale.c
tests/ref/lavfi/pixfmts_scale
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-01 13:11:51 +01:00
Clément Bœsch
54a48d2f04
lavfi: fix references to avfilter_* functions that don't exist anymore.
2012-10-31 20:54:59 +01:00
Clément Bœsch
f53112b665
lavfi: remove hqdn3d libmpcodecs wrapper.
...
The native filter was ported from the MPlayer project when the mp
wrapper didn't even exist, and when mp=hqdn3d was added, it was already
obsolete.
2012-10-31 19:28:02 +01:00
Diego Biurrun
d8eda37080
x86: mmx2 ---> mmxext in function names
2012-10-31 17:53:57 +01:00
Stefano Sabatini
1b21642149
lavfi/scale: avoid to print a NULL value in log message
...
Fix possible crash occurring when libc does not support NULL printing.
2012-10-31 15:46:46 +01:00
Stefano Sabatini
29a9e4d5c9
lavfi/mp: drop the mp=rectangle filter
...
All the rectangle features have been ported to the native drawbox filter,
which has an equivalent syntax.
2012-10-31 14:46:18 +01:00
Stefano Sabatini
9d478f38cd
lavfi/drawbox: add "width" and "height" aliases for "w" and "h" options
2012-10-31 14:43:47 +01:00
Stefano Sabatini
93399e9381
lavfi/drawbox: add thickness option
2012-10-31 14:43:47 +01:00
Michael Niedermayer
9766d9c985
Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'
...
* commit '04581c8c77ce779e4e70684ac45302972766be0f':
x86: yasm: Use complete source path for macro helper %includes
Conflicts:
Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-31 13:57:09 +01:00
Michael Niedermayer
3174616f59
Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'
...
* commit '6860b4081d046558c44b1b42f22022ea341a2a73':
x86: include x86inc.asm in x86util.asm
cng: Reindent some incorrectly indented lines
cngdec: Allow flushing the decoder
cngdec: Make the dbov variable have the right unit
cngdec: Fix the memset size to cover the full array
cngdec: Update the LPC coefficients after averaging the reflection coefficients
configure: fix print_config() with broke awks
Conflicts:
libavcodec/x86/ac3dsp.asm
libavcodec/x86/dct32.asm
libavcodec/x86/deinterlace.asm
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputilenc.asm
libavcodec/x86/fft.asm
libavcodec/x86/fmtconvert.asm
libavcodec/x86/h264_chromamc.asm
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264_deblock_10bit.asm
libavcodec/x86/h264_idct.asm
libavcodec/x86/h264_idct_10bit.asm
libavcodec/x86/h264_intrapred.asm
libavcodec/x86/h264_intrapred_10bit.asm
libavcodec/x86/h264_weight.asm
libavcodec/x86/vc1dsp.asm
libavcodec/x86/vp3dsp.asm
libavcodec/x86/vp56dsp.asm
libavcodec/x86/vp8dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-31 13:43:33 +01:00
Stefano Sabatini
755038d07d
lavfi/drawbox: remove some unnecessary parentheses
2012-10-31 12:20:50 +01:00
Stefano Sabatini
003bd88d99
lavfi/drawbox: reindent after previous commit
2012-10-31 12:14:21 +01:00
Stefano Sabatini
1b3fdd9731
lavfi/drawbox: implement color=invert mode
...
Based on a libmpcodecs/vf_rectangle.c feature.
2012-10-31 12:14:21 +01:00
Stefano Sabatini
652fab5996
lavfi/mp: drop wrapped field filter
...
The filter has been ported to a native libavfilter filter.
2012-10-31 12:14:09 +01:00
Stefano Sabatini
3c4aa50620
lavfi: add field filter
...
The filter is a port of libmpcodecs/vf_field.c, since there is no common
code I relicensed it as LGPL, while keeping the original author
copyright.
2012-10-31 12:07:11 +01:00
Diego Biurrun
04581c8c77
x86: yasm: Use complete source path for macro helper %includes
...
This is more consistent with the way we handle C #includes and
it simplifies the build system.
2012-10-31 00:37:42 +01:00
Diego Biurrun
6860b4081d
x86: include x86inc.asm in x86util.asm
...
This is necessary to allow refactoring some x86util macros with cpuflags.
2012-10-31 00:37:42 +01:00
Stefano Sabatini
2ed7e6cce5
lavfi/drawbox: extend syntax, accept named options
2012-10-30 23:36:36 +01:00
Stefano Sabatini
b420b87848
lavfi/tinterlace: remove poll_frame() callback
...
That interface is deprecated, and apparently useless.
2012-10-30 23:32:20 +01:00
Paul B Mahol
7b378c2fb7
lavfi: remove yuvcsp and yvu9 libmpcodecs wrappers
...
Same functionality is provided by libswscale.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-30 21:24:29 +00:00
Clément Bœsch
03179c2426
lavfi/smartblur: add missing draw slice call.
...
This fixes output with filtergraphs such as 'split[a][b];
[a]pad=iw*2[src]; [b]smartblur=1:1:1[filt]; [src][filt]overlay=w'
2012-10-30 19:37:20 +01:00
Michael Niedermayer
5cac0656a3
af_ashowinfo: integrate config_input() in filter_samples.
...
This is simpler and also should allow the code to function when the
channel number changes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30 19:26:07 +01:00
Paul B Mahol
788afee86e
lavfi: remove palette libmpcodecs wrapper
...
The filter is useless, swscale should be used instead.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-30 16:21:33 +00:00
Michael Niedermayer
e79c3858b3
Merge commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8'
...
* commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8':
dv: use AVStream.index instead of abusing AVStream.id
lavfi: add ashowinfo filter
avcodec: Add a RFC 3389 comfort noise codec
lpc: Add a function for calculating reflection coefficients from samples
lpc: Add a function for calculating reflection coefficients from autocorrelation coefficients
lavr: document upper bound on number of output samples.
lavr: add general API usage doxy
indeo3: remove duplicate capabilities line.
fate: ac3: Add dependencies
Conflicts:
Changelog
doc/filters.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
libavfilter/Makefile
libavfilter/af_ashowinfo.c
libavfilter/allfilters.c
libavfilter/version.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30 14:40:22 +01:00
Anton Khirnov
20dd41af85
lavfi: add ashowinfo filter
...
It can be useful for debugging.
Based on a patch by Stefano Sabatini <stefano.sabatini-lala@poste.it>
2012-10-29 21:29:58 +01:00
rogerdpack
c1804dc4ce
lavfi/frei0r: allow for Windows style paths
...
Update path handling against the latest Frei0r specification changes.
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2012-10-29 18:50:48 +01:00
Stefano Sabatini
7691860c73
lavfi/frei0r: update link to spec
...
Fri0r project moved from piksel.org to frei0r.dyne.org.
2012-10-29 18:48:00 +01:00
Stefano Sabatini
19add3224f
lavfi/scale: implement clever/insane parsing heuristic, and add a size option
...
If the first argument can be read as a video size, set that output size
in the scale. This allows to specify in a filtergraph scale=qcif or
scale=320x240.
This is not completely safe, for example in case of a typo in the video
size string the first argument will be read as the input width
expression, giving rise to a confusing comment.
2012-10-29 17:44:53 +01:00