Michael Niedermayer
656911d84d
vsrc_mandelbrot: Fix vsrc_mandelbrot.c:358:85: warning: ‘epsilon’ may be used uninitialized in this function [-Wuninitialized]
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-24 00:08:05 +01:00
Michael Niedermayer
248bb81ebc
avfilter: Error out from avfilter_merge_formats() when there are duplicates
...
instead of trying to continue.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-23 14:14:01 +01:00
Michael Niedermayer
4d874fc2b1
vf_mp: rewrite vf_mp filter warning message
...
Warning text by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-23 13:22:46 +01:00
Michael Niedermayer
8cda755c2f
avfilter: dont write out of array for duplicate formats in avfilter_merge_formats()
...
Note, this is a theoretical fix, iam not aware of a case where this function receives
duplicates in its input.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-23 13:18:11 +01:00
Michael Niedermayer
78317881f0
graphparser: Fix doxy on avfilter_graph_parse() return value.
...
Found-by: ZacS123
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-22 15:09:26 +01:00
Clément Bœsch
2f0f9a87d0
Fix various if parenthesis misplacements.
2011-11-21 19:35:33 +01:00
Michael Niedermayer
2c44aed82a
vsrc_mandelbrot: fix inner=period, the previous optimizations broke it.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-21 04:16:41 +01:00
Michael Niedermayer
90c02ae142
vsrc_mandelbrot: increase maxiter to 7189
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 23:52:29 +01:00
Michael Niedermayer
690860d0d5
vsrc_mandelbrot: Use threshold to detect cycles.
...
This way cycles are detected much earlier.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 23:28:56 +01:00
Michael Niedermayer
a5dfedd381
vsrc_mandelbrot: detect edges in interpol()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 22:22:21 +01:00
Michael Niedermayer
4ebbcdb3eb
vsrc_mandelbrot: avoid a | in interpol()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 22:11:53 +01:00
Michael Niedermayer
5dd16af6b5
vsrc_mandelbrot: increase default zoom speed by a factor of 2
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 19:42:24 +01:00
Michael Niedermayer
ca14808275
vsrc_mandelbrot: spatial interpolation
...
speeds the code up by a factor of about 2-3.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 19:41:28 +01:00
Michael Niedermayer
56fc4cf04f
vsrc_mandelbrot: always store values for periodicity checking, this avoids a few checks.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 15:02:34 +01:00
Michael Niedermayer
da1344e0cd
vsrc_mandelbrot: simplify second bailout search by not recalculating values.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 15:00:26 +01:00
Michael Niedermayer
e749b3780c
vsrc_mandelbrot: increase zyklus array size so that optimizations can write a bit more.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 14:16:53 +01:00
Michael Niedermayer
649d3932db
vsrc_mandelbrot: check bailout only once every 8 iterations, this is around 10% faster.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 14:15:56 +01:00
Michael Niedermayer
fe2efc5264
vsrc_mandelbrot: factorize periodicity checking too.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 13:55:51 +01:00
Michael Niedermayer
cf670fbc96
vsrc_mandelbrot: factorize main calculation out into a macro.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-19 13:51:44 +01:00
Clément Bœsch
1fbf7165d5
lavfi: reimplement MPlayer's af_pan filter for libavfilter.
...
Original code by Clément Bœsch.
Parameters parsing and misc enhancements by Nicolas George.
2011-11-18 19:39:26 +01:00
Michael Niedermayer
32aa9590ac
vf_scale: Fix slice position assert to take vertical subsampling into account.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-17 22:39:46 +01:00
Michael Niedermayer
974d25e2db
mandelbrot: make mincol description and code match.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-16 15:13:01 +01:00
Clément Bœsch
16b809ce8e
lavfi: fix misc typo in avfilter.h header.
2011-11-16 09:53:58 +01:00
Clément Bœsch
4da45aff28
cleanup: remove various double end ';' all over the code.
2011-11-16 07:48:23 +01:00
Michael Niedermayer
04bb26e3ee
mandelbrot: add dither to convergence & mincol colorings.
...
This avoids banding artifacts.
Note, low end TFTs still show some banding.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-15 21:33:11 +01:00
Michael Niedermayer
7575980ba4
mandelbrot: make mincol the default.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-15 20:04:25 +01:00
Michael Niedermayer
8d51cb4fb8
mandelbrot: add mincol inner coloring method.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-15 20:04:25 +01:00
Michael Niedermayer
5a68b1ac3b
mandelbrot: add inner drawing method to show converence time
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-15 17:26:51 +01:00
Michael Niedermayer
5582e557e6
mandelbrot: add "fractal" to the description
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-15 17:26:46 +01:00
Michael Niedermayer
4c52adad69
mandelbrot: Fix "warning: passing argument 2 of ‘draw_mandelbrot’ from incompatible pointer type"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-15 17:26:41 +01:00
Stefano Sabatini
2b1a4c5b34
amovie: avoid crash in amovie_request_frame() if no samplesref is available
...
The crash occurrs when a frame is successfully decoded, but no decoded
data is immediately available (typically happens with ogg/vorbis).
2011-11-15 00:10:15 +01:00
Michael Niedermayer
73af8ea356
mandelbrot: add math.h for log2()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-14 05:56:03 +01:00
Michael Niedermayer
70eb58cd92
mandelbrot: avoid INFINITY as openbsd seems not to like it.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-14 05:47:56 +01:00
Michael Niedermayer
b1b0fd2790
pad: fix format string length
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-14 05:42:10 +01:00
Stefano Sabatini
3a9f2f1d65
vsrc_mandelbrot: set options through the opt framework
2011-11-13 21:31:23 +01:00
Giorgio Vazzana
c15400afc5
mandelbrot: remove always-false condition in fill_from_cache
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-13 19:41:21 +01:00
Michael Niedermayer
08dadd331f
mandelbrot: allow visualizing the period of converged points.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-13 19:28:24 +01:00
Michael Niedermayer
e8499ab171
mandelbrot: Add inner variable & enum for inner coloring schemes.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-13 19:26:22 +01:00
Michael Niedermayer
3cbe9afba5
mandelbrot: only check bailout once every 2 iterations.
...
Once we bailed out we calculate the exact iteration in which it would have happened if needed.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-13 18:14:40 +01:00
Michael Niedermayer
41fd1b2d5a
mandelbrot: add SQR() macro
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-13 18:14:10 +01:00
Giorgio Vazzana
e555119c73
mandelbrot: correct and simplify the formula used in NORMALIZED_ITERATION_COUNT
...
Use log(sqrt(mb->bailout)) instead of log(mb->bailout) because mb->bailout represent
the bailout radius squared, and then simplify the two sqrt().
This is also slightly faster.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-13 17:33:09 +01:00
Michael Niedermayer
88166fc579
mandelbrot: unroll the innermost loop once.
...
This allows us to remove a if() and a variable assignment.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-13 17:01:56 +01:00
Michael Niedermayer
1d06608732
mandelbrot: only check periodicity once for each period instead of twice.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-13 17:01:56 +01:00
Michael Niedermayer
2fee131b9e
mandelbrot: use period detection depening on left pixel and not the
...
previous calculated pixel, this is more accurate due to the last
calculated often being farther away.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-13 17:01:56 +01:00
Giorgio Vazzana
be97e7b9c2
mandelbrot: remove unused variables
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-13 01:27:30 +01:00
Giorgio Vazzana
459bba58d2
mandelbrot: add missing options to the parsing code
...
The following options were added: end_scale, end_pts, bailout, outer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-13 01:27:30 +01:00
Giorgio Vazzana
6024bdb21a
mandelbrot: fix sscanf format string
...
Replace ',' with ':'
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 21:00:12 +01:00
Michael Niedermayer
32dd67162a
mandelbrot: Print a note if the cache is too small
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 17:05:11 +01:00
Michael Niedermayer
905202ef6e
mandelbrot: increase cache size
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 17:04:50 +01:00
Michael Niedermayer
fd8d03457a
mandelbrot: increase resolution, and decrease zoom speed to maintain the cpu requirement.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 17:04:08 +01:00
Michael Niedermayer
40d6e30c55
mandelbrot: increase default maxiter
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 16:46:41 +01:00
Michael Niedermayer
6c5dd858b4
mandelbrot: Only use cycle detection if previous pixel was an interior pixel
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 16:46:21 +01:00
Michael Niedermayer
50b8f9388a
mandelbrot: detect cycles to speed up interior rendering.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 16:46:16 +01:00
Michael Niedermayer
3de934c873
mandelbrot: increase default maxiter to 1024
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 16:44:53 +01:00
Michael Niedermayer
07f272bdbb
mandelbrot: use cache to avoid recalculating points.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 16:44:53 +01:00
Michael Niedermayer
8ca891fc1a
mandelbrot: more interresting zoom coordinates borrowed from wikipedia.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 16:44:53 +01:00
Michael Niedermayer
ddeb194b14
mandelbrot: add a end_scale and pts so we can zoom in.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 00:04:16 +01:00
Michael Niedermayer
dece017280
mandelbrot: center coordinate reference on the images center
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 00:04:15 +01:00
Michael Niedermayer
aa198ad679
mandelbrot: make 2 variables const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 00:04:15 +01:00
Michael Niedermayer
0e5b05134b
mandelbrot: fix typo that led to hardcoded max iteration count.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 00:04:15 +01:00
Michael Niedermayer
4ccd898af2
mandelbrot: support different outer coloring methods.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 23:22:04 +01:00
Michael Niedermayer
75e309160b
mandelbrot: make bailout a variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 23:21:42 +01:00
Michael Niedermayer
847e61de4a
avfilter: bump minor for mandelbrot
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 23:20:25 +01:00
Michael Niedermayer
658d166da0
avfilter: add mandelbrot fraktal source
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 22:47:06 +01:00
Michael Niedermayer
393b234fa1
yadif, its 2011
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 17:06:47 +01:00
Michael Niedermayer
825481e87b
yadif: reject reuse2 buffers as we cant use frames that change under our
...
fingers.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 17:06:07 +01:00
Stefano Sabatini
dec354ba1d
vf_fade: reindent after previous commit
2011-11-10 01:31:28 +01:00
Mark Himsley
8c1fb50d07
vf_fade: add alpha option and alpha fading support
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2011-11-10 01:31:13 +01:00
Mark Himsley
0d602615ab
vf_fade: add support to options parsing
...
Extend fade syntax, required by a pending patch.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2011-11-10 01:28:31 +01:00
Nicolas George
68b531fe6a
src_movie: set the channel layout to default if the codec did not set it.
...
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-06 01:19:56 +01:00
Reimar Döffinger
5af7daabc4
Mark AVFilterPad[] compound literals as const.
...
GCC 4.6.2 at least still seems to fail to put them in .rodata though,
see also http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37303
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-06 00:05:14 +01:00
Reimar Döffinger
b052601b95
Make another static array const.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-05 15:37:02 +01:00
Reimar Döffinger
6f6ab1d9f3
Make another PixelFormat list const.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-05 15:37:02 +01:00
Reimar Döffinger
d7e95ccd9f
Make PIX_FMT format list arrays const.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-05 15:37:02 +01:00
Reimar Döffinger
d78473334e
Add const to static arrays where it was forgotten.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-05 15:37:01 +01:00
Ronald S. Bultje
43317fd52c
libavfilter: reindent.
2011-11-05 07:01:39 -07:00
Ronald S. Bultje
23a8b4ddfc
avfilter: don't abort() on zero-size allocations.
2011-11-05 06:59:27 -07:00
Michael Niedermayer
c28ea94cd7
af_volume: exp10() is a GNU extension.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-05 05:39:42 +01:00
Stefano Sabatini
3a1045dfda
af_earwax: copy input buffer properties to output
...
In particular, fix timestamps, partially address trac ticket #375 .
2011-11-05 02:45:08 +01:00
Mina Nagy Zaki
fa4f06ab5e
lavfi: add earwax audio filter, ported from Sox
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2011-11-05 02:16:45 +01:00
Stefano Sabatini
618ac71354
lavfi: add volume filter
2011-11-05 02:13:37 +01:00
Stefano Sabatini
1fc7077115
lavfi: increase number of maximum registered filters from 64 to 128
2011-11-05 02:13:37 +01:00
Stefano Sabatini
217790871e
lavfi: issue error if maximum number of filters is reached
...
Issue an error and return a more meaningful error code in case the
maximum number of registered filters has been reached.
This is better than silently ignore the error, improve feedback.
2011-11-05 02:13:37 +01:00
Michael Niedermayer
259a960f1b
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
vp6: Fix illegal read.
avfilter: Don't copy garbage from the stack when setting up video pictures.
avcodec: Make sure codec_type is set by avcodec_get_context_defaults2
avcodec: Remove a misplaced and useless attribute_deprecated
avconv: add -dump_attachment option.
avconv: add -attach option.
avconv: make negative mappings disable only streams from the specified file
fmtconvert: fix int32_to_float_fmul_scalar() for windows x86_64
Conflicts:
libavcodec/options.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-04 01:44:06 +01:00
Alex Converse
0d7a16a946
avfilter: Don't copy garbage from the stack when setting up video pictures.
2011-11-03 15:54:04 -07:00
Reimar Döffinger
96949dafcc
Replace all strcasecmp/strncasecmp usages.
...
All current usages of it are incompatible with localization.
For example strcasecmp("i", "I") != 0 is possible, but would
break many of the places where it is used.
Instead use our own implementations that always treat the data
as ASCII.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-03 19:25:26 +01:00
Michael Niedermayer
988f585fcb
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (44 commits)
replacement Indeo 3 decoder
gsm demuxer: do not allocate packet twice.
flvenc: use first packet delay as global delay.
ac3enc: doxygen update.
imc: return error codes instead of 0 for error conditions.
imc: return meaningful error codes instead of -1
imc: do not set channel layout for stereo
imc: validate channel count
imc: check for ff_fft_init() failure
imc: check output buffer size before decoding
imc: use DSPContext.bswap16_buf() to byte-swap packet data
rtsp: add allowed_media_types option
libgsm: add flush function to reset the decoder state when seeking
libgsm: simplify decoding by using a loop
gsm: log error message when packet is too small
libgsmdec: do not needlessly set *data_size to 0
gsmdec: do not needlessly set *data_size to 0
gsmdec: add flush function to reset the decoder state when seeking
libgsmdec: check output buffer size before decoding
gsmdec: log error message when output buffer is too small.
...
Conflicts:
Changelog
ffplay.c
libavcodec/indeo3.c
libavcodec/mjpeg_parser.c
libavcodec/vp3.c
libavformat/cutils.c
libavformat/id3v2.c
libavutil/parseutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-03 02:16:26 +01:00
Stefano Sabatini
0b3e9d5dc6
vf_overlay: adopts FAST_DIV255 macro for calculating destination alpha
...
Ease readability, improve exactness.
2011-11-02 21:44:13 +01:00
Mark Himsley
91dfb73852
vf_fade: fade to correct CCIR601/709 black level
...
Current implementation fades to 0. This implementation fades to 16 for
YUV formats that contain CCIR601/709 video levels. RGB and YUVJ
formats are not altered.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2011-11-02 21:44:13 +01:00
Diego Biurrun
959cfbf3f4
vsrc_testsrc: fix mailing list reference URL
2011-11-02 10:42:55 +01:00
Diego Biurrun
124e28847b
Remove some stray unnecessary ffmpeg references.
2011-11-02 10:42:54 +01:00
Michael Niedermayer
3fd0f6ed25
vf_transpose: remove pix_fmts which can currently not be supported.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-01 23:45:28 +01:00
Stefano Sabatini
30647fb45a
lavfi: bump micro after recent changes in the overlay filter
2011-10-31 11:19:53 +01:00
Stefano Sabatini
2f7c8aefa8
vf_overlay: add support to alpha pre-multiplication in the RGBA path
...
Based on the work of Mark Himsley <mark@mdsh.com>.
See thread:
Subject: [FFmpeg-devel] libavfilter: extending overlay filter
Date: Sun, 13 Mar 2011 14:18:42 +0000
2011-10-31 11:06:31 +01:00
Stefano Sabatini
3013bfa81e
vf_overlay: enable RGB path
...
Add option rgb which forces the RGB path.
2011-10-31 11:06:19 +01:00
Stefano Sabatini
b54c0a552d
vf_overlay: use opt.h API for setting options
...
Extend syntax, allow to easily add more options later.
2011-10-30 21:10:54 +01:00
Stefano Sabatini
8dc90371b1
lavfi: add internal function ff_fill_rgba_map()
2011-10-28 02:06:50 +02:00
Clément Bœsch
9bd23f6815
ashowinfo: fix typo in description.
2011-10-27 22:16:24 +02:00
Clément Bœsch
a0b7853f7a
vf_showinfo: print checksums in hexadecimal.
2011-10-27 22:14:57 +02:00
Michael Niedermayer
3e4375833d
vf_scale: Request an aligned buffer.
...
Fixes Ticket594
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-27 03:46:50 +02:00