1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Commit Graph

603 Commits

Author SHA1 Message Date
Stefano Sabatini
eedca998eb Implement ff_get_ref_perms_string() and use it for tracing.
Originally committed as revision 24900 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-24 15:12:13 +00:00
Stefano Sabatini
7f1af825f8 Add fifo filter.
Originally committed as revision 24896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-24 08:38:00 +00:00
Stefano Sabatini
5a9dd3de63 Make avfilter_start_frame() invoke avfilter_get_video_buffer() on the
link rather than avfilter_default_get_video_buffer().

This is required as the buffer requested may be greater than the
buffer allocated locally by avfilter_default_get_video_buffer(), for
example if in filterchain there is a pad filter (like in "fifo,pad").

In that case the pad filter will try to write beyond the data of the
allocated buffer, resulting in a crash.

Originally committed as revision 24895 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-24 08:37:54 +00:00
S.N. Hemanth Meenakshisundaram
99046339fc Add null audio filter.
Patch by S.N. Hemanth Meenakshisundaram -af smeenaks,ucsd,edu.

Originally committed as revision 24856 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-20 23:16:51 +00:00
Stefano Sabatini
e34433612f Rename av_fill_image_max_pixstep() to av_fill_image_max_pixsteps().
The plural form is preferred as it is more consistent with the other functions:
av_fill_image_linesizes()
av_fill_image_pointers()

and looks semantically more correct as it fills an array of elements.

Originally committed as revision 24851 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-20 16:52:38 +00:00
Stefano Sabatini
014df3a2aa Make ff_dprintf_ref() print audio related information if available.
Originally committed as revision 24849 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-20 15:16:10 +00:00
Stefano Sabatini
e29b451a51 Cosmetics: merge two lines in ff_dprintf_ref().
Originally committed as revision 24848 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-20 15:16:07 +00:00
Stefano Sabatini
0055b2d11a Make ff_dprintf_ref() print the information related to the referenced
AVFilterBuffer.

Originally committed as revision 24847 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-20 15:16:02 +00:00
Stefano Sabatini
b5fbb31e55 Rename ff_dprintf_picref() to ff_dprintf_ref().
The function is going to be used to represent also audio data.

Originally committed as revision 24846 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-20 15:15:57 +00:00
Stefano Sabatini
801ab98088 Extend ff_dprintf_picref() to make it print video interlaced and
top_field_first information.

Originally committed as revision 24845 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-20 14:41:23 +00:00
Stefano Sabatini
382ecd3537 Make ff_dprintf_picref() print video properties only if available.
Originally committed as revision 24844 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-20 14:41:21 +00:00
Stefano Sabatini
28c52b1ed9 Only print the pointer to the first plane in ff_dprintf_picref().
To display the other planes is usually not useful and add noise to the
output.

Originally committed as revision 24843 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-20 14:41:18 +00:00
Stefano Sabatini
3fa3e4f4ec Cosmetics: add an empty newline between the function description and
the list of @params.

Improve consistency and possibly enhance readability.

Originally committed as revision 24842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-20 14:19:55 +00:00
Stefano Sabatini
dc46661ae2 Enable and change the log level to DEBUG for the message printed in
case of picref copy.

Originally committed as revision 24831 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-19 14:32:36 +00:00
Stefano Sabatini
ca8574310f Cosmetics: apply misc spacing style fixes.
Originally committed as revision 24830 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-19 14:32:31 +00:00
Stefano Sabatini
7fe82bd78a Fix braino: @flip -> @file.
Originally committed as revision 24829 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-18 21:07:57 +00:00
Stefano Sabatini
a6ddf8bf0f Implement inline function av_fill_image_max_pixstep() and use it for
factorizing code.

Originally committed as revision 24827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-18 21:02:38 +00:00
Stefano Sabatini
371cbff84d Cosmetics: apply misc style fixes.
Originally committed as revision 24812 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-17 18:08:09 +00:00
S.N. Hemanth Meenakshisundaram
ad2c950154 Implement libavfilter audio framework.
Patch by S.N. Hemanth Meenakshisundaram * smeenaks * ucsd * edu *.

Originally committed as revision 24811 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-17 18:08:03 +00:00
Stefano Sabatini
65d4cab562 Add missing checks in avfilter_default_get_video_buffer().
Originally committed as revision 24809 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-17 15:12:28 +00:00
Stefano Sabatini
4f9ce3c4c7 Add missing NULL checks in avfilter_ref_buffer().
Originally committed as revision 24808 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-17 15:12:22 +00:00
Stefano Sabatini
a1e171dfee Add hflip filter.
Originally committed as revision 24806 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-17 14:59:12 +00:00
Stefano Sabatini
f607cc18eb Cosmetics: put "{" on the same line of the "struct" keyword in struct
definitions.

