ffmpeg.git
7 years agoMerge commit '755cd4197d53946208e042f095b930dca18d9430'
Michael Niedermayer [Sat, 19 May 2012 18:31:24 +0000 (20:31 +0200)]
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>
7 years agoUse a variable instead of a repeated calculation when decoding AVUI.
Carl Eugen Hoyos [Sat, 19 May 2012 18:05:21 +0000 (20:05 +0200)]
Use a variable instead of a repeated calculation when decoding AVUI.

7 years agoavuidec.c: Fix indentation.
Carl Eugen Hoyos [Sat, 19 May 2012 17:28:27 +0000 (19:28 +0200)]
avuidec.c: Fix indentation.

7 years agoSimplify AVUI decoding, one skip value is enough.
Carl Eugen Hoyos [Sat, 19 May 2012 17:27:14 +0000 (19:27 +0200)]
Simplify AVUI decoding, one skip value is enough.

7 years agoFix interlaced AVUI decoding.
Carl Eugen Hoyos [Sat, 19 May 2012 17:20:22 +0000 (19:20 +0200)]
Fix interlaced AVUI decoding.

7 years agoffmpeg: inject a aresample filter for -async
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>
7 years agoaf_aresample: use new swr API to pass and compensate PTS
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>
7 years agoaf_aresample: allocate a larger buffer so accumulated data can be returned quicker
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>
7 years agoaf_aresample: use extended_data
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>
7 years agoswr: add swr_next_pts()
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>
7 years agoswr: add swr_drop_output()
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>
7 years agoswr: add swr_inject_silence()
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>
7 years agoswr: Fix issue with injecting more data than can be used up in the next call.
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>
7 years agoswr: add some asserts to resample()
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>
7 years agoswr: add reversefill_audiodata()
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>
7 years agoswr: fix buf_set() so it works with input == output
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>
7 years agoswr: make literal 32 a named constant in realloc_audio()
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>
7 years agoswr: fill_audio_data() support NULL
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>
7 years agof_split: fix output type.
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>
7 years agoavfilter: make AVFilterFormats compatible with libav.
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.

7 years agolavfi: rename vf_split.c -> f_split.c
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.

7 years agolavfi/asplit: move asplit code to vf_split.c, and make it support N outputs
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.

7 years agolavf/id3v2: always strdup the value.
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().

7 years agolavf/id3v2: do not export empty fields.
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.

7 years agodoc/examples: make use of the parameter filters_descr parameter in init_filters().
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().

7 years agodoc/examples: install them with the shared data.
Clément Bœsch [Wed, 9 May 2012 21:57:40 +0000 (23:57 +0200)]
doc/examples: install them with the shared data.

7 years agodoc/examples: fix pts heuristic in filtering_video.
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 [...]").

7 years agolavfi/buffersink: typo fix in a comment.
Clément Bœsch [Sat, 12 May 2012 20:44:59 +0000 (22:44 +0200)]
lavfi/buffersink: typo fix in a comment.

7 years agodoc/examples: properly close input in metadata.
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.

7 years agodoc/examples: print operation filename in decoding_encoding.
Clément Bœsch [Sat, 12 May 2012 17:56:58 +0000 (19:56 +0200)]
doc/examples: print operation filename in decoding_encoding.

7 years agodoc/examples: add debug compilation flag.
Clément Bœsch [Sat, 12 May 2012 16:06:26 +0000 (18:06 +0200)]
doc/examples: add debug compilation flag.

7 years agobuild: remove non-existant examples rule.
Clément Bœsch [Sat, 12 May 2012 15:33:16 +0000 (17:33 +0200)]
build: remove non-existant examples rule.

7 years agodoc/examples: use system headers in decoding_encoding and muxing.
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.

7 years agodoc/examples: remove explicit rules.
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.

7 years agodoc/examples: add libavr to libraries to avoid link failures.
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.

7 years agoffmpeg: misc cosmetics.
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).

7 years agoffmpeg: adapt to the buffersrc API changes.
Nicolas George [Fri, 18 May 2012 11:59:48 +0000 (13:59 +0200)]
ffmpeg: adapt to the buffersrc API changes.

7 years agolavfi: unify src_buffer and buffersrc.
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.

