]>
git.sesse.net Git - ffmpeg/log
Carl Eugen Hoyos [Sat, 19 May 2012 17:20:22 +0000 (19:20 +0200)]
Fix interlaced AVUI decoding.
Michael Niedermayer [Sat, 19 May 2012 16:50:10 +0000 (18:50 +0200)]
ffmpeg: inject a aresample filter for -async
Based on similar code from anton
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 May 2012 16:48:53 +0000 (18:48 +0200)]
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>
Michael Niedermayer [Sat, 19 May 2012 16:48:05 +0000 (18:48 +0200)]
af_aresample: allocate a larger buffer so accumulated data can be returned quicker
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 May 2012 16:46:25 +0000 (18:46 +0200)]
af_aresample: use extended_data
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 May 2012 16:44:34 +0000 (18:44 +0200)]
swr: add swr_next_pts()
parameter descriptions partly reuse text from af_asyncts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 May 2012 16:42:11 +0000 (18:42 +0200)]
swr: add swr_drop_output()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 May 2012 16:39:12 +0000 (18:39 +0200)]
swr: add swr_inject_silence()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 May 2012 16:37:12 +0000 (18:37 +0200)]
swr: Fix issue with injecting more data than can be used up in the next call.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 May 2012 15:47:06 +0000 (17:47 +0200)]
swr: add some asserts to resample()
These check that the internal and input buffers match in format
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 May 2012 15:46:41 +0000 (17:46 +0200)]
swr: add reversefill_audiodata()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 May 2012 15:45:41 +0000 (17:45 +0200)]
swr: fix buf_set() so it works with input == output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 May 2012 15:45:12 +0000 (17:45 +0200)]
swr: make literal 32 a named constant in realloc_audio()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 May 2012 15:44:40 +0000 (17:44 +0200)]
swr: fill_audio_data() support NULL
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sat, 19 May 2012 16:12:09 +0000 (18:12 +0200)]
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>
Nicolas George [Fri, 18 May 2012 10:43:31 +0000 (12:43 +0200)]
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.
Stefano Sabatini [Fri, 18 May 2012 17:41:44 +0000 (19:41 +0200)]
lavfi: rename vf_split.c -> f_split.c
The file now contains both an audio and a video split filter.
Stefano Sabatini [Fri, 18 May 2012 17:38:38 +0000 (19:38 +0200)]
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.
Clément Bœsch [Sat, 12 May 2012 20:39:30 +0000 (22:39 +0200)]
lavf/id3v2: always strdup the value.
This simplifies the code but also fix a warning: ff_id3v1_genre_str
array contains const strings so do the string dup now instead of in
av_dict_set().
Clément Bœsch [Sat, 12 May 2012 20:31:11 +0000 (22:31 +0200)]
lavf/id3v2: do not export empty fields.
This also avoids a memleak.
Clément Bœsch [Fri, 18 May 2012 22:08:26 +0000 (00:08 +0200)]
doc/examples: make use of the parameter filters_descr parameter in init_filters().
Clément Bœsch [Wed, 9 May 2012 21:57:40 +0000 (23:57 +0200)]
doc/examples: install them with the shared data.
Clément Bœsch [Sat, 12 May 2012 21:13:19 +0000 (23:13 +0200)]
doc/examples: fix pts heuristic in filtering_video.
Note: the condition looked wrong in the first place ("if DTS is not
defined, then set PTS to that undefined value [...]").
Clément Bœsch [Sat, 12 May 2012 20:44:59 +0000 (22:44 +0200)]
lavfi/buffersink: typo fix in a comment.
Clément Bœsch [Sat, 12 May 2012 20:33:39 +0000 (22:33 +0200)]
doc/examples: properly close input in metadata.
Avoid some memleaks.
Clément Bœsch [Sat, 12 May 2012 17:56:58 +0000 (19:56 +0200)]
doc/examples: print operation filename in decoding_encoding.
Clément Bœsch [Sat, 12 May 2012 16:06:26 +0000 (18:06 +0200)]
doc/examples: add debug compilation flag.
Clément Bœsch [Sat, 12 May 2012 15:33:16 +0000 (17:33 +0200)]
build: remove non-existant examples rule.
Clément Bœsch [Sat, 12 May 2012 15:26:01 +0000 (17:26 +0200)]
doc/examples: use system headers in decoding_encoding and muxing.
All the other examples already use the system installed headers.
Clément Bœsch [Thu, 10 May 2012 17:09:34 +0000 (19:09 +0200)]
doc/examples: remove explicit rules.
These rules are already in gmake builtins.
Clément Bœsch [Sat, 19 May 2012 10:28:09 +0000 (12:28 +0200)]
doc/examples: add libavr to libraries to avoid link failures.
Clément Bœsch [Sat, 19 May 2012 10:05:02 +0000 (12:05 +0200)]
ffmpeg: misc cosmetics.
Reduce diff against avconv, and change some doxycomments into normal
comments (no point in doxifying ffmpeg internal fields).
Nicolas George [Fri, 18 May 2012 11:59:48 +0000 (13:59 +0200)]
ffmpeg: adapt to the buffersrc API changes.
Nicolas George [Fri, 18 May 2012 11:56:22 +0000 (13:56 +0200)]
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.
Nicolas George [Fri, 18 May 2012 11:29:43 +0000 (13:29 +0200)]
lavfi: remove stray reference to planar/packed.
Nicolas George [Fri, 18 May 2012 10:44:11 +0000 (12:44 +0200)]
avfilter: move some fields in AVFilterLink.
It restores ABI compatibility with libav.
The fields that move were very recent or morally private.
Michael Niedermayer [Fri, 18 May 2012 22:38:21 +0000 (00:38 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: Replace some @file tags by more suitable markup.
fate: Set FUZZ factor of vorbis-13 test to 2.
fate: Set FUZZ factor of (e)ac3-encode test to 3.
fate: remove unused code from regressions-funcs.sh
rtmp: Don't assume path points to a string of nonzero length
avconv: fix behavior with -ss as an output option.
Conflicts:
doc/platform.texi
doc/protocols.texi
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 18 May 2012 22:15:03 +0000 (00:15 +0200)]
ffmpeg: fix warning & bug for keep_pix_fmt
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Fri, 18 May 2012 21:40:53 +0000 (23:40 +0200)]
ffmpeg: remove unused variable i.
Clément Bœsch [Thu, 17 May 2012 18:57:22 +0000 (20:57 +0200)]
ffmpeg: do not deprecate -vol and -map_channel.
These helpers are handy, just notice the user it is done using lavfi.
Clément Bœsch [Thu, 17 May 2012 17:31:35 +0000 (19:31 +0200)]
ffmpeg: resurrect -map_channel.
Clément Bœsch [Thu, 17 May 2012 17:32:17 +0000 (19:32 +0200)]
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.
Clément Bœsch [Wed, 9 May 2012 07:57:33 +0000 (09:57 +0200)]
lavu/error: fix make checkheaders.
The errors need to be defined before including functions depending on
them. See av_size_mult() for instance. stddef.h is included for the
prototype of av_sterror (use of size_t).
Clément Bœsch [Sun, 13 May 2012 19:10:54 +0000 (21:10 +0200)]
build: add codec_names.h to SKIPHEADERS to fix make checkheaders.
Clément Bœsch [Sun, 13 May 2012 19:19:55 +0000 (21:19 +0200)]
lavc/vda: fix make checkheaders.
Clément Bœsch [Wed, 9 May 2012 07:10:24 +0000 (09:10 +0200)]
lavc/os2threads: fix make checkheaders.
Clément Bœsch [Wed, 9 May 2012 07:06:54 +0000 (09:06 +0200)]
lavc/libutvideo: fix make checkheaders.
Clément Bœsch [Wed, 9 May 2012 07:06:06 +0000 (09:06 +0200)]
lavc/libutvideo: protect header.
Clément Bœsch [Wed, 9 May 2012 07:04:04 +0000 (09:04 +0200)]
lavc/jacosub: fix make checkheaders.
Clément Bœsch [Wed, 9 May 2012 06:33:06 +0000 (08:33 +0200)]
lavc/dcaenc: fix make checkheaders.
Clément Bœsch [Wed, 9 May 2012 06:32:31 +0000 (08:32 +0200)]
lavc/g723.1: fix make checkheaders.
Clément Bœsch [Wed, 9 May 2012 06:31:54 +0000 (08:31 +0200)]
lavc/g723: protect header.
Clément Bœsch [Wed, 9 May 2012 06:27:51 +0000 (08:27 +0200)]
lavc/g729postfilter: fix make checkheaders.
Clément Bœsch [Wed, 9 May 2012 06:25:49 +0000 (08:25 +0200)]
lavf/swf: fix make checkheaders.
Clément Bœsch [Wed, 9 May 2012 06:22:06 +0000 (08:22 +0200)]
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.
Clément Bœsch [Wed, 9 May 2012 06:15:27 +0000 (08:15 +0200)]
lavfi/transform: fix make checkheaders.
Clément Bœsch [Wed, 9 May 2012 06:14:44 +0000 (08:14 +0200)]
lavd/dshow: fix make checkheaders.
Clément Bœsch [Wed, 9 May 2012 06:11:16 +0000 (08:11 +0200)]
lavd/dshow: protect header.
Michael Niedermayer [Fri, 18 May 2012 21:03:27 +0000 (23:03 +0200)]
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>
Michael Niedermayer [Fri, 18 May 2012 21:02:10 +0000 (23:02 +0200)]
swr: add swr_get_delay() to find the exact delay the swresampler introduces.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 18 May 2012 18:11:44 +0000 (20:11 +0200)]
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>
Diego Biurrun [Wed, 16 May 2012 17:24:39 +0000 (19:24 +0200)]
doc: Replace some @file tags by more suitable markup.
Diego Biurrun [Tue, 15 May 2012 13:00:15 +0000 (15:00 +0200)]
fate: Set FUZZ factor of vorbis-13 test to 2.
This is necessary to account for different rounding done in the 3DNow!
Assembly optimizations.
Diego Biurrun [Tue, 15 May 2012 08:57:51 +0000 (10:57 +0200)]
fate: Set FUZZ factor of (e)ac3-encode test to 3.
This is necessary to account for different rounding done in the 3DNow!
Assembly optimizations.
Nicolas George [Mon, 14 May 2012 18:24:52 +0000 (20:24 +0200)]
fate: ffprobe tests require SAMPLES.
Mans Rullgard [Fri, 18 May 2012 10:43:07 +0000 (11:43 +0100)]
fate: remove unused code from regressions-funcs.sh
The only uses of the do_avconv_nomd5() function were removed in
85cf49f .
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Fri, 18 May 2012 02:45:14 +0000 (04:45 +0200)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: put aspect ratio info to the VideoPicture struct
ffplay: use AVFrame::width and height instead of using codec or filter settings
ffplay: use stream sample_aspect_ratio if available in source frames
ffplay: fix video_thread when no frame is returned in get_video_frame
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 18 May 2012 01:51:37 +0000 (03:51 +0200)]
af_aresample: 10l fix, wrong timebase for next_pts.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Thu, 17 May 2012 22:59:42 +0000 (00:59 +0200)]
lavfi/aevalsrc: reindent after the previous commit
Stefano Sabatini [Thu, 17 May 2012 11:01:50 +0000 (13:01 +0200)]
lavfi/aevalsrc: add option channel_layout
Allow to explicitly specify the channel layout to select.
Stefano Sabatini [Wed, 16 May 2012 17:35:56 +0000 (19:35 +0200)]
lavfi/aevalsrc: remove limitation on the number of channels
Stefano Sabatini [Thu, 17 May 2012 11:28:12 +0000 (13:28 +0200)]
lavu/parseutils: fix specification for av_parse_time()
Michael Niedermayer [Thu, 17 May 2012 21:45:00 +0000 (23:45 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
pcmenc: set correct bitrate value
avprobe: don't print format entry name when only one was requested
Conflicts:
ffprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 17 May 2012 20:39:02 +0000 (22:39 +0200)]
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>
Michael Niedermayer [Thu, 17 May 2012 20:38:34 +0000 (22:38 +0200)]
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>
Martin Storsjö [Wed, 16 May 2012 08:45:47 +0000 (11:45 +0300)]
rtmp: Don't assume path points to a string of nonzero length
If using the new -rtmp_app and -rtmp_playpath parameters,
one can in many cases set the main url to just rtmp://server/.
If the trailing slash is omitted, path is a string of zero length,
and using path+1 will end up reading uninitialized data.
Signed-off-by: Martin Storsjö <martin@martin.st>
Anton Khirnov [Thu, 17 May 2012 10:42:03 +0000 (12:42 +0200)]
avconv: fix behavior with -ss as an output option.
Don't return from poll_filters() immediately, there may be other frames
and/or other streams to handle.
Fixes a memleak.
Clément Bœsch [Thu, 17 May 2012 15:27:20 +0000 (17:27 +0200)]
ffmpeg: automatically insert volume filter when -vol is used.
Deprecate -vol.
Inspired by asyncts auto-insert patch from Anton Khirnov.
Michael Niedermayer [Thu, 17 May 2012 15:15:47 +0000 (17:15 +0200)]
ffmpeg: use av_buffersrc_add_frame() for audio too
fixes a memleak
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 17 May 2012 14:51:59 +0000 (16:51 +0200)]
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>
Michael Niedermayer [Thu, 17 May 2012 14:12:54 +0000 (16:12 +0200)]
av_aresample: Allow changing sample format and channel layout as well
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 17 May 2012 14:41:39 +0000 (16:41 +0200)]
swresample: set the default parameters to "none"
this way it can easily be detected when parameters have not been set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Thu, 17 May 2012 14:31:52 +0000 (16:31 +0200)]
lavfi/pan: add supported sample rates to avoid a crash.
Clément Bœsch [Thu, 17 May 2012 14:28:19 +0000 (16:28 +0200)]
ffmpeg: do not warn when expecting EOF from lavfi.
Michael Niedermayer [Thu, 17 May 2012 14:12:26 +0000 (16:12 +0200)]
ffmpeg: fix ;;
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 17 May 2012 11:11:13 +0000 (13:11 +0200)]
avfiltergraph: use aresample not aconvert in the alternative merge code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 17 May 2012 11:10:14 +0000 (13:10 +0200)]
af_aresample: support all swresample parameters.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 17 May 2012 11:09:39 +0000 (13:09 +0200)]
af_aresample: fix typo in query formats
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 17 May 2012 02:46:27 +0000 (04:46 +0200)]
src_buffer: propagate errors from copy_buffer_ref()
Fixes a null ptr deref
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 17 May 2012 02:07:16 +0000 (04:07 +0200)]
ffmpeg: move audio timestamp roundup code.
This fixes a regression which lead to non monotone timestamps
at the end of a file.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Tue, 15 May 2012 23:01:34 +0000 (00:01 +0100)]
pcmenc: set correct bitrate value
This fixes a bogus bitrate value in the header of WAV files with
alaw/ulaw audio.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Anton Khirnov [Sat, 5 May 2012 16:22:46 +0000 (18:22 +0200)]
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
Michael Niedermayer [Thu, 17 May 2012 00:40:27 +0000 (02:40 +0200)]
libavfilter: src_buffer: add time_base for audio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 17 May 2012 00:39:45 +0000 (02:39 +0200)]
libavfilter: src_buffer: fix planar audio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 17 May 2012 00:38:14 +0000 (02:38 +0200)]
libavfilter: src_buffer, use only aresample, not aconvert.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 17 May 2012 00:40:57 +0000 (02:40 +0200)]
src_buffer: fix query_formats_audio()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 17 May 2012 00:37:13 +0000 (02:37 +0200)]
libavfilter: add ff_parse_time_base()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 May 2012 22:10:47 +0000 (00:10 +0200)]
ffmpeg: allow switching to qatars buffersrc API
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 May 2012 21:13:44 +0000 (23:13 +0200)]
buffersrc: export forgotten function
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 May 2012 20:29:04 +0000 (22:29 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: Work around non-standard wc implementations at more places
fate: work around non-standard wc implementations
x86: rv40: Mark rv40_weight functions as MMX2; they use MMX2 instructions.
ac3dsp: simplify x86 versions of ac3_max_msb_abs_int16
fate: use standard diff options
tta: Fix comment about channel number; TTA supports >2 channels.
avfilter: Move ff_get_ref_perms_string() to where it is used.
build: Add 'check' target to run all compile and test targets.
indeo3: validate new frame size before resetting decoder
indeo3: when freeing buffers, set pointers referencing them to NULL as well
indeo3: initialise pixel planes on allocation
indeo3: ensure that decoded cell data is in 7-bit range as presumed by decoder
fate: rename psx-str-v3-mdec to mdec-v3
fate: convert psx-str to a demuxer test
lavf: add mdec to is_intra_only() list
Conflicts:
doc/developer.texi
libavcodec/indeo3.c
libavfilter/video.c
libavformat/utils.c
tests/fate/demux.mak
tests/fate/video.mak
tests/lavf-regression.sh
tests/ref/vsynth1/cljr
tests/ref/vsynth1/ffvhuff
tests/ref/vsynth2/cljr
tests/ref/vsynth2/ffvhuff
Merged-by: Michael Niedermayer <michaelni@gmx.at>