More consistent with the rest of FFmpeg.

Originally committed as revision 24789 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-12 18:20:58 +00:00
Stefano Sabatini
81c1ecabab Deprecate ff_get_plane_bytewidth() in favor of
av_get_image_linesize().

Originally committed as revision 24787 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-12 15:06:04 +00:00
Baptiste Coudurier
e4cc9f208d 100L, fix vf_scale, since copy_ref_props now copy w and h, we must update them
Originally committed as revision 24781 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-12 00:33:18 +00:00
Stefano Sabatini
a4fb0ada0b Apply misc cosmetics: add empty newlines for separating function
declarations and fix weird indent.

Originally committed as revision 24776 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-11 16:22:16 +00:00
S.N. Hemanth Meenakshisundaram
382ac60e44 Set type on buffer in get_video_buffer().
Patch by S.N. Hemanth Meenakshisundaram reverse("skaneems") + "@ucsd.edu".

Originally committed as revision 24775 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-11 15:38:50 +00:00
S.N. Hemanth Meenakshisundaram
c1db7bff66 Resize data and linesize in AVFilterBufferRef to 8.
This is required to make AVFilterBufferRef able to contain also audio
data, required by audio filtering integration.

Patch by S.N. Hemanth Meenakshisundaram smeen?ks@ucsd.ed?.

Originally committed as revision 24773 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-11 15:25:42 +00:00
Stefano Sabatini
84c0386960 Change avfilter_open() signature, from:
AVFilterContext *avfilter_open(AVFilter *filter, const char *inst_name);
to:
int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name);

This way it is possible to propagate an error code telling the reason
of the failure.

Originally committed as revision 24765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-11 11:44:51 +00:00
S.N. Hemanth Meenakshisundaram
cc80caff52 Separate video specific BufferRef properties into VideoProps.
Define a new struct AVFilterBufferRefVideoProps and add a type field
to AVFilterBufferRef.

Video specific properties in AVFilterBufferRefVideoProps are now
referred to by *video pointer in AVFilterBufferRef.

Patch by S.N. Hemanth Meenakshisundaram smeenaks->ucsd.edu.

Originally committed as revision 24763 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-11 11:06:04 +00:00
S.N. Hemanth Meenakshisundaram
5d4890d73d Rename fields:
AVFilterLink.srcpic    ->  AVFilterLink.src_buf
AVFilterLink.cur_pic   ->  AVFilterLink.cur_buf
AVFilterLink.outpic    ->  AVFilterLink.out_buf

The new names are more generic and more consistent, since the struct
they contain, which was named AVFilterPicRef, has been renamed to
AVFilterBufferRef.

Patch by S.N. Hemanth Meenakshisundaram %smeenaks%ucsd%edu%.

Originally committed as revision 24732 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-07 01:15:34 +00:00
S.N. Hemanth Meenakshisundaram
7fce481a69 Rename functions and fields:
avfilter_(un)ref_pic       -> avfilter_(un)ref_buffer
avfilter_copy_picref_props -> avfilter_copy_buffer_ref_props
AVFilterBufferRef.pic      -> AVFilterBufferRef.buffer

They have been renamed to allow sharing with audio.

Patch by S.N. Hemanth Meenakshisundaram $smeenaks$ucsd$edu$.

Originally committed as revision 24731 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-07 01:15:27 +00:00
S.N. Hemanth Meenakshisundaram
ecc8dada37 Rename AVFilterPicRef to AVFilterBufferRef.
The struct is going to be used for storing audio buffer references as
well, and the new name is more generic.

Patch by S.N. Hemanth Meenakshisundaram @smeenaks@ucsd@edu@.

Originally committed as revision 24730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-07 01:15:19 +00:00
S.N. Hemanth Meenakshisundaram
d54e0948e0 Move format from AVFilterBuffer to AVFilterPicRef.
Patch by S.N. Hemanth Meenakshisundaram |smeenaks|ucsd|edu|.

Originally committed as revision 24728 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-07 00:02:26 +00:00
S.N. Hemanth Meenakshisundaram
59ff3fd536 Fix the size of the data to be copied from an AVFilterBuffer to an
AVFilterBuffereRef in avfilter_default_get_video_buffer().