7 years agolavfi: remove stray reference to planar/packed.
Nicolas George [Fri, 18 May 2012 11:29:43 +0000 (13:29 +0200)]
lavfi: remove stray reference to planar/packed.

7 years agoavfilter: move some fields in AVFilterLink.
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.

7 years agoMerge remote-tracking branch 'qatar/master'
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>
7 years agoffmpeg: fix warning & bug for keep_pix_fmt
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>
7 years agoffmpeg: remove unused variable i.
Clément Bœsch [Fri, 18 May 2012 21:40:53 +0000 (23:40 +0200)]
ffmpeg: remove unused variable i.

7 years agoffmpeg: do not deprecate -vol and -map_channel.
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.

7 years agoffmpeg: resurrect -map_channel.
Clément Bœsch [Thu, 17 May 2012 17:31:35 +0000 (19:31 +0200)]
ffmpeg: resurrect -map_channel.

7 years agopan: use ff_parse_channel_layout() instead of av_get_channel_layout().
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.

7 years agolavu/error: fix make checkheaders.
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).

7 years agobuild: add codec_names.h to SKIPHEADERS to fix make checkheaders.
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.

7 years agolavc/vda: fix make checkheaders.
Clément Bœsch [Sun, 13 May 2012 19:19:55 +0000 (21:19 +0200)]
lavc/vda: fix make checkheaders.

7 years agolavc/os2threads: fix make checkheaders.
Clément Bœsch [Wed, 9 May 2012 07:10:24 +0000 (09:10 +0200)]
lavc/os2threads: fix make checkheaders.

7 years agolavc/libutvideo: fix make checkheaders.
Clément Bœsch [Wed, 9 May 2012 07:06:54 +0000 (09:06 +0200)]
lavc/libutvideo: fix make checkheaders.

7 years agolavc/libutvideo: protect header.
Clément Bœsch [Wed, 9 May 2012 07:06:06 +0000 (09:06 +0200)]
lavc/libutvideo: protect header.

7 years agolavc/jacosub: fix make checkheaders.
Clément Bœsch [Wed, 9 May 2012 07:04:04 +0000 (09:04 +0200)]
lavc/jacosub: fix make checkheaders.

7 years agolavc/dcaenc: fix make checkheaders.
Clément Bœsch [Wed, 9 May 2012 06:33:06 +0000 (08:33 +0200)]
lavc/dcaenc: fix make checkheaders.

7 years agolavc/g723.1: fix make checkheaders.
Clément Bœsch [Wed, 9 May 2012 06:32:31 +0000 (08:32 +0200)]
lavc/g723.1: fix make checkheaders.

7 years agolavc/g723: protect header.
Clément Bœsch [Wed, 9 May 2012 06:31:54 +0000 (08:31 +0200)]
lavc/g723: protect header.

7 years agolavc/g729postfilter: fix make checkheaders.
Clément Bœsch [Wed, 9 May 2012 06:27:51 +0000 (08:27 +0200)]
lavc/g729postfilter: fix make checkheaders.

7 years agolavf/swf: fix make checkheaders.
Clément Bœsch [Wed, 9 May 2012 06:25:49 +0000 (08:25 +0200)]
lavf/swf: fix make checkheaders.

7 years agolavfi: rename all_channel_layouts.h to all_channel_layouts.inc.
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.

7 years agolavfi/transform: fix make checkheaders.
Clément Bœsch [Wed, 9 May 2012 06:15:27 +0000 (08:15 +0200)]
lavfi/transform: fix make checkheaders.

7 years agolavd/dshow: fix make checkheaders.
Clément Bœsch [Wed, 9 May 2012 06:14:44 +0000 (08:14 +0200)]
lavd/dshow: fix make checkheaders.

7 years agolavd/dshow: protect header.
Clément Bœsch [Wed, 9 May 2012 06:11:16 +0000 (08:11 +0200)]
lavd/dshow: protect header.

7 years agoaf_aresample: Consider the swresample delay during calculating timestamps.
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>
7 years agoswr: add swr_get_delay() to find the exact delay the swresampler introduces.
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>
7 years agoaf_aresample: fix rounding that led to sample accumulation in the buffers.
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>
7 years agomov: enable parsing for VC-1.
Anton Khirnov [Thu, 17 May 2012 18:45:51 +0000 (20:45 +0200)]
mov: enable parsing for VC-1.

