Commit Graph

829 Commits

Author SHA1 Message Date
Stefano Sabatini
2f86e7bd12 graphparser: add a NULL check on the argument passed to strstr
Fix crash in create_filter() which occurrs if a scale filter with no
args is provided.
2011-03-30 22:16:08 +02:00
Stefano Sabatini
c50998675d mp: extend syntax, make it accept mp=filter=params
Make the mp wrapper accept the syntax mp=filter=params as alternative
to mp=filter:params. The alternative syntax is sligthly more readable
and should simplify copy&paste of MPlayer filter strings to the mp
filter.
2011-03-28 22:50:09 +02:00
Michael Niedermayer
57e2ded423 Implement interlaced scaling.
Fixes issue2632 if interl=1 is used or the automatic interlace detection is enabled
and works. This has the advantage compared to the patch in issue2632 that it causes
no speed loss and it also works when scaling is used. The disadvantage is that
interlacing autodetection does not yet work very well it seems.
This is the same method mplayer uses

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-28 01:45:11 +02:00
Stefano Sabatini
efc8c709c9 drawtext: draw glyphs for the strftime()-expanded text
In draw_glyphs(), draw glyphs in dtext->expanded_text rather than in
dtext->text. Fix crash if a strftime() sequence is used.
2011-03-27 19:00:03 +02:00
Stefano Sabatini
3ea031b3f2 setdar: prefer "sar" over "par" in log info message
This is more consistent with the terminology adopted by the aspect
filter names.
2011-03-27 16:27:05 +02:00
Peter Ross
f5607c8361 Make the hflip filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats 2011-03-26 13:24:41 +11:00
Peter Ross
af55573379 Make the crop filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats 2011-03-26 13:24:36 +11:00
Reimar Döffinger
0bfe349d4a Update to latest MPlayer version.
Avoids warnings due to pointlessly casting away const.
2011-03-25 19:05:02 +01:00
Mark Himsley
19d82cb14c fade: fix draw_slice() check on fade->factor value
draw_slice() checks that the fade factor is < 65536 and only
calculates the fade if so. But the fade factor is clipped in
end_frame() by av_clip_uint16() to 65535, so the fade is calculated
for every frame.  This patch alters the check so that it compares with
< 65535 (UINT16_MAX).
2011-03-18 23:25:33 +01:00
Mark Himsley
1527e689cf fade: make draw_slice() chroma check against planes 1 and 2
draw_slice() checks that planes 0 and 1 of AVFilterBufferRef's data
are not NULL before manipulating planes 1 and 2. This patch makes the
check against planes 1 and 2. More senseful and possibly more robust.
2011-03-18 23:25:33 +01:00
j@v2v.cc
3660b5bca9 remove definition of swab
right now swab is defined in libavfilter/libmpcodecs/mpbswap.h
this breaks mingw32 cross compiles. since it its not used, it should be
removed. alternatively swab has to be added to HAVE_LIST in configure.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-17 19:09:45 +01:00
Michael Niedermayer
e528cdac8a Revert "replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION"
This reverts commit 29ba091136.
2011-03-17 17:26:45 +01:00
Michael Niedermayer
0cb88628fb Revert "use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*"
This reverts commit a03be6e1ba.
2011-03-17 17:26:45 +01:00
Michael Niedermayer
0fecf2642b Merge remote-tracking branch 'newdev/master'
Conflicts:
	Changelog
	doc/APIchanges
	doc/optimization.txt
	libavformat/avio.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-17 17:22:52 +01:00