The error was being caused by the previous patch which resized
AVFilterBuffer's data and linesize arrays to 8.

Patch by S.N. Hemanth Meenakshisundaram" &smeenaks&ucsd&edu&.

Originally committed as revision 24727 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-07 00:02:21 +00:00
Måns Rullgård
5a6fbf4c39 avfilter: indent
Originally committed as revision 24720 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-06 22:25:39 +00:00
Måns Rullgård
0bb7408e55 avfilter: do not crash on null link src/dst in avfilter_destroy()
Originally committed as revision 24719 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-06 22:25:36 +00:00
Måns Rullgård
f3b90d25ee avfilter: free link in/out_formats in avfilter_destroy()
Originally committed as revision 24718 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-06 22:25:33 +00:00
Stefano Sabatini
6ce9b4310c Remove use of the deprecated function avcodec_check_dimensions(), use
av_check_image_size() instead.

Originally committed as revision 24711 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-06 09:37:04 +00:00
Stefano Sabatini
be665c7da6 Make avfilter_copy_picref_props() copy w and h from src to dst.
Originally committed as revision 24678 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-03 09:02:16 +00:00
Stefano Sabatini
d6bb31a46b Make config_input() return AVERROR(EINVAL) in place of -1.
Originally committed as revision 24595 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-30 11:56:01 +00:00
Stefano Sabatini
b59d12b1b9 Compute the max pixel step for each plane, and use it in place of
hardcoding that value in a switch.

More compact and correct.

Originally committed as revision 24594 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-30 11:33:31 +00:00
S.N. Hemanth Meenakshisundaram
56b5e9d5a9 Resize AVFilterBuffer to hold 8 planes/linesizes worth of data.
This is required for making AVFilterBuffer useful for storing audio
data.

Patch by S.N. Hemanth Meenakshisundaram revert <ude.dscu@skaneems>.

Originally committed as revision 24592 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-30 08:42:25 +00:00
Stefano Sabatini
7be5b7309c Make avfilter_default_get_video_buffer() use functions in
libavcore/imgutils.c rather than ff_fill_linesize() and
ff_fill_pointer().

Also remove a dependency on libavcodec.

Originally committed as revision 24586 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-30 00:29:50 +00:00
Stefano Sabatini
15379c2beb Require libswscale only if the scale filter is used.
Although with several limitations, lavfi can be compiled and used
without the scale filter.

Originally committed as revision 24570 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-28 08:56:52 +00:00
Stefano Sabatini
46eed2c886 Remove reference to the unexisting movie filter and the corresponding
useless --enable-avfilter-lavf option.

Originally committed as revision 24569 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-28 08:56:49 +00:00
Stefano Sabatini
126b638ea0 Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
in favor of the newly added corresponding functions
av_parse_video_size() and av_parse_video_rate() defined in
libavcore/parseutils.h.

This change also adds a linking-time dependency of libavcodec and of
libavfilter on libavcore.

Originally committed as revision 24518 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-26 23:12:28 +00:00
Stefano Sabatini
8d5fa2baa6 Remove dependency on avcodec_get_chroma_sub_sample() and libavcodec,
use the pixdesc API instead.

Originally committed as revision 24440 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-22 22:06:46 +00:00
S.N. Hemanth Meenakshisundaram
bdab614be8 Generalize pixel format enum fields to int formats.
This is needed to make the libavfilter framework work with audio
filters.

In particular add a type field to AVFilterLink, change the field types:
enum PixelFormat format   -> int format   in AVFilterBuffer
enum PixelFormat *formats -> int *formats in AVFilterFormats
enum PixelFormat *format  -> int format   in AVFilterLink

and change the function signatures:
AVFilterFormats *avfilter_make_format_list(const enum PixelFormat *pix_fmts); ->
AVFilterFormats *avfilter_make_format_list(const int *fmts);

int avfilter_add_colorspace(AVFilterFormats **avff, enum PixelFormat pix_fmt); ->
int avfilter_add_format(AVFilterFormats **avff, int fmt);

AVFilterFormats *avfilter_all_colorspaces(void); ->
AVFilterFormats *avfilter_all_formats(enum AVMediaType type);

This change breaks libavfilter API/ABI.

Patch by S.N. Hemanth Meenakshisundaram |smeenaks|ucsd|edu|.

Originally committed as revision 24424 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-22 11:12:47 +00:00
Stefano Sabatini
98137a1a5b Document create_filter().
Originally committed as revision 24423 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-22 09:56:09 +00:00