This makes lavf discard broken timestamps for non-B frames in
samples/isom/vc1-wmapro.ism.

7 years agolavfi: Add fps filter.
Anton Khirnov [Wed, 9 May 2012 12:08:21 +0000 (14:08 +0200)]
lavfi: Add fps filter.

Partially based on a patch by Robert Nagy <ronag89@gmail.com>

7 years agolavfi: initialize pts to AV_NOPTS_VALUE when creating new buffer refs.
Anton Khirnov [Wed, 16 May 2012 12:57:59 +0000 (14:57 +0200)]
lavfi: initialize pts to AV_NOPTS_VALUE when creating new buffer refs.

7 years agoavconv: add support for audio in complex filtergraphs.
Anton Khirnov [Thu, 17 May 2012 11:22:17 +0000 (13:22 +0200)]
avconv: add support for audio in complex filtergraphs.

7 years agodoc: Replace some @file tags by more suitable markup.
Diego Biurrun [Wed, 16 May 2012 17:24:39 +0000 (19:24 +0200)]
doc: Replace some @file tags by more suitable markup.

7 years agofate: Set FUZZ factor of vorbis-13 test to 2.
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.

7 years agofate: Set FUZZ factor of (e)ac3-encode test to 3.
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.

7 years agofate: ffprobe tests require SAMPLES.
Nicolas George [Mon, 14 May 2012 18:24:52 +0000 (20:24 +0200)]
fate: ffprobe tests require SAMPLES.

7 years agofate: remove unused code from regressions-funcs.sh
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>
7 years agoMerge remote-tracking branch 'cus/stable'
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>
7 years agoaf_aresample: 10l fix, wrong timebase for next_pts.
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>
7 years agolavfi/aevalsrc: reindent after the previous commit
Stefano Sabatini [Thu, 17 May 2012 22:59:42 +0000 (00:59 +0200)]
lavfi/aevalsrc: reindent after the previous commit

7 years agolavfi/aevalsrc: add option channel_layout
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.

7 years agolavfi/aevalsrc: remove limitation on the number of channels
Stefano Sabatini [Wed, 16 May 2012 17:35:56 +0000 (19:35 +0200)]
lavfi/aevalsrc: remove limitation on the number of channels

7 years agolavu/parseutils: fix specification for av_parse_time()
Stefano Sabatini [Thu, 17 May 2012 11:28:12 +0000 (13:28 +0200)]
lavu/parseutils: fix specification for av_parse_time()

7 years agoMerge remote-tracking branch 'qatar/master'
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>
7 years agoaresample: add code to flush the internal swr buffer.
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>
7 years agoaresample: check return code of swr_convert()
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>
7 years agortmp: Don't assume path points to a string of nonzero length
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>
7 years agoavconv: fix behavior with -ss as an output option.
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.

7 years agoffmpeg: automatically insert volume filter when -vol is used.
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.

7 years agoffmpeg: use av_buffersrc_add_frame() for audio too
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>
7 years agoMerge branch 'audio-filters' of https://github.com/ubitux/FFmpeg
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>
7 years agoav_aresample: Allow changing sample format and channel layout as well
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>
7 years agoswresample: set the default parameters to "none"
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>
7 years agolavfi/pan: add supported sample rates to avoid a crash.
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.

7 years agoffmpeg: do not warn when expecting EOF from lavfi.
Clément Bœsch [Thu, 17 May 2012 14:28:19 +0000 (16:28 +0200)]
ffmpeg: do not warn when expecting EOF from lavfi.

7 years agoffmpeg: fix ;;
Michael Niedermayer [Thu, 17 May 2012 14:12:26 +0000 (16:12 +0200)]
ffmpeg: fix ;;

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfiltergraph: use aresample not aconvert in the alternative merge code.
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>
7 years agoaf_aresample: support all swresample parameters.
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>
7 years agoaf_aresample: fix typo in query formats
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>
7 years agosrc_buffer: propagate errors from copy_buffer_ref()
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>
7 years agoffmpeg: move audio timestamp roundup code.
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>
7 years agopcmenc: set correct bitrate value
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>
7 years agoffmpeg: add support for audio filters.
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