Baptiste Coudurier
69aab68037 Use av_strdup instead of strdup, fixes mingw build 2011-03-16 14:26:25 -07:00
Janne Grunau
a03be6e1ba use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_* 2011-03-16 21:54:39 +01:00
Janne Grunau
29ba091136 replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION
also update the multiple inclusion guards in config.h|mak
2011-03-16 21:54:39 +01:00
Mans Rullgard
49e617f956 yadif: add parens around macro parameters
This fixes compilation with preprocessors which do not add whitespace
around replaced tokens, resulting in invalid expressions like 1--1.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-08 02:08:31 +01:00
Mans Rullgard
391a1327bd yadif: add parens around macro parameters
This fixes compilation with preprocessors which do not add whitespace
around replaced tokens, resulting in invalid expressions like 1--1.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-05 14:51:03 +00:00
Carl Eugen Hoyos
8214249051 Add libmpcodecs to the list of libavfilter subdirectories. 2011-02-25 15:34:20 +01:00
Michael Niedermayer
f9c61974ae Add shadow support to the drawtext filter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-22 01:49:54 +01:00
Michael Niedermayer
a64a2c5f98 factor draw_glyphs out of drawtext filter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-22 01:49:54 +01:00
Michael Niedermayer
bccea08836 Fix and optimize yuv blend in the drawtext filter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-22 01:49:54 +01:00
Michael Niedermayer
7d27902263 get rid of divisions in the inner loop of the drawtext filter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-22 01:49:54 +01:00
Michael Niedermayer
476aaec637 fix chroma alpha in the drawtext filter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-22 01:49:54 +01:00
Michael Niedermayer
edbaedf7a0 Simplify chroma blend in the drawtext filter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-22 01:49:54 +01:00
Stefano Sabatini
bd8e750300 Port drawtext filter by Hemanth from the libavfilter soc repo, with
the following additions:
* support to anti-aliased glyph rendering
* support to UTF-8 text and Unicode chars rendering
* support for RGB packed formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-22 01:49:45 +01:00
Stefano Sabatini
c8c0189d62 lavfi: put color source in a dedicated file
Move the color source code from vf_pad.c to vsrc_color.c.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-21 14:09:46 +00:00
Stefano Sabatini
5ad06110e0 lavfi: add drawutils
Add drawutils.h and drawutils.c, and use them in the pad filter.
The new functions are going to be shared by other filters.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-21 14:09:08 +00:00
Brandon Mintern
704865fc87 lavfi: add fade filter
Port fade filter from libavfilter soc repo, with minor fixes by
Stefano.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-21 13:56:48 +01:00
Stefano Sabatini
fd0b42cce0 lavfi: put color source in a dedicated file
Move the color source code from vf_pad.c to vsrc_color.c.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-21 13:45:44 +01:00
Stefano Sabatini
bcfd9e821b lavfi: add drawutils
Add drawutils.h and drawutils.c, and use them in the pad filter.
The new functions are going to be shared by other filters.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-21 13:44:52 +01:00
Michael Niedermayer
02d0803571 Reduce picture size for yadif.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-18 19:39:56 +01:00
Michael Niedermayer
bad82d3d7d Change yadif to not use out of picture lines.
Fixes issue2272.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-18 19:39:42 +01:00
Reinhard Tartler
7ffe76e540 Merge libavcore into libavutil
Done to keep ABI compatible. Otherwise this is just silly
2011-02-16 23:00:30 +01:00
Reinhard Tartler
737eb5976f Merge libavcore into libavutil
It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody
is helped by having libavutil and libavcore split. In order to ease
maintenance inside and around FFmpeg and to reduce confusion where to
put common code, avcore's functionality is merged (back) to avutil.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-02-15 16:18:21 +01:00
Stefano Sabatini
6985d7bf87 Make avfilter_config_links() propagate audio information of the source link if it is not explicitely set by the filter.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-14 23:37:34 +01:00
Stefano Sabatini
70c275f8c3 Make avfilter_config_links() propagate audio information of the source link if it is not explicitely set by the filter. 2011-02-14 21:00:25 +01:00
Michael Niedermayer
910b5b82e8 Add sample_aspect_ratio to AVFilterLink
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-14 13:07:21 +00:00
Stefano Sabatini
9b8bb626dc libavfilter: add video movie source
See thread:
Subject: [PATCH] movie video source
Date: 2010-12-31 15:35:30 GMT

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-02-09 03:33:28 +01:00
Stefano Sabatini
9409c3811c libavfilter: add video movie source
See thread:
Subject: [PATCH] movie video source
Date: 2010-12-31 15:35:30 GMT

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-02-08 13:20:56 +01:00
Clément Bœsch
bffad70c66 Remove forgotten if (p) av_free(p) forms
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 290849e2a4)
2011-02-06 20:31:44 +01:00
Stefano Sabatini
ab543afe47 Make avfilter_graph_free() free the graph.
Make avfilter_graph_free() free not only the internal structures, but
also the allocated graph, and set the graph pointer to NULL for
increased safety.

Simplify usage.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 4359288c56)
2011-02-06 20:31:42 +01:00
Stefano Sabatini
c68be8e135 Make avfilter_graph_parse() not free the input graph
Make avfilter_graph_parse() only release the internal structures
allocated during the parsing, and leave to free the graph itself to
the calling code.

This approach looks cleaner, as the graph is not allocated by the
function.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e8e5dde779)
2011-02-06 20:31:42 +01:00
Clément Bœsch
290849e2a4 Remove forgotten if (p) av_free(p) forms
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-04 10:00:52 +00:00
Stefano Sabatini
4359288c56 Make avfilter_graph_free() free the graph.
Make avfilter_graph_free() free not only the internal structures, but
also the allocated graph, and set the graph pointer to NULL for
increased safety.

Simplify usage.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-04 02:55:11 +00:00
Stefano Sabatini
e8e5dde779 Make avfilter_graph_parse() not free the input graph
Make avfilter_graph_parse() only release the internal structures
allocated during the parsing, and leave to free the graph itself to
the calling code.

This approach looks cleaner, as the graph is not allocated by the
function.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-04 02:55:11 +00:00
Stefano Sabatini
057f3d2763 Log debug information in filter_samples().
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 5fce60c3a9)
2011-02-04 03:08:09 +01:00
Stefano Sabatini
5fce60c3a9 Log debug information in filter_samples().
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-02 12:12:32 +00:00
Michael Niedermayer
7b3ea5507c Add sample_aspect_ratio fields to vsrc_buffer arguments.
This fixes aspect handling in ffmpeg
This is based on a patch by baptiste
2011-01-31 21:32:06 +01:00