generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
40,952 Commits 24 Branches 241 Tags 173 MiB
841c1be57e
Commit Graph

1767 Commits

Author SHA1 Message Date
Robert Nagy
965b807278 vf_yadif: Fixed potential access violation on EOF. 
The correct invariant is (cur != NULL -> next != NULL). Not the other way around.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-22 14:59:27 +02:00
Nicolas George
4a5d18b6e2 vsrc_mandelbrot: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
Nicolas George
dc6a02de01 vsrc_life: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
Nicolas George
ca554fbc2f vsrc_cellauto: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
Nicolas George
2987efe9ba vf_ass: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
Nicolas George
16a44b41ab vsrc_testsrc: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
Michael Niedermayer
9225513242 vf_scale: support dynamically changing input parameters. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-20 16:39:03 +02:00
Nicolas George
6adefeef45 buffersrc: cosmetic: reindent. 2012-05-20 15:41:58 +02:00
Michael Niedermayer
040a796dab Merge commit '755cd4197d53946208e042f095b930dca18d9430' 
* commit '755cd4197d53946208e042f095b930dca18d9430':
  mov: enable parsing for VC-1.
  lavfi: Add fps filter.
  lavfi: initialize pts to AV_NOPTS_VALUE when creating new buffer refs.
  avconv: add support for audio in complex filtergraphs.

Conflicts:
	ffmpeg.c
	libavfilter/version.h
	libavformat/mov.c
	tests/ref/fate/vc1-ism

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 20:31:24 +02:00
Michael Niedermayer
21d8a80e30 af_aresample: use new swr API to pass and compensate PTS 
This code is not only much more powerfull its also simpler

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:38 +02:00
Michael Niedermayer
087d09b6d5 af_aresample: allocate a larger buffer so accumulated data can be returned quicker 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:38 +02:00
Michael Niedermayer
e17a039647 af_aresample: use extended_data 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:38 +02:00
Nicolas George
3d2515a8f3 f_split: fix output type. 
The previous version checked the filter context name,
instead of checking the filter name.
The new version just uses the same type as the input.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
 2012-05-19 19:23:37 +02:00
Nicolas George
5ac9ef6493 avfilter: make AVFilterFormats compatible with libav. 
The list goes back to being simple integers,
and avfilter_make_format64_list is fixed to work
with the correct structure directly.
 2012-05-19 15:30:51 +02:00
Stefano Sabatini
0e82d317eb lavfi: rename vf_split.c -> f_split.c 
The file now contains both an audio and a video split filter.
 2012-05-19 13:24:57 +02:00
Stefano Sabatini
150227e8ed lavfi/asplit: move asplit code to vf_split.c, and make it support N outputs 
The move allows to share the init code already used by split.
 2012-05-19 13:24:53 +02:00
Clément Bœsch
60ea6b0996 lavfi/buffersink: typo fix in a comment. 2012-05-19 12:28:59 +02:00
Nicolas George
aa1246ea42 lavfi: unify src_buffer and buffersrc. 
Most of the code is moved to buffersrc.c
to help Git see the similarities.

src_buffer.c still contains the obsolete compatibility functions.

The format change detection code was removed as it has been
implemented directly in ffmpeg.
It can easily be brought back from the history.
 2012-05-19 10:59:52 +02:00
Nicolas George
7997fc49ef lavfi: remove stray reference to planar/packed. 2012-05-19 10:59:52 +02:00
Nicolas George
9567f410aa avfilter: move some fields in AVFilterLink. 
It restores ABI compatibility with libav.

The fields that move were very recent or morally private.
 2012-05-19 10:59:52 +02:00
Clément Bœsch
48f30595f5 pan: use ff_parse_channel_layout() instead of av_get_channel_layout(). 
This allow specifying hexadecimal channel layout, and also handle the
error printing internally.
 2012-05-18 23:34:11 +02:00
Clément Bœsch
64ff8a7670 lavfi: rename all_channel_layouts.h to all_channel_layouts.inc. 
all_channel_layouts.h is not a real header file and breaks make checkheaders.
 2012-05-18 23:34:11 +02:00
Clément Bœsch
f8f3deb731 lavfi/transform: fix make checkheaders. 2012-05-18 23:34:11 +02:00
Michael Niedermayer
96ac8663de af_aresample: Consider the swresample delay during calculating timestamps. 
The difference from this should be pretty small.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-18 23:03:27 +02:00
Michael Niedermayer
6ba692f8a7 af_aresample: fix rounding that led to sample accumulation in the buffers. 
This fixes a regression that apparently was missed when switching to the
in af resampler

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-18 22:57:02 +02:00
Anton Khirnov
54c5dd89e3 lavfi: Add fps filter. 
Partially based on a patch by Robert Nagy <ronag89@gmail.com>
 2012-05-18 19:33:54 +02:00
