Commit Graph

777 Commits

Author SHA1 Message Date
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 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
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
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 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 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 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 5fce60c3a9 Log debug information in filter_samples().
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-02 12:12:32 +00:00
Luca Barbato dfd2a005eb Replace dprintf with av_dlog
dprintf clashes with POSIX.1-2008
2011-01-29 23:55:37 +01:00
Stefano Sabatini 3e5bc7ff6a In the start_frame() debug log, print the reference pos value rather than the evaluated value converted to int.
That's required because -1 is evaluated as NAN, which converted back
to int looks like a random number, this is especially annoying when
debugging sources with undefined pos (as the video4linux2 device).

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-28 17:27:54 +01:00
Diego Elio Pettenò eb7ccf8f33 Make the avfilter debug functions and macros static to avfilter.c
This removes ff_get_ref_perms_string, ff_dprintf_ref and ff_dprintf_link
fro the interface of libavfilter.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-26 15:33:12 +00:00
Mans Rullgard daed21a17e avfilter: remove stray semicolon 2011-01-18 20:48:23 +00:00
Janne Grunau 2c3589bfda consolidate .gitignore patters into a single file
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-18 21:32:05 +01:00
Janne Grunau 348b8218f7 convert svn:ignore properties to .gitignore files
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-17 15:50:14 +01:00
Stefano Sabatini dccdd93efc Make config_props() return AVERROR(EINVAL) rather than 1 in case of
failed SWScaleContext initialization.

Fix issue2546.

Originally committed as revision 26395 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-16 20:11:46 +00:00
Ronald S. Bultje 84cac86e7e Fix fate breakage in r26382.
Originally committed as revision 26383 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-16 03:20:03 +00:00
Baptiste Coudurier ecea47a6ed Remove useless free, fix warning:
libavfilter/defaults.c: In function 'avfilter_default_get_audio_buffer':
libavfilter/defaults.c:129: warning: 'buf' is used uninitialized in this function

Originally committed as revision 26382 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-16 02:47:25 +00:00
Stefano Sabatini b1779800c4 Include libavcore/audioconvert.h, required for
av_get_channel_layout_string() in ff_dprintf_link.

Fix compilation.

Originally committed as revision 26380 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-15 20:43:01 +00:00
Stefano Sabatini 1d5b188518 Reindent.
Originally committed as revision 26379 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-15 20:02:03 +00:00
Stefano Sabatini 7986e34db0 Make ff_dprintf_link() print meaningful information for audio links.
Originally committed as revision 26378 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-15 19:58:29 +00:00
Stefano Sabatini a242ac3620 Rename AVFilterBufferRefAudioProps.samples_nb to nb_samples.
More consistent with the rest of FFmpeg and sounds more natural to
English speaking people.

Originally committed as revision 26374 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-15 17:31:34 +00:00
Stefano Sabatini 6baf4afa99 Make avfilter_unref_buffer() accept a NULL parameter.
Originally committed as revision 26373 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-15 17:21:15 +00:00
Baptiste Coudurier a51c71bb54 In yadif filter, default to top field first if interlacing is unknown
Originally committed as revision 26347 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-15 00:32:36 +00:00
Stefano Sabatini 3bf3fc0e54 Add the word "Parsed" in the parsed filter names.
Originally committed as revision 26334 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-14 20:58:47 +00:00
Stefano Sabatini 891aeeee72 Check linked pads media type mismatch in avfilter_link().
Originally committed as revision 26325 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-13 01:00:36 +00:00
Stefano Sabatini caeb0c3027 Make avfilter_graph_free() do nothing if graph is NULL.
Originally committed as revision 26323 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-12 21:23:16 +00:00
Stefano Sabatini 8bca34933e In the pad filter, log information about the input size.
Originally committed as revision 26320 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-12 16:40:23 +00:00
Michael Niedermayer e3331706fc Fix design of the pad filter.
Previously the pad filter just drawed borders in the surrounding of the input
without checking if this area was allocated or writeable. Now we check and
allocate a new buffer if the input is unsuitable.

Originally committed as revision 26315 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-11 23:53:24 +00:00
Michael Niedermayer 36dc00de52 Add w,h,format back into AVFilterBuffer, these are required for direct rendering.
These fields are needed to be able to know which area of memory is allocated and
which is off limits.
This reverts 24291 and parts of r24424.