Anton Khirnov
7b3b24a8ee lavfi: initialize pts to AV_NOPTS_VALUE when creating new buffer refs. 2012-05-18 19:29:39 +02:00
Michael Niedermayer
db6ef054f5 af_aresample: 10l fix, wrong timebase for next_pts. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-18 04:45:08 +02:00
Stefano Sabatini
17d4233c9c lavfi/aevalsrc: reindent after the previous commit 2012-05-18 00:59:42 +02:00
Stefano Sabatini
e1a8df70a2 lavfi/aevalsrc: add option channel_layout 
Allow to explicitly specify the channel layout to select.
 2012-05-18 00:58:41 +02:00
Stefano Sabatini
cfde7395b1 lavfi/aevalsrc: remove limitation on the number of channels 2012-05-18 00:38:31 +02:00
Michael Niedermayer
847943bc51 aresample: add code to flush the internal swr buffer. 
Inspired-by code from af_resample.c written by Anton Khirnov

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-17 22:45:05 +02:00
Michael Niedermayer
b3e1b95afa aresample: check return code of swr_convert() 
Issue found by comparing af_resample.c and af_aresample.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-17 22:44:28 +02:00
Michael Niedermayer
dc2e051c4f Merge branch 'audio-filters' of https://github.com/ubitux/FFmpeg 
* 'audio-filters' of https://github.com/ubitux/FFmpeg:
  lavfi/pan: add supported sample rates to avoid a crash.
  ffmpeg: do not warn when expecting EOF from lavfi.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-17 16:55:01 +02:00
Michael Niedermayer
b13d39bd81 av_aresample: Allow changing sample format and channel layout as well 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-17 16:46:15 +02:00
Clément Bœsch
5dbd66395a lavfi/pan: add supported sample rates to avoid a crash. 2012-05-17 16:31:54 +02:00
Michael Niedermayer
3ae64dc48f avfiltergraph: use aresample not aconvert in the alternative merge code. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-17 13:11:13 +02:00
Michael Niedermayer
e3c6b61263 af_aresample: support all swresample parameters. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-17 13:10:14 +02:00
Michael Niedermayer
47c2e52bc6 af_aresample: fix typo in query formats 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-17 13:09:39 +02:00
Michael Niedermayer
ac87c273a6 src_buffer: propagate errors from copy_buffer_ref() 
Fixes a null ptr deref

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-17 04:48:05 +02:00
Anton Khirnov
fc49f22c3b ffmpeg: add support for audio filters. 
Some of the FATE changes are due to off-by-one different rounding being used
(lrintf vs av_rescale_q).
Some fate changes are due to 1 audio frame less being encoded (the new variant seems
matching what qatar does and according to ffprobe its closer to the requested duration)
the mapchan feature sadly is lost in this commit because it depends on resampling
being done in ffmpeg.c which is now moved completely into the av filter layer
-async is broken after this commit, this will be fixed in subsequent commits
the new filter reconfiguration system is flawed and will drop a frame on each
parameter change which is why the nelly moser checksums need updating.

Conflicts:

	ffmpeg.c
	tests/ref/fate/smjpeg
 2012-05-17 03:29:21 +02:00
Michael Niedermayer
dfa988ee5e libavfilter: src_buffer: add time_base for audio 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-17 02:55:57 +02:00
Michael Niedermayer
aa69db3abf libavfilter: src_buffer: fix planar audio 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-17 02:55:57 +02:00
Michael Niedermayer
664f0aac62 libavfilter: src_buffer, use only aresample, not aconvert. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-17 02:55:57 +02:00
Michael Niedermayer
13fdb35535 src_buffer: fix query_formats_audio() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-17 02:55:57 +02:00
Michael Niedermayer
3448404a70 libavfilter: add ff_parse_time_base() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-17 02:55:57 +02:00
Michael Niedermayer
3e2cf79e15 buffersrc: export forgotten function 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-16 23:13:44 +02:00
Stefano Sabatini
e556121ec1 lavfi/aevalsrc: correct the supported sample format 
The source supports *planar* double, fix regression introduced by me in
4d4098da.
 2012-05-16 16:17:41 +02:00
Stefano Sabatini
986d2f6ec0 lavfi/aevalsrc: fix sample rate negotiation, after the last merge 
Fix crash.
 2012-05-16 15:28:43 +02:00
Stefano Sabatini
4d4098da00 lavfi: drop planar/packed negotiation support 
The planar/packed switch and the packing_formats list is no longer
required, since the planar/packed information is now stored in the sample
format enum.

This is technically a major API break, possibly it should be not too
painful as we marked the audio filtering API as unstable.
 2012-05-16 13:16:05 +02:00