Originally committed as revision 26314 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-11 23:53:17 +00:00
Baptiste Coudurier 69057b70f7 In pad filter, update new ref w/h in start_frame, fix chaining
Originally committed as revision 26217 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-05 01:14:14 +00:00
Baptiste Coudurier d34a77fb09 In crop filter, update new ref w/h instead of old one, fix chaining
Originally committed as revision 26216 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-05 01:00:53 +00:00
Stefano Sabatini b59dd1ea4f Fix style nits in avfiltergraph.c.
Originally committed as revision 26116 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-28 14:10:12 +00:00
Stefano Sabatini b567020943 Add copy filter, useful for testing the avfilter_draw_slice() copy
code.

Originally committed as revision 26112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-28 01:01:09 +00:00
Stefano Sabatini 28e5d45c68 Bump lavfi minor and add an entry after r26108 (which added
AV_PERM_NEG_LINESIZES to avfilter.h).

Originally committed as revision 26111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-27 18:16:52 +00:00
Stefano Sabatini b4356e4118 In the crop filter, put under ifdef DEBUG the trace logs for the
evaluated crop area coordinates.

Prevent debug log spamming, define the DEBUG symbol for enabling them.

Originally committed as revision 26110 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-27 18:04:35 +00:00
Michael Niedermayer 0ccabeeaef Support filters and decoders that dont support negative linesizes.
This patch is based on work by stefano.

Originally committed as revision 26108 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-27 15:10:21 +00:00
Stefano Sabatini 17fc94933b Add erode libopencv filter.
Originally committed as revision 26097 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-26 11:27:09 +00:00
Stefano Sabatini 91cbb6ba53 Add dilate libopencv filter.
Originally committed as revision 26096 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-26 11:27:05 +00:00
Stefano Sabatini cf69ad35c5 Redesign the libopencv wrapper to make it more generic. Accept both
FILTERNAME=ARGS and FILTERNAME:ARGS syntax.

The same filter class will be used for managing all the libopencv
filtering functions.

Originally committed as revision 26079 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-23 17:24:19 +00:00
Stefano Sabatini fee0deb61f Fix avfilter_draw_slice() copy code with alpha planes.
Originally committed as revision 26060 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-19 19:08:30 +00:00
Stefano Sabatini 2609ad3e40 Revert commit r22596.
commit ab8610aa176c13b5e25a2d8770df28a14665e169
  Author: koorogi <koorogi@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
  Date:   Thu Mar 18 23:13:04 2010 +0000

    The vflip filter does not need to keep ownership of a picture reference.
    Avoid creating and releasing useless extra picture references in the
    start_frame and end_frame callbacks.

    Originally committed as revision 22596 to svn://svn.ffmpeg.org/ffmpeg/trunk

The new reference creation is required when the linesizes are used by the
previous filters in the filterchain, for example as in "pad=W:H:X:Y,vflip".

Originally committed as revision 26059 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-19 18:17:11 +00:00
Stefano Sabatini 69b8d83ecf Fix crash in gradfun:end_frame() when inpic == outpic, so it has to be
freed just once.

Originally committed as revision 26058 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-19 13:02:05 +00:00
Nolan L d5f187fd33 Add gradfun filter, ported from MPlayer.
Patch by Nolan L nol888 <=> gmail >=< com.

See thread:
Subject: [FFmpeg-devel] [PATCH] Port gradfun to libavfilter (GCI)
Date: Mon, 29 Nov 2010 07:18:14 -0500

Originally committed as revision 25942 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-12 17:59:10 +00:00
Stefano Sabatini 9241cd2095 Make avfilter_parse_graph() output a more meaningful message when an
invalid filterchain is detected.

Originally committed as revision 25936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-12 13:39:16 +00:00
Stefano Sabatini c61cdd0afb Move AV_NOPTS_VALUE, AV_TIME_BASE, AV_TIME_BASE_Q symbols from
libavcodec to libavcore.

Remove another compile-time dependancy of libavfilter on libavcodec.

Originally committed as revision 25923 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-09 17:27:33 